diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 85df8866578c..7d7d53ceab23 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -1,62 +1,65 @@
 PORTNAME=	mh
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 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=${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
+	${FIND} ${WRKSRC} -type f \! -name \*.orig | \
+	    xargs grep -l "extern[ 	]*int[ 	]*errno" | \
+	    xargs ${REINPLACE_CMD} -e "s/^extern[ 	]*int[ 	]*errno;/#include <errno.h>/"
 
 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/files/patch-sbr_ruserpass.c b/japanese/mh/files/patch-sbr_ruserpass.c
new file mode 100644
index 000000000000..5a79334e4e5d
--- /dev/null
+++ b/japanese/mh/files/patch-sbr_ruserpass.c
@@ -0,0 +1,10 @@
+--- sbr/ruserpass.c.orig
++++ sbr/ruserpass.c
+@@ -66,7 +66,6 @@
+ 	char myname[MAXHOSTNAMELEN], *mydomain;
+ 	int t, i, c, usedefault = 0;
+ 	struct stat stb;
+-	extern int errno;
+ 
+ 	hdir = getenv("HOME");
+ 	if (hdir == NULL)
diff --git a/japanese/mh/files/patch-uip_mshcmds.c b/japanese/mh/files/patch-uip_mshcmds.c
new file mode 100644
index 000000000000..f3269a64f34a
--- /dev/null
+++ b/japanese/mh/files/patch-uip_mshcmds.c
@@ -0,0 +1,19 @@
+--- uip/mshcmds.c.orig
++++ uip/mshcmds.c
+@@ -29,8 +29,6 @@
+ 
+ /*  */
+ 
+-extern int errno;
+-
+ 				/* BURST */
+ static char delim3[] = "-------";/* from burst.c */
+ 
+@@ -3529,7 +3527,6 @@
+     (void) strcpy (tmpfil, m_scratch ("", invo_name));
+     if ((out = fopen (tmpfil, "w")) == NULL) {
+ 	int     olderr;
+-	extern int  errno;
+ 	char    newfil[80];
+ 
+ 	olderr = errno;
diff --git a/japanese/mh/files/patch-zotnet_mf_muinc.c b/japanese/mh/files/patch-zotnet_mf_muinc.c
new file mode 100644
index 000000000000..3799145a8f03
--- /dev/null
+++ b/japanese/mh/files/patch-zotnet_mf_muinc.c
@@ -0,0 +1,10 @@
+--- zotnet/mf/muinc.c.orig
++++ zotnet/mf/muinc.c
+@@ -81,7 +81,6 @@
+ {
+     int     count,
+             fd;
+-    extern int  errno;
+ 
+     for (count = 2; count > 0; count--)
+ 	if ((fd = lkopen (file, 1)) == NOTOK)
diff --git a/japanese/mh/files/patch-zotnet_mf_uminc.c b/japanese/mh/files/patch-zotnet_mf_uminc.c
new file mode 100644
index 000000000000..31409c6db9b3
--- /dev/null
+++ b/japanese/mh/files/patch-zotnet_mf_uminc.c
@@ -0,0 +1,10 @@
+--- zotnet/mf/uminc.c.orig
++++ zotnet/mf/uminc.c
+@@ -86,7 +86,6 @@
+     int     clear,
+             count,
+             fd;
+-    extern int  errno;
+     struct stat stbuf;
+ 
+     for (clear = FALSE, count = 2; count > 0; count--)