diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 5a64e4f407b7..98a623ebdd42 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -1,59 +1,55 @@
 # New ports collection makefile for:	mh (Japanese)
 # Date created:		28 March 1995
 # Whom:			Akito FUJITA <fujita@zoo.ncl.omron.co.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mh
 PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese mail
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://komadori.planet.sci.kobe-u.ac.jp/pub/MH/ \
 		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/
 MASTER_SITE_SUBDIR=	motoyuki
 DISTNAME=	${PORTNAME}-${VERSION}-JP-${JP_VERSION}
 
 MAINTAINER=	motoyuki@freebsd.org
 COMMENT=	Rand MH mail handling system + Japanese patches
 
 BUILD_DEPENDS=	jless:${PORTSDIR}/japanese/less
 RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
 
 VERSION=	6.8.4
 JP_VERSION=	3.05
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-batchmode \
 		--enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
 
 MAN1=	ali.1 anno.1 bbc.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1 \
 	mh-chart.1 mh.1 mhl.1 mhmail.1 mhn.1 mhook.1 mhparam.1 mhpath.1 \
 	msgchk.1 msh.1 next.1 packf.1 pgped.1 pick.1 prev.1 prompter.1 rcvstore.1 \
 	refile.1 repl.1 rmf.1 rmm.1 scan.1 send.1 show.1 slocal.1 sortm.1 \
 	vmh.1 whatnow.1 whom.1
 MAN5=	mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 mh-tailor.5
 MAN8=	ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 post.8
 MANLANG=	"" ja
 MANCOMPRESSED=	yes
 USE_LDCONFIG=	yes
 
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 READMES=	00.READ.ME.1ST CHANGES.JP COMMANDS.JP FAQ.JP FEATURES.JP \
 		INSTALL.JP OPTIONS.JP READ-ME.JP TODO.JP
 
 CONFLICTS=	nmh-[0-9]*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}
 	(cd ${WRKSRC}/doc-JP; ${INSTALL_DATA} ${READMES} ${DOCDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/mh/files/patch-sbr:concat.c b/japanese/mh/files/patch-sbr:concat.c
index 6a436f0f6618..7569dffaf5d1 100644
--- a/japanese/mh/files/patch-sbr:concat.c
+++ b/japanese/mh/files/patch-sbr:concat.c
@@ -1,55 +1,55 @@
-Index: sbr/concat.c
-diff -u sbr/concat.c.orig sbr/concat.c
---- sbr/concat.c.orig	Wed Dec  1 13:01:21 1993
-+++ sbr/concat.c	Fri Jul 18 14:42:47 2003
-@@ -2,13 +2,12 @@
+--- sbr/concat.c.orig	1993-12-01 13:01:21.000000000 +0900
++++ sbr/concat.c	2008-04-27 00:14:56.000000000 +0900
+@@ -2,34 +2,40 @@
  
  #include "../h/mh.h"
  #include <stdio.h>
 -#include <varargs.h>
 +#include <stdarg.h>
  
  
  /* VARARGS */
  
 -char   *concat (va_alist)
 -va_dcl
 +char   *concat (char *first, ...)
  {
      register char  *cp,
                     *dp,
-@@ -17,19 +16,26 @@
-     register    va_list list;
+                    *sp;
+     register unsigned   len;
+-    register    va_list list;
++    va_list list;
  
      len = 1;
 -    va_start (list); 
 -    while (cp = va_arg (list, char *))
 -	len += strlen (cp);
 -    va_end (list);
 +    if (first) {
 +	    len += strlen (first);
 +	    va_start (list, first);
 +	    while (cp = va_arg (list, char *))
 +		    len += strlen (cp);
 +	    va_end (list);
 +    }
  
      dp = sp = malloc (len);
      if (dp == NULL)
  	adios (NULLCP, "unable to allocate string storage");
  
 -    va_start (list); 
 -    while (cp = va_arg (list, char *))
 -	sp = copy (cp, sp);
 -    va_end (list);
 +    *sp = '\0';
 +    if (first) {
 +	    sp = copy (first, sp);
 +	    va_start (list, first);
 +	    while (cp = va_arg (list, char *))
 +		    sp = copy (cp, sp);
 +	    va_end (list);
 +    }
  
      return dp;
  }