diff --git a/games/polypuzzle/Makefile b/games/polypuzzle/Makefile
index 8a176df489f7..26764e199328 100644
--- a/games/polypuzzle/Makefile
+++ b/games/polypuzzle/Makefile
@@ -14,7 +14,6 @@ USES= 		tk:84,run tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	DOCS
 DOC_FILES=	About Bugs Changelog Install Instructions Links Math Readme \
 		Thanks Todo
 DATA_FILES=	menus pieces.3x20 pieces.783 pieces.bonus pieces.colours \
@@ -22,6 +21,8 @@ DATA_FILES=	menus pieces.3x20 pieces.783 pieces.bonus pieces.colours \
 		pieces.round pieces.small pieces.square pieces.star \
 		pieces.triangle
 
+OPTIONS_DEFINE=	DOCS
+
 pre-install:
 	 @${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:g" ${WRKSRC}/polypuzzle
 
@@ -29,11 +30,11 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/polypuzzle ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in ${DATA_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/polypuzzle/pkg-plist b/games/polypuzzle/pkg-plist
index 9da1d3dd56ab..23439f6a70a5 100644
--- a/games/polypuzzle/pkg-plist
+++ b/games/polypuzzle/pkg-plist
@@ -23,5 +23,3 @@ bin/polypuzzle
 %%PORTDOCS%%%%DOCSDIR%%/Readme
 %%PORTDOCS%%%%DOCSDIR%%/Thanks
 %%PORTDOCS%%%%DOCSDIR%%/Todo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%