diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 84b6f233ad18..3b903e7e112f 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	imaze
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.sourcefiles.org/Games/Arcade/
 PKGNAMESUFFIX=	-${TOOLKIT}
@@ -23,7 +23,7 @@ MAKE_ENV=	SOUNDDIR="${DATADIR}/sounds"
 BUILD_WRKSRC=	${WRKSRC}/source
 CONFIGURE_WRKSRC=	${WRKSRC}/source
 
-OPTIONS_DEFINE=	AUDIO JOYSTICK
+OPTIONS_DEFINE=	AUDIO DOCS JOYSTICK
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	ATHENA MOTIF XVIEW
 OPTIONS_DEFAULT=	ATHENA AUDIO JOYSTICK
@@ -41,17 +41,27 @@ MOTIF_VARS=	MOTIFLIB="-L${LOCALBASE}/lib -lXm -lXt" TOOLKIT=motif
 XVIEW_LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 XVIEW_VARS=	TOOLKIT=xview
 
+post-patch:
+	@${REINPLACE_CMD} 's@ninja@imazeninja@g' ${WRKSRC}/man6/*.6
+
 do-install:
-.for i in genlab imaze imazesrv imazestat ninja xlabed
-	(cd ${WRKSRC}/source && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
-.endfor
-	(cd ${WRKSRC}/man6 && ${INSTALL_MAN} *.6 ${STAGEDIR}${MAN6PREFIX}/man/man6)
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR})
+	cd ${WRKSRC}/source && ${INSTALL_PROGRAM} \
+		genlab imaze imazesrv imazestat xlabed \
+		${STAGEDIR}${PREFIX}/bin
+# Install ninja as imazeninja to resolve conflict with devel/ninja
+	${INSTALL_PROGRAM} ${WRKSRC}/source/ninja ${STAGEDIR}${PREFIX}/bin/imazeninja
+	cd ${WRKSRC}/man6 && ${INSTALL_MAN} \
+		genlab.6 imaze.6 imazesrv.6 imazestat.6 xlabed.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/man6/ninja.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/man6/imazeninja.6
 	@${MKDIR} ${STAGEDIR}${DATADIR}/labs
-	(cd ${WRKSRC}/labs && ${INSTALL_DATA} *.lab ${STAGEDIR}${DATADIR}/labs)
+	${INSTALL_DATA} ${WRKSRC}/labs/*.lab ${STAGEDIR}${DATADIR}/labs
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sounds
-	(cd ${WRKSRC}/sounds && ${INSTALL_DATA} *.au ${STAGEDIR}${DATADIR}/sounds)
-	@${ECHO_MSG} "Please read the file \"${DATADIR}/README\"."
+	${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${STAGEDIR}${DATADIR}/sounds
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/imaze/pkg-plist b/games/imaze/pkg-plist
index 4ade739b6eb5..dfd2b989bcc0 100644
--- a/games/imaze/pkg-plist
+++ b/games/imaze/pkg-plist
@@ -1,14 +1,14 @@
-bin/imaze
-bin/ninja
 bin/genlab
+bin/imaze
+bin/imazeninja
 bin/imazesrv
 bin/imazestat
 bin/xlabed
 man/man6/genlab.6.gz
 man/man6/imaze.6.gz
+man/man6/imazeninja.6.gz
 man/man6/imazesrv.6.gz
 man/man6/imazestat.6.gz
-man/man6/ninja.6.gz
 man/man6/xlabed.6.gz
 %%DATADIR%%/labs/10x10.lab
 %%DATADIR%%/labs/12x12.lab
@@ -29,4 +29,4 @@ man/man6/xlabed.6.gz
 %%DATADIR%%/sounds/pause.au
 %%DATADIR%%/sounds/shoot.au
 %%DATADIR%%/sounds/title.au
-%%DATADIR%%/README
+%%DOCSDIR%%/README