diff --git a/audio/mp3mover/Makefile b/audio/mp3mover/Makefile
index 5fc90efe9334..12dbd5046812 100644
--- a/audio/mp3mover/Makefile
+++ b/audio/mp3mover/Makefile
@@ -11,24 +11,21 @@ COMMENT=	Rename mp3s and manipulate them
 
 RUN_DEPENDS=	p5-tagged>=0:${PORTSDIR}/audio/p5-tagged
 
-NO_STAGE=	yes
 USES=		perl5
 NO_BUILD=	yes
 
-PORTDOCS=	readme
-PLIST_FILES=	bin/mp3mover \
-		%%DATADIR%%/sample-.mp3moverrc \
-		%%DATADIR%%/shellperfect-.mp3moverrc
-PLIST_DIRS=	%%DATADIR%%
+PLIST_FILES=	bin/mp3mover
+PORTDOCS=	*
+PORTDATA=	*
+
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mp3mover.pl ${PREFIX}/bin/mp3mover
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/sample-.mp3moverrc ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/shellperfect-.mp3moverrc ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/mp3mover.pl ${STAGEDIR}${PREFIX}/bin/mp3mover
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sample-.mp3moverrc ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/shellperfect-.mp3moverrc ${STAGEDIR}${DATADIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>