diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
index efcd1648dbe..97dff96fa80 100644
--- a/www/py-werkzeug/Makefile
+++ b/www/py-werkzeug/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2012/08/10 20:13:37 fgsch Exp $
+# $OpenBSD: Makefile,v 1.12 2013/03/10 10:59:42 fgsch Exp $
 
 COMMENT =		WSGI utility collection
 
 MODPY_EGG_VERSION =	0.8.3
 DISTNAME =		Werkzeug-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
+REVISION =		0
 
 CATEGORIES =		www devel
 
@@ -14,9 +15,6 @@ MASTER_SITES =		${MASTER_SITE_PYPI:=W/Werkzeug/}
 
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
-PERMIT_PACKAGE_FTP =	Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP =	Yes
 
 MODULES =		lang/python
 MODPY_SETUPTOOLS =	Yes
@@ -25,12 +23,12 @@ PKG_ARCH =		*
 BUILD_DEPENDS =		textproc/py-sphinx
 
 post-build:
-	cd ${WRKSRC}/docs && \
-	    ${LOCALBASE}/bin/sphinx-build -N -b html . _build/html
+	cd ${WRKSRC}/docs && $(MAKE_PROGRAM) html
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}werkzeug
 	cd ${WRKSRC}/docs/_build/html && \
-	    pax -rw * ${PREFIX}/share/doc/${MODPY_PY_PREFIX}werkzeug
+	    pax -rw _images _static contrib deployment *.{inv,js,html} \
+	    ${PREFIX}/share/doc/${MODPY_PY_PREFIX}werkzeug
 
 .include <bsd.port.mk>
diff --git a/www/py-werkzeug/pkg/PLIST b/www/py-werkzeug/pkg/PLIST
index 32c0360b605..cd3e901af76 100644
--- a/www/py-werkzeug/pkg/PLIST
+++ b/www/py-werkzeug/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2011/12/31 15:06:41 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.5 2013/03/10 10:59:42 fgsch Exp $
 lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -179,49 +179,6 @@ share/doc/${MODPY_PY_PREFIX}werkzeug/
 share/doc/${MODPY_PY_PREFIX}werkzeug/_images/
 share/doc/${MODPY_PY_PREFIX}werkzeug/_images/debug-screenshot.png
 share/doc/${MODPY_PY_PREFIX}werkzeug/_images/shortly.png
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/changes.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/atom.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/cache.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/fixers.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/index.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/iterio.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/lint.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/profiler.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/securecookie.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/sessions.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/contrib/wrappers.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/datastructures.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/debug.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/deployment/
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/deployment/cgi.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/deployment/fastcgi.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/deployment/index.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/deployment/mod_wsgi.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/deployment/proxying.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/exceptions.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/http.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/index.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/installation.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/latexindex.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/levels.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/local.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/middlewares.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/quickstart.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/request_data.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/routing.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/script.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/serving.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/templates.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/terms.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/test.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/transition.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/tutorial.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/unicode.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/utils.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/wrappers.txt
-share/doc/${MODPY_PY_PREFIX}werkzeug/_sources/wsgi.txt
 share/doc/${MODPY_PY_PREFIX}werkzeug/_static/
 share/doc/${MODPY_PY_PREFIX}werkzeug/_static/background.png
 share/doc/${MODPY_PY_PREFIX}werkzeug/_static/basic.css