diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index 4589faf856b5..5ee707c08e9b 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -13,19 +13,17 @@ COMMENT=	Perl script for renaming multiple files
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+OPTIONS_DEFINE=	DOCS
+
 RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/trunk
 
-USE_BZIP2=	yes
 USE_PERL5=	run
-USES=		gettext perl5
+USES=		gettext perl5 tar:bzip2
 NO_BUILD=	yes
 
-MAN1=		gprename.1
-
-NO_STAGE=	yes
 post-extract:
 	@${RM} -rf ${WRKSRC}/build
 
@@ -34,14 +32,13 @@ post-patch:
 		'/^#!/s|/.*|${PERL}|' ${WRKSRC}/bin/gprename
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${PREFIX}| ; \
+		 s|(DESTDIR)|(DESTDIR)${PREFIX}| ; \
 		 s|$$(CURDIR)|$$(.CURDIR)| ; \
 		 s|uninstall build|build| ; \
 		 s|share/man|man|' ${WRKSRC}/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fm/gprename/pkg-plist b/x11-fm/gprename/pkg-plist
index 8d7cf3543ee5..264932d29ae7 100644
--- a/x11-fm/gprename/pkg-plist
+++ b/x11-fm/gprename/pkg-plist
@@ -1,4 +1,5 @@
 bin/gprename
+man/man1/gprename.1.gz
 share/applications/gprename-nautilus-actions.xml
 share/applications/gprename.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README