diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile
index 6ce6f9e6be8f..46f587965be8 100644
--- a/x11-wm/wmthemeinstall/Makefile
+++ b/x11-wm/wmthemeinstall/Makefile
@@ -20,7 +20,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
+
+PORTDOCS=	AUTHORS ChangeLog README
+PLIST_FILES=	bin/wmthemeinstall
 
 pre-build:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/wmOptions.c
@@ -29,9 +31,9 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/wmthemeinstall ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
+. for f in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+. endfor
 	@${ECHO}
 	@${ECHO} "Documentation was installed in ${DOCSDIR}."
 	@${ECHO}
diff --git a/x11-wm/wmthemeinstall/pkg-descr b/x11-wm/wmthemeinstall/pkg-descr
index 8a31cbdcb601..32c61ebc72fe 100644
--- a/x11-wm/wmthemeinstall/pkg-descr
+++ b/x11-wm/wmthemeinstall/pkg-descr
@@ -2,7 +2,5 @@ wmthemeinstall is a neat program that helps windowmaker users
 manage their themes, i.e. install them, turn them on, move them
 around, etc.
 
-WWW: http://www.jeremias.net/wmthemeinstall/download/
 Author: Craig Hanson <grunyon@mtlug.org>
-
-- Adam <adam-ports@blacktabby.org>
+WWW: http://www.jeremias.net/wmthemeinstall/
diff --git a/x11-wm/wmthemeinstall/pkg-plist b/x11-wm/wmthemeinstall/pkg-plist
deleted file mode 100644
index 719cd8bcede5..000000000000
--- a/x11-wm/wmthemeinstall/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/wmthemeinstall
-%%PORTDOCS%%share/doc/wmthemeinstall/AUTHORS
-%%PORTDOCS%%share/doc/wmthemeinstall/ChangeLog
-%%PORTDOCS%%share/doc/wmthemeinstall/README
-%%PORTDOCS%%@dirrm share/doc/wmthemeinstall