diff --git a/audio/py-pyaudio/Makefile b/audio/py-pyaudio/Makefile
index db87f29c3904..4eb03681a667 100644
--- a/audio/py-pyaudio/Makefile
+++ b/audio/py-pyaudio/Makefile
@@ -10,30 +10,28 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Portaudio toolkit bindings for Python
 
+OPTIONS_DEFINE=	DOCS
+
 LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio2
 
 USE_PYTHON=		yes
-NO_STAGE=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	PyAudio
+PYDISTUTILS_AUTOPLIST=	yes
 
 WRKSRC=		${WRKDIR}/PyAudio-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
+PORTDOCS=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/setup.py
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/*.js ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/*.inv ${DOCSDIR}
-	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} _static ${DOCSDIR}/
-	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} _sources ${DOCSDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.js ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.inv ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} _static ${STAGEDIR}${DOCSDIR}/
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} _sources ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/audio/py-pyaudio/pkg-plist b/audio/py-pyaudio/pkg-plist
deleted file mode 100644
index c5a8d6b830d0..000000000000
--- a/audio/py-pyaudio/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-%%PYTHON_SITELIBDIR%%/pyaudio.py
-%%PYTHON_SITELIBDIR%%/pyaudio.pyc
-%%PYTHON_SITELIBDIR%%/pyaudio.pyo
-%%PYTHON_SITELIBDIR%%/_portaudio.so
-%%PORTDOCS%%%%DOCSDIR%%/_sources/examples.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
-%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/nature.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/genindex.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/objects.inv
-%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
-%%PORTDOCS%%%%DOCSDIR%%/search.html
-%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
-%%PORTDOCS%%@dirrm %%DOCSDIR%%