diff --git a/devel/py-utils/Makefile b/devel/py-utils/Makefile
index c5f72e60c1b5..63f266de96f8 100644
--- a/devel/py-utils/Makefile
+++ b/devel/py-utils/Makefile
@@ -7,24 +7,22 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://www.voidspace.org.uk/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pythonutils-${PORTVERSION}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	daniel@netwalk.org
 COMMENT=	General utility modules that simplify common programming in Python
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=	pythonutils
-PYDISTUTILS_EGGINFODIR=	${PYTHONPREFIX_SITELIBDIR}/pythonutils
-WRKSRC=		${WRKDIR}/pythonutils-${PORTVERSION}
-USE_ZIP=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR})
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/py-utils/pkg-plist b/devel/py-utils/pkg-plist
deleted file mode 100644
index 6d9940ae8e47..000000000000
--- a/devel/py-utils/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-%%PYTHON_SITELIBDIR%%/pythonutils.pth
-%%PYTHON_SITELIBDIR%%/pythonutils/__init__.py
-%%PYTHON_SITELIBDIR%%/pythonutils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/cgiutils.py
-%%PYTHON_SITELIBDIR%%/pythonutils/cgiutils.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/cgiutils.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/configobj.py
-%%PYTHON_SITELIBDIR%%/pythonutils/configobj.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/configobj.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/odict.py
-%%PYTHON_SITELIBDIR%%/pythonutils/odict.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/odict.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/pathutils.py
-%%PYTHON_SITELIBDIR%%/pythonutils/pathutils.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/pathutils.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/standout.py
-%%PYTHON_SITELIBDIR%%/pythonutils/standout.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/standout.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/urlpath.py
-%%PYTHON_SITELIBDIR%%/pythonutils/urlpath.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/urlpath.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/validate.py
-%%PYTHON_SITELIBDIR%%/pythonutils/validate.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/validate.pyo
-%%PORTDOCS%%%%DOCSDIR%%/BSD-LICENSE.html
-%%PORTDOCS%%%%DOCSDIR%%/BSD-LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/cgiutils.html
-%%PORTDOCS%%%%DOCSDIR%%/cgiutils.txt
-%%PORTDOCS%%%%DOCSDIR%%/configobj.html
-%%PORTDOCS%%%%DOCSDIR%%/configobj.txt
-%%PORTDOCS%%%%DOCSDIR%%/images/PythonPowered.png
-%%PORTDOCS%%%%DOCSDIR%%/images/new_python.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/osi-certified-120x100.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/powered_by_python.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/pythonbanner.gif
-%%PORTDOCS%%%%DOCSDIR%%/odict.html
-%%PORTDOCS%%%%DOCSDIR%%/odict.txt
-%%PORTDOCS%%%%DOCSDIR%%/pathutils.html
-%%PORTDOCS%%%%DOCSDIR%%/pathutils.txt
-%%PORTDOCS%%%%DOCSDIR%%/pythonutils.html
-%%PORTDOCS%%%%DOCSDIR%%/pythonutils.txt
-%%PORTDOCS%%%%DOCSDIR%%/smilies/arrow.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/badgrin.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/biggrin.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/confused.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/cool.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/cry.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/doubt.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/evil.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/exclaim.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/idea.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/lol.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/mad.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/neutral.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/question.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/razz.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/redface.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/rolleyes.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/sad.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/sc_smilies.pak
-%%PORTDOCS%%%%DOCSDIR%%/smilies/shock.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/smile.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/surprised.gif
-%%PORTDOCS%%%%DOCSDIR%%/smilies/wink.gif
-%%PORTDOCS%%%%DOCSDIR%%/standout.html
-%%PORTDOCS%%%%DOCSDIR%%/standout.txt
-%%PORTDOCS%%%%DOCSDIR%%/stylesheets/default.css
-%%PORTDOCS%%%%DOCSDIR%%/stylesheets/pep.css
-%%PORTDOCS%%%%DOCSDIR%%/stylesheets/pysrc.css
-%%PORTDOCS%%%%DOCSDIR%%/stylesheets/voidspace_docutils.css
-%%PORTDOCS%%%%DOCSDIR%%/urlpath.html
-%%PORTDOCS%%%%DOCSDIR%%/urlpath.txt
-%%PORTDOCS%%%%DOCSDIR%%/validate.html
-%%PORTDOCS%%%%DOCSDIR%%/validate.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/stylesheets
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/smilies
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/pythonutils