diff --git a/audio/cymbaline/Makefile b/audio/cymbaline/Makefile
index a6fc67740cda..1f078162d272 100644
--- a/audio/cymbaline/Makefile
+++ b/audio/cymbaline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cymbaline
 PORTVERSION=	1.3e
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.silmarill.org/files/
 
@@ -12,29 +13,19 @@ COMMENT=	Console frontend for py-mad
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao \
 		${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
 
-NO_STAGE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 PLIST_FILES=	bin/cymbaline
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
 
 post-install:
-	@${MV} -f ${PREFIX}/bin/cymbaline.py ${PREFIX}/bin/cymbaline
-	@${FIND} ${PYTHON_SITELIBDIR}/cypack ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PYTHON_SITELIBDIR}/cypack -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	${LN} -sf cymbaline.py ${STAGEDIR}${PREFIX}/bin/cymbaline
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>