diff --git a/www/py-meld3/Makefile b/www/py-meld3/Makefile
index afd1bb79ec3..7298dc4726f 100644
--- a/www/py-meld3/Makefile
+++ b/www/py-meld3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/03/22 17:01:13 fgsch Exp $
+# $OpenBSD: Makefile,v 1.2 2009/03/22 17:40:59 fgsch Exp $
 
 COMMENT =	html/xml templating engine
 
 MODPY_EGG_VERSION = 0.6.5
 
 DISTNAME =	meld3-${MODPY_EGG_VERSION}
-PKGNAME =	py-${DISTNAME:L}
+PKGNAME =	py-${DISTNAME:L}p0
 
 CATEGORIES =	www
 
@@ -22,9 +22,9 @@ MASTER_SITES =	${HOMEPAGE}
 MODULES =	lang/python
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/docs/py-meld3
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-meld3
 	${INSTALL_DATA} ${WRKSRC}/README.txt \
-	    ${PREFIX}/share/docs/py-meld3
+	    ${PREFIX}/share/doc/py-meld3
 
 do-regress:
 	cd ${WRKSRC}/meld3 && ${MODPY_BIN} test_meld3.py
diff --git a/www/py-meld3/pkg/PLIST b/www/py-meld3/pkg/PLIST
index c304d8cea42..ba8b0149c60 100644
--- a/www/py-meld3/pkg/PLIST
+++ b/www/py-meld3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/22 17:01:13 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/03/22 17:40:59 fgsch Exp $
 lib/python${MODPY_VERSION}/site-packages/meld3/
 lib/python${MODPY_VERSION}/site-packages/meld3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/meld3/__init__.py
@@ -21,6 +21,5 @@ lib/python${MODPY_VERSION}/site-packages/meld3/testclone.py
 lib/python${MODPY_VERSION}/site-packages/meld3/testclone.pyc
 lib/python${MODPY_VERSION}/site-packages/meld3/zptprofile.py
 lib/python${MODPY_VERSION}/site-packages/meld3/zptprofile.pyc
-share/docs/
-share/docs/py-meld3/
-share/docs/py-meld3/README.txt
+share/doc/py-meld3/
+share/doc/py-meld3/README.txt
diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile
index 1a2f2c1fc89..72ec3fabc02 100644
--- a/www/py-routes/Makefile
+++ b/www/py-routes/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/03/15 12:18:03 fgsch Exp $
+# $OpenBSD: Makefile,v 1.2 2009/03/22 17:40:59 fgsch Exp $
 
 COMMENT =	re-implementation of the rails routes system
 
 MODPY_EGG_VERSION = 1.10.3
 
 DISTNAME =	Routes-${MODPY_EGG_VERSION}
-PKGNAME =	py-${DISTNAME:L}
+PKGNAME =	py-${DISTNAME:L}p0
 
 CATEGORIES =	www devel
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES =	http://pypi.python.org/packages/source/R/Routes/
+MASTER_SITES =	${MASTER_SITE_PYPI:=/R/Routes/}
 
 MODULES =	lang/python
 
@@ -28,8 +28,8 @@ NO_REGRESS =	Yes
 DOCS =		index.txt integration.txt manual.txt recipes.txt
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/docs/py-routes
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-routes
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${DOCS} \
-	  ${PREFIX}/share/docs/py-routes
+	  ${PREFIX}/share/doc/py-routes
 
 .include <bsd.port.mk>
diff --git a/www/py-routes/pkg/PLIST b/www/py-routes/pkg/PLIST
index 137b0e80a21..b572a939ae2 100644
--- a/www/py-routes/pkg/PLIST
+++ b/www/py-routes/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/15 12:18:03 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/03/22 17:40:59 fgsch Exp $
 lib/python${MODPY_VERSION}/site-packages/Routes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Routes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Routes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -20,9 +20,8 @@ lib/python${MODPY_VERSION}/site-packages/routes/threadinglocal.py
 lib/python${MODPY_VERSION}/site-packages/routes/threadinglocal.pyc
 lib/python${MODPY_VERSION}/site-packages/routes/util.py
 lib/python${MODPY_VERSION}/site-packages/routes/util.pyc
-share/docs/
-share/docs/py-routes/
-share/docs/py-routes/index.txt
-share/docs/py-routes/integration.txt
-share/docs/py-routes/manual.txt
-share/docs/py-routes/recipes.txt
+share/doc/py-routes/
+share/doc/py-routes/index.txt
+share/doc/py-routes/integration.txt
+share/doc/py-routes/manual.txt
+share/doc/py-routes/recipes.txt
diff --git a/www/py-tempita/Makefile b/www/py-tempita/Makefile
index 60e18ccc711..6302f27722c 100644
--- a/www/py-tempita/Makefile
+++ b/www/py-tempita/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/03/22 16:57:01 fgsch Exp $
+# $OpenBSD: Makefile,v 1.2 2009/03/22 17:40:59 fgsch Exp $
 
 COMMENT =	very small text templating language
 
 MODPY_EGG_VERSION = 0.3
 
 DISTNAME =	Tempita-${MODPY_EGG_VERSION}
-PKGNAME =	py-${DISTNAME:L}
+PKGNAME =	py-${DISTNAME:L}p0
 
 CATEGORIES =	www
 
@@ -25,12 +25,12 @@ MODPY_SETUPTOOLS =	Yes
 
 REGRESS_DEPENDS = ::devel/py-nose
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-tempita
+	${INSTALL_DATA} ${WRKSRC}/docs/index.txt \
+	    ${PREFIX}/share/doc/py-tempita
+
 do-regress:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests lib tests
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/docs/py-tempita
-	${INSTALL_DATA} ${WRKSRC}/docs/index.txt \
-	    ${PREFIX}/share/docs/py-tempita
-
 .include <bsd.port.mk>
diff --git a/www/py-tempita/pkg/PLIST b/www/py-tempita/pkg/PLIST
index d85dd4c4c08..a5ad7c8879a 100644
--- a/www/py-tempita/pkg/PLIST
+++ b/www/py-tempita/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/22 16:57:01 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/03/22 17:40:59 fgsch Exp $
 lib/python${MODPY_VERSION}/site-packages/Tempita-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Tempita-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Tempita-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -10,6 +10,5 @@ lib/python${MODPY_VERSION}/site-packages/tempita/__init__.py
 lib/python${MODPY_VERSION}/site-packages/tempita/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/tempita/_looper.py
 lib/python${MODPY_VERSION}/site-packages/tempita/_looper.pyc
-share/docs/
-share/docs/py-tempita/
-share/docs/py-tempita/index.txt
+share/doc/py-tempita/
+share/doc/py-tempita/index.txt