diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 96fddb71c88b..829cca47434f 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -14,13 +14,13 @@ MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.gbnet.net/pub/mutt-international/ \
 		ftp://ftp.guug.de/pub/mutt/ \
 		ftp://ftp.guug.de/pub/mutt/historic/
-DISTNAME=	${PORTNAME}-${VERSION}i
+DISTNAME=	${PORTNAME}-${VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		manual_ja-${VERSION:R}i-2${EXTRACT_SUFX}
+		manual_ja-${MANUALVERSION}i-2${EXTRACT_SUFX}
 
-PATCH_SITES=	http://www.geocities.co.jp/SiliconValley-PaloAlto/2594/ \
+PATCH_SITES=	http://www.emaillab.org/mutt/1.2/ \
 		http://www5.xdsl.ne.jp/~shuna/distfiles/mutt/
-PATCHFILES=	${DISTNAME}-jp${JP_VERSION}-diff.gz
+PATCHFILES=	${DISTNAME}i-jp${JP_VERSION}.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
@@ -34,8 +34,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 .endif
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.2.5
-JP_VERSION=	2
+VERSION=	1.2.5.1
+JP_VERSION=	0
+MANUALVERSION=	1.2
+
+FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 DIST_SUBDIR=	mutt
 USE_GMAKE=	yes
@@ -46,7 +49,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/etc \
-		--with-docdir=${PREFIX}/share/doc/mutt \
+		--with-docdir=${DOCSDIR} \
 		--enable-pop --enable-imap
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=	--with-included-gettext
@@ -57,10 +60,18 @@ MAN5=		muttrc.5
 pre-configure:
 	(cd ${WRKSRC}; ${ACLOCAL} -I m4)
 
+post-configure:
+	@${PERL} -pi -e "\
+		s/^(s%\@ACLOCAL\@%).+(%g)/\1${ACLOCAL}\2/; \
+		s/^(s%\@AUTOCONF\@%).+(%g)/\1${AUTOCONF}\2/; \
+		s/^(s%\@AUTOMAKE\@%).+(%g)/\1${AUTOMAKE}\2/; \
+		s/^(s%\@AUTOHEADER\@%).+(%g)/\1${AUTOHEADER}\2/" \
+		${BUILD_WRKSRC}/config.status
+
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.txt ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.sgml ${PREFIX}/share/doc/mutt
+	${INSTALL_DATA} ${WRKDIR}/manual_ja.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/manual_ja.sgml ${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/mutt/distinfo b/japanese/mutt/distinfo
index 6c541bcd303e..db71b75795dd 100644
--- a/japanese/mutt/distinfo
+++ b/japanese/mutt/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.2.5i.tar.gz) = 0ba5367059abdd55daceb82dce6be42f
+MD5 (mutt/mutt-1.2.5.1.tar.gz) = 2ede4b04ad0a4c8ecdbaa322f416a8c6
 MD5 (mutt/manual_ja-1.2i-2.tar.gz) = 5a5675ffe23ffe273bd6fe246d3aaefd
-MD5 (mutt/mutt-1.2.5i-jp2-diff.gz) = 5ab124c129d934b02548e1e65cb032f9
+MD5 (mutt/mutt-1.2.5.1i-jp0.diff.gz) = aab15d9269d64c06345f2c925d975df1