diff --git a/lang/rexx-regutil/Makefile b/lang/rexx-regutil/Makefile
index c5c238632348..e2e99d7e0176 100644
--- a/lang/rexx-regutil/Makefile
+++ b/lang/rexx-regutil/Makefile
@@ -17,26 +17,21 @@ USES=		zip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_LDCONFIG=	yes
-MAN1=		regutil.1
-MLINKS=		regutil.1 rexxutil.1
 MAKEFILE=	Makefile.bsd
 
 SUB_FILES=	regutil.1 pkg-message
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/librexxutil.so ${PREFIX}/lib
-		${INSTALL_MAN} ${WRKDIR}/regutil.1 ${PREFIX}/man/man1
+		${INSTALL_LIB} ${WRKSRC}/librexxutil.so ${STAGEDIR}${PREFIX}/lib
+		${INSTALL_MAN} ${WRKDIR}/regutil.1 ${STAGEDIR}${PREFIX}/man/man1/regutil.1.gz
+		${INSTALL_MAN} ${WRKDIR}/regutil.1 ${STAGEDIR}${PREFIX}/man/man1/rexxutil.1.gz
 
 post-install:
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-		${INSTALL_MAN} ${WRKSRC}/regutil.pdf ${DOCSDIR}
-		@${CAT} ${PKGMESSAGE}
-.endif
+		${MKDIR} ${STAGEDIR}${DOCSDIR}
+		${INSTALL_MAN} ${WRKSRC}/regutil.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/lang/rexx-regutil/pkg-plist b/lang/rexx-regutil/pkg-plist
index 3fb0154bcedd..492139fffec4 100644
--- a/lang/rexx-regutil/pkg-plist
+++ b/lang/rexx-regutil/pkg-plist
@@ -1,3 +1,5 @@
 lib/librexxutil.so
+man/man1/regutil.1.gz
+man/man1/rexxutil.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/regutil.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%