diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index 39740b2..5759c283 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -12,26 +12,32 @@ DISTNAME=	MHonArc-${PORTVERSION}
 MAINTAINER=	kerndtr@kerndt.com
 COMMENT=	WWW front end for mail archives
 
-USE_BZIP2=	Yes
-USES=		perl5
+USES=		tar:bzip2
+USES+=		perl5
 NO_BUILD=	Yes
 
 MAN1=	mhonarc.1 mha-dbedit.1 mha-dbrecover.1 mha-decode.1
 
-INSTALL_ARGS=	-binpath ${PREFIX}/bin \
-		-libpath ${SITE_PERL} \
-		-manpath ${PREFIX}/man \
+INSTALL_ARGS=	-prefix ${STAGEDIR} -binpath ${STAGEDIR}${PREFIX}/bin \
+		-libpath ${STAGEDIR}${SITE_PERL} \
+		-manpath ${STAGEDIR}${PREFIX}/man \
 		-batch
 
 .if !defined(NOPORTDOCS)
-DOCSDIR=	${PREFIX}/share/doc/MHonArc
-INSTALL_ARGS+=	-docpath ${DOCSDIR}
+THEDOCSDIR=	${STAGEDIR}${PREFIX}/share/doc/MHonArc
+DOCSDIR=${PREFIX}/share/doc/MHonArc
+INSTALL_ARGS+=	-docpath ${THEDOCSDIR}
 .else
 INSTALL_ARGS+=	-nodoc
 .endif
 
-NO_STAGE=	yes
 do-install:
 	cd ${WRKSRC} && ${PERL5} install.me ${INSTALL_ARGS}
 
+post-install:
+.for file in mha-dbedit mha-dbrecover mha-decode mhonarc
+	${REINPLACE_CMD} -E -e 's,${STAGEDIR},,g' ${STAGEDIR}/${PREFIX}/bin/${file}
+	${RM} ${STAGEDIR}/${PREFIX}/bin/${file}.bak
+.endfor
+
 .include <bsd.port.mk>
diff --git a/www/mhonarc/pkg-plist b/www/mhonarc/pkg-plist
index 5a0f305..26587ca 100644
--- a/www/mhonarc/pkg-plist
+++ b/www/mhonarc/pkg-plist
@@ -2,6 +2,10 @@ bin/mha-dbedit
 bin/mha-dbrecover
 bin/mha-decode
 bin/mhonarc
+man/man1/mha-dbedit.1.gz
+man/man1/mha-dbrecover.1.gz
+man/man1/mha-decode.1.gz
+man/man1/mhonarc.1.gz
 %%SITE_PERL%%/MHonArc/Char.pm
 %%SITE_PERL%%/MHonArc/Char/JP.pm
 %%SITE_PERL%%/MHonArc/Char/KR.pm