diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index 735d81c1398..cb00dcd06df 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2007/12/10 21:07:52 martynas Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/13 17:04:07 martynas Exp $
 
 COMMENT=		tools for using web server gateway interface stack
 
-V=			1.3
-DISTNAME=		Paste-${V}
-PKGNAME=		py-paste-${V}p0
+VERSION=		1.6
+DISTNAME=		Paste-${VERSION}
+PKGNAME=		py-paste-${VERSION}
 
 CATEGORIES=		www
 
@@ -25,6 +25,8 @@ RUN_DEPENDS=		::www/py-flup
 REGRESS_DEPENDS=	::devel/py-py \
 			::www/py-flup
 
+SUBST_VARS=		VERSION
+
 MODPY_SETUPTOOLS=	Yes
 
 post-install:
@@ -33,6 +35,10 @@ post-install:
 		find . -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-paste/{} \; && \
 		find . ! -type d -exec ${INSTALL_DATA} {} ${PREFIX}/share/doc/py-paste/{} \;
 
+pre-regress:
+	perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g' \
+		${WRKSRC}/tests/cgiapp_data/*.cgi
+
 do-regress:
 	cd ${WRKSRC} && py.test .
 
diff --git a/www/py-paste/distinfo b/www/py-paste/distinfo
index 99b3807767a..ca844575898 100644
--- a/www/py-paste/distinfo
+++ b/www/py-paste/distinfo
@@ -1,5 +1,5 @@
-MD5 (Paste-1.3.tar.gz) = zN6z2/7ZRh3VkbCmwl74Rw==
-RMD160 (Paste-1.3.tar.gz) = 77swchbvwp9cfnqJh10mDzwBezw=
-SHA1 (Paste-1.3.tar.gz) = sGPkVnr21IO4oF+2HNd9xTco+rU=
-SHA256 (Paste-1.3.tar.gz) = QInbrsTPxfUGZfXLfaOUOlbEMB+I2kC4mD476aouUGo=
-SIZE (Paste-1.3.tar.gz) = 355112
+MD5 (Paste-1.6.tar.gz) = 5cANKo4cu5pCt0GWegVUpw==
+RMD160 (Paste-1.6.tar.gz) = AKvOTtOThO6KrSdoH0NRqYX1enw=
+SHA1 (Paste-1.6.tar.gz) = Rd5XcqCozsRbcM3Dy5qg4w5dDws=
+SHA256 (Paste-1.6.tar.gz) = 0v4cIfov6zkjwKeoYoEcUacEEllUmO7ZHmOxp0ogykc=
+SIZE (Paste-1.6.tar.gz) = 368163
diff --git a/www/py-paste/pkg/PLIST b/www/py-paste/pkg/PLIST
index 8433e0454f3..c799d74010d 100644
--- a/www/py-paste/pkg/PLIST
+++ b/www/py-paste/pkg/PLIST
@@ -1,14 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/06/24 19:17:14 martynas Exp $
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}-nspkg.pth
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/Paste-1.3-py${MODPY_VERSION}.egg-info/top_level.txt
+@comment $OpenBSD: PLIST,v 1.2 2008/01/13 17:04:07 martynas Exp $
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}-nspkg.pth
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/Paste-${VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/paste/
 lib/python${MODPY_VERSION}/site-packages/paste/auth/
 lib/python${MODPY_VERSION}/site-packages/paste/auth/__init__.py
@@ -212,8 +212,8 @@ share/doc/py-paste/install-example.txt
 share/doc/py-paste/license.txt
 share/doc/py-paste/news.txt
 share/doc/py-paste/package_index.txt
+share/doc/py-paste/paste-httpserver-threadpool.txt
 share/doc/py-paste/related-projects.txt
-share/doc/py-paste/template.tmpl
 share/doc/py-paste/test_server.ini
 share/doc/py-paste/testing-applications.txt
 share/doc/py-paste/url-parsing-with-wsgi.txt