diff --git a/www/py-qpy/Makefile b/www/py-qpy/Makefile
index 2d41d64fc46c..5cc3f5359a49 100644
--- a/www/py-qpy/Makefile
+++ b/www/py-qpy/Makefile
@@ -1,29 +1,28 @@
 # Created by: Dryice Liu <dryice@dryice.name>
 # $FreeBSD$
 
 PORTNAME=	qpy
 PORTVERSION=	1.8
 CATEGORIES=	www python
 MASTER_SITES=	http://www.mems-exchange.org/software/qpy/ \
 		LOCAL/sunpoet
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generating safely-quoted html text from python code
 
 OPTIONS_DEFINE=	DOCS
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 MAKE_ENV=	USE_DISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 USE_PYDISTUTILS=yes
 USE_PYTHON=	-2.7
 
-.include <bsd.port.options.mk>
+PORTDOCS=	CHANGES.txt LICENSE.txt README.txt
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.txt LICENSE.txt README.txt ${STAGEDIR}${DOCSDIR}/
-.endif
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/www/py-qpy/pkg-plist b/www/py-qpy/pkg-plist
deleted file mode 100644
index a215491c25f3..000000000000
--- a/www/py-qpy/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-bin/qpcheck.py
-bin/qpyrun.py
-%%PYTHON_SITELIBDIR%%/qpy/__init__.py
-%%PYTHON_SITELIBDIR%%/qpy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/qpy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/qpy/__main__.py
-%%PYTHON_SITELIBDIR%%/qpy/__main__.pyc
-%%PYTHON_SITELIBDIR%%/qpy/__main__.pyo
-%%PYTHON_SITELIBDIR%%/qpy/ch.py
-%%PYTHON_SITELIBDIR%%/qpy/ch.pyc
-%%PYTHON_SITELIBDIR%%/qpy/ch.pyo
-%%PYTHON_SITELIBDIR%%/qpy/compile.py
-%%PYTHON_SITELIBDIR%%/qpy/compile.pyc
-%%PYTHON_SITELIBDIR%%/qpy/compile.pyo
-%%PYTHON_SITELIBDIR%%/qpy/quoted.py
-%%PYTHON_SITELIBDIR%%/qpy/quoted.pyc
-%%PYTHON_SITELIBDIR%%/qpy/quoted.pyo
-%%PYTHON_SITELIBDIR%%/qpy/quoted.so
-%%PYTHON_SITELIBDIR%%/qpy/qpcheck.py
-%%PYTHON_SITELIBDIR%%/qpy/qpcheck.pyc
-%%PYTHON_SITELIBDIR%%/qpy/qpcheck.pyo
-%%PYTHON_SITELIBDIR%%/qpy/qpyrun.py
-%%PYTHON_SITELIBDIR%%/qpy/qpyrun.pyc
-%%PYTHON_SITELIBDIR%%/qpy/qpyrun.pyo
-%%PYTHON_SITELIBDIR%%/qpy/setup.py
-%%PYTHON_SITELIBDIR%%/qpy/setup.pyc
-%%PYTHON_SITELIBDIR%%/qpy/setup.pyo
-%%PYTHON_SITELIBDIR%%/qpy/translate.py
-%%PYTHON_SITELIBDIR%%/qpy/translate.pyc
-%%PYTHON_SITELIBDIR%%/qpy/translate.pyo
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/qpy