diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 3a7de421c848..18ea387ca766 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	mh
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese mail
 MASTER_SITES=	ftp://ftp.laic.u-hyogo.ac.jp/pub/net/mh/
 DISTNAME=	${PORTNAME}-${VERSION}-JP-${JP_VERSION}
 
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Rand MH mail handling system + Japanese patches
 
 BUILD_DEPENDS=	jless:japanese/less
 RUN_DEPENDS=	jless:japanese/less
 
 VERSION=	6.8.4
 JP_VERSION=	3.05
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-batchmode \
 		--enable-apop=${PREFIX}/etc/pop.auth \
-		--enable-jmandir=${MANPREFIX}/man/ja
+		--enable-jmandir=${PREFIX}/share/man/ja
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-Wno-return-type
 LLD_UNSAFE=	yes
 
 USE_LDCONFIG=	yes
 
 PORTDOCS=	00.READ.ME.1ST CHANGES.JP COMMANDS.JP FAQ.JP FEATURES.JP \
 		INSTALL.JP OPTIONS.JP READ-ME.JP TODO.JP
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 CONFLICTS=	ali mmh nmh p5-Dist-Joseki # bin/ali bin/anno bin/burst bin/comp bin/dist bin/folder bin/folders bin/forw bin/inc
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e "s/-O /${CFLAGS} /g" ${WRKSRC}/configure
 .for i in comp dist forw mh-mail mhl ja-comp ja-dist ja-forw ja-mh-mail ja-mhl
 	@(cd ${WRKSRC}/conf/doc && \
 	${AWK} '{ \
 	if (/^\.so/) { \
 		ifile="../../support/general" substr($$2, index($$2, "/")); \
 		while((getline l < ifile > 0)) \
 			print l; \
 		close(ifile); \
 	} else \
 		print; \
 	}' ${i}.rf > ${i}.tmp && ${MV} ${i}.tmp ${i}.rf)
 .endfor
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmh.so.3
 .for i in ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack rcvstore rcvtty slocal spost
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mh/${i}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc-JP && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/japanese/mh/pkg-plist b/japanese/mh/pkg-plist
index 87bffbd61b13..9c96cbafcebb 100644
--- a/japanese/mh/pkg-plist
+++ b/japanese/mh/pkg-plist
@@ -1,174 +1,174 @@
 bin/ali
 bin/anno
 bin/bbc
 bin/burst
 bin/comp
 bin/dist
 bin/folder
 bin/folders
 bin/forw
 bin/inc
 bin/mark
 bin/mhmail
 bin/mhn
 bin/mhparam
 bin/mhpath
 bin/msgchk
 bin/msh
 bin/next
 bin/packf
 bin/pgped
 bin/pgpshow
 bin/pick
 bin/prev
 bin/prompter
 bin/refile
 bin/repl
 bin/rmf
 bin/rmm
 bin/scan
 bin/send
 bin/show
 bin/sortm
 bin/vmh
 bin/whatnow
 bin/whom
 lib/mh/MailAliases
 lib/mh/ap
 lib/mh/components
 lib/mh/conflict
 lib/mh/digestcomps
 lib/mh/distcomps
 lib/mh/dp
 lib/mh/fmtdump
 lib/mh/forwcomps
 lib/mh/install-mh
 lib/mh/mhl
 lib/mh/mhl.body
 lib/mh/mhl.digest
 lib/mh/mhl.format
 lib/mh/mhl.forward
 lib/mh/mhl.headers
 lib/mh/mhn_defaults
 lib/mh/mtstailor
 lib/mh/packmbox
 lib/mh/post
 lib/mh/rcvdist
 lib/mh/rcvdistcomps
 lib/mh/rcvpack
 lib/mh/rcvstore
 lib/mh/rcvtty
 lib/mh/replcomps
 lib/mh/scan.default
 lib/mh/scan.mailx
 lib/mh/scan.size
 lib/mh/scan.time
 lib/mh/scan.timely
 lib/mh/slocal
 lib/mh/spost
 lib/mh/tmac.h
 lib/mh/viamail
 lib/libmh.so
 lib/libmh.so.3
-man/ja/man1/ali.1.gz
-man/ja/man1/anno.1.gz
-man/ja/man1/bbc.1.gz
-man/ja/man1/burst.1.gz
-man/ja/man1/comp.1.gz
-man/ja/man1/dist.1.gz
-man/ja/man1/folder.1.gz
-man/ja/man1/forw.1.gz
-man/ja/man1/inc.1.gz
-man/ja/man1/mark.1.gz
-man/ja/man1/mh-chart.1.gz
-man/ja/man1/mh.1.gz
-man/ja/man1/mhl.1.gz
-man/ja/man1/mhmail.1.gz
-man/ja/man1/mhn.1.gz
-man/ja/man1/mhook.1.gz
-man/ja/man1/mhparam.1.gz
-man/ja/man1/mhpath.1.gz
-man/ja/man1/msgchk.1.gz
-man/ja/man1/msh.1.gz
-man/ja/man1/next.1.gz
-man/ja/man1/packf.1.gz
-man/ja/man1/pgped.1.gz
-man/ja/man1/pick.1.gz
-man/ja/man1/prev.1.gz
-man/ja/man1/prompter.1.gz
-man/ja/man1/rcvstore.1.gz
-man/ja/man1/refile.1.gz
-man/ja/man1/repl.1.gz
-man/ja/man1/rmf.1.gz
-man/ja/man1/rmm.1.gz
-man/ja/man1/scan.1.gz
-man/ja/man1/send.1.gz
-man/ja/man1/show.1.gz
-man/ja/man1/slocal.1.gz
-man/ja/man1/sortm.1.gz
-man/ja/man1/vmh.1.gz
-man/ja/man1/whatnow.1.gz
-man/ja/man1/whom.1.gz
-man/ja/man5/mh-alias.5.gz
-man/ja/man5/mh-format.5.gz
-man/ja/man5/mh-mail.5.gz
-man/ja/man5/mh-profile.5.gz
-man/ja/man5/mh-sequence.5.gz
-man/ja/man5/mh-tailor.5.gz
-man/ja/man8/ap.8.gz
-man/ja/man8/conflict.8.gz
-man/ja/man8/dp.8.gz
-man/ja/man8/fmtdump.8.gz
-man/ja/man8/install-mh.8.gz
-man/ja/man8/post.8.gz
-man/man1/ali.1.gz
-man/man1/anno.1.gz
-man/man1/bbc.1.gz
-man/man1/burst.1.gz
-man/man1/comp.1.gz
-man/man1/dist.1.gz
-man/man1/folder.1.gz
-man/man1/forw.1.gz
-man/man1/inc.1.gz
-man/man1/mark.1.gz
-man/man1/mh-chart.1.gz
-man/man1/mh.1.gz
-man/man1/mhl.1.gz
-man/man1/mhmail.1.gz
-man/man1/mhn.1.gz
-man/man1/mhook.1.gz
-man/man1/mhparam.1.gz
-man/man1/mhpath.1.gz
-man/man1/msgchk.1.gz
-man/man1/msh.1.gz
-man/man1/next.1.gz
-man/man1/packf.1.gz
-man/man1/pgped.1.gz
-man/man1/pick.1.gz
-man/man1/prev.1.gz
-man/man1/prompter.1.gz
-man/man1/rcvstore.1.gz
-man/man1/refile.1.gz
-man/man1/repl.1.gz
-man/man1/rmf.1.gz
-man/man1/rmm.1.gz
-man/man1/scan.1.gz
-man/man1/send.1.gz
-man/man1/show.1.gz
-man/man1/slocal.1.gz
-man/man1/sortm.1.gz
-man/man1/vmh.1.gz
-man/man1/whatnow.1.gz
-man/man1/whom.1.gz
-man/man5/mh-alias.5.gz
-man/man5/mh-format.5.gz
-man/man5/mh-mail.5.gz
-man/man5/mh-profile.5.gz
-man/man5/mh-sequence.5.gz
-man/man5/mh-tailor.5.gz
-man/man8/ap.8.gz
-man/man8/conflict.8.gz
-man/man8/dp.8.gz
-man/man8/fmtdump.8.gz
-man/man8/install-mh.8.gz
-man/man8/post.8.gz
+share/man/ja/man1/ali.1.gz
+share/man/ja/man1/anno.1.gz
+share/man/ja/man1/bbc.1.gz
+share/man/ja/man1/burst.1.gz
+share/man/ja/man1/comp.1.gz
+share/man/ja/man1/dist.1.gz
+share/man/ja/man1/folder.1.gz
+share/man/ja/man1/forw.1.gz
+share/man/ja/man1/inc.1.gz
+share/man/ja/man1/mark.1.gz
+share/man/ja/man1/mh-chart.1.gz
+share/man/ja/man1/mh.1.gz
+share/man/ja/man1/mhl.1.gz
+share/man/ja/man1/mhmail.1.gz
+share/man/ja/man1/mhn.1.gz
+share/man/ja/man1/mhook.1.gz
+share/man/ja/man1/mhparam.1.gz
+share/man/ja/man1/mhpath.1.gz
+share/man/ja/man1/msgchk.1.gz
+share/man/ja/man1/msh.1.gz
+share/man/ja/man1/next.1.gz
+share/man/ja/man1/packf.1.gz
+share/man/ja/man1/pgped.1.gz
+share/man/ja/man1/pick.1.gz
+share/man/ja/man1/prev.1.gz
+share/man/ja/man1/prompter.1.gz
+share/man/ja/man1/rcvstore.1.gz
+share/man/ja/man1/refile.1.gz
+share/man/ja/man1/repl.1.gz
+share/man/ja/man1/rmf.1.gz
+share/man/ja/man1/rmm.1.gz
+share/man/ja/man1/scan.1.gz
+share/man/ja/man1/send.1.gz
+share/man/ja/man1/show.1.gz
+share/man/ja/man1/slocal.1.gz
+share/man/ja/man1/sortm.1.gz
+share/man/ja/man1/vmh.1.gz
+share/man/ja/man1/whatnow.1.gz
+share/man/ja/man1/whom.1.gz
+share/man/ja/man5/mh-alias.5.gz
+share/man/ja/man5/mh-format.5.gz
+share/man/ja/man5/mh-mail.5.gz
+share/man/ja/man5/mh-profile.5.gz
+share/man/ja/man5/mh-sequence.5.gz
+share/man/ja/man5/mh-tailor.5.gz
+share/man/ja/man8/ap.8.gz
+share/man/ja/man8/conflict.8.gz
+share/man/ja/man8/dp.8.gz
+share/man/ja/man8/fmtdump.8.gz
+share/man/ja/man8/install-mh.8.gz
+share/man/ja/man8/post.8.gz
+share/man/man1/ali.1.gz
+share/man/man1/anno.1.gz
+share/man/man1/bbc.1.gz
+share/man/man1/burst.1.gz
+share/man/man1/comp.1.gz
+share/man/man1/dist.1.gz
+share/man/man1/folder.1.gz
+share/man/man1/forw.1.gz
+share/man/man1/inc.1.gz
+share/man/man1/mark.1.gz
+share/man/man1/mh-chart.1.gz
+share/man/man1/mh.1.gz
+share/man/man1/mhl.1.gz
+share/man/man1/mhmail.1.gz
+share/man/man1/mhn.1.gz
+share/man/man1/mhook.1.gz
+share/man/man1/mhparam.1.gz
+share/man/man1/mhpath.1.gz
+share/man/man1/msgchk.1.gz
+share/man/man1/msh.1.gz
+share/man/man1/next.1.gz
+share/man/man1/packf.1.gz
+share/man/man1/pgped.1.gz
+share/man/man1/pick.1.gz
+share/man/man1/prev.1.gz
+share/man/man1/prompter.1.gz
+share/man/man1/rcvstore.1.gz
+share/man/man1/refile.1.gz
+share/man/man1/repl.1.gz
+share/man/man1/rmf.1.gz
+share/man/man1/rmm.1.gz
+share/man/man1/scan.1.gz
+share/man/man1/send.1.gz
+share/man/man1/show.1.gz
+share/man/man1/slocal.1.gz
+share/man/man1/sortm.1.gz
+share/man/man1/vmh.1.gz
+share/man/man1/whatnow.1.gz
+share/man/man1/whom.1.gz
+share/man/man5/mh-alias.5.gz
+share/man/man5/mh-format.5.gz
+share/man/man5/mh-mail.5.gz
+share/man/man5/mh-profile.5.gz
+share/man/man5/mh-sequence.5.gz
+share/man/man5/mh-tailor.5.gz
+share/man/man8/ap.8.gz
+share/man/man8/conflict.8.gz
+share/man/man8/dp.8.gz
+share/man/man8/fmtdump.8.gz
+share/man/man8/install-mh.8.gz
+share/man/man8/post.8.gz