diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 97e33309a885..1e72801cab66 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -20,7 +20,18 @@ USE_X_PREFIX=	yes
 
 CONFIGURE_ARGS=	--enable-nls
 
-DOPEWARS=	${PKGNAME}
-PLIST_SUB=	DOPEWARS=${DOPEWARS}
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=yes
+.endif
+
+PLIST_SUB=	DOPEWARS=${PKGNAME}
+
+MAN6=	dopewars.6
+
+post-patch:
+	@${PERL} -pi -e 's!/pixmaps!/dopewars/pixmaps!' \
+		${WRKSRC}/src/Makefile.in
+	@${PERL} -pi -e 's!dopewars.sco!dopewars/dopewars.sco!g' \
+		${WRKSRC}/src/dopewars.c ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/dopewars/files/patch-aa b/games/dopewars/files/patch-aa
deleted file mode 100644
index e7dad8f8494e..000000000000
--- a/games/dopewars/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Mon Jun 18 14:30:07 2001
-+++ Makefile.am	Mon Jun 18 14:30:59 2001
-@@ -5,7 +5,6 @@
- install-data-local:
- 	${mkinstalldirs} ${DESTDIR}${datadir}
- 	touch ${DESTDIR}${datadir}/dopewars.sco
--	chown root:games ${DESTDIR}${datadir}/dopewars.sco || \
--	   chown root:wheel ${DESTDIR}${datadir}/dopewars.sco
-+	chown root:wheel ${DESTDIR}${datadir}/dopewars.sco
- 	chmod 0660 ${DESTDIR}${datadir}/dopewars.sco
- 
diff --git a/games/dopewars/files/patch-doc::Makefile.in b/games/dopewars/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..78deb517ea01
--- /dev/null
+++ b/games/dopewars/files/patch-doc::Makefile.in
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	Mon Jun 18 20:46:56 2001
++++ doc/Makefile.in	Thu Aug  2 18:46:04 2001
+@@ -248,8 +248,10 @@
+ 
+ 
+ install-data-local:
++ifndef NOPORTDOCS
+ 	${INSTALL} -d -o root -g 0 -m 0755 ${DESTDIR}${DOCPATH}
+ 	${INSTALL} -o root -g 0 -m 0644 ${DOCS} ${DESTDIR}${DOCPATH}
++endif
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games/dopewars/pkg-plist b/games/dopewars/pkg-plist
index 5d90a2540d49..ae9a1a43faa0 100644
--- a/games/dopewars/pkg-plist
+++ b/games/dopewars/pkg-plist
@@ -1,16 +1,28 @@
 bin/dopewars
-share/doc/%%DOPEWARS%%/aiplayer.html
-share/doc/%%DOPEWARS%%/clientplay.html
-share/doc/%%DOPEWARS%%/commandline.html
-share/doc/%%DOPEWARS%%/configfile.html
-share/doc/%%DOPEWARS%%/credits.html
-share/doc/%%DOPEWARS%%/developer.html
-share/doc/%%DOPEWARS%%/i18n.html
-share/doc/%%DOPEWARS%%/index.html
-share/doc/%%DOPEWARS%%/installation.html
-share/doc/%%DOPEWARS%%/metaserver.html
-share/doc/%%DOPEWARS%%/server.html
-share/doc/%%DOPEWARS%%/servercommands.html
-share/doc/%%DOPEWARS%%/windows.html
-share/dopewars.sco
-@dirrm share/doc/%%DOPEWARS%%
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/aiplayer.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/clientplay.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/commandline.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/configfile.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/credits.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/developer.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/i18n.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/index.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/installation.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/metaserver.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/server.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/servercommands.html
+%%PORTDOCS%%share/doc/%%DOPEWARS%%/windows.html
+share/dopewars/dopewars.sco
+share/dopewars/pixmaps/dopewars-pill.png
+share/dopewars/pixmaps/dopewars-shot.png
+share/dopewars/pixmaps/dopewars-weed.png
+share/locale/de/LC_MESSAGES/dopewars.mo
+share/locale/pl/LC_MESSAGES/dopewars.mo
+share/locale/pt_BR/LC_MESSAGES/dopewars.mo
+share/gnome/apps/Games/dopewars.desktop
+@unexec rmdir share/gnome/apps/Games 2>/dev/null || true
+@unexec rmdir share/gnome/apps 2>/dev/null || true
+@unexec rmdir share/gnome 2>/dev/null || true
+@dirrm share/dopewars/pixmaps
+@dirrm share/dopewars
+%%PORTDOCS%%@dirrm share/doc/%%DOPEWARS%%