diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index e27823d653e5..590edfba0548 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -7,18 +7,22 @@
 
 PORTNAME=	migemo
 PORTVERSION=	0.40
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
-MASTER_SITES=   http://namazu.org/~satoru/migemo/ \
-		http://people.freebsd.org/~nobutaka/distfiles/:skkdic
+MASTER_SITES=	http://0xcc.net/migemo/ \
+		${MASTER_SITE_LOCAL:S/$/:skkdic/}
+MASTER_SITE_SUBDIR=	nobutaka/:skkdic
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SKKDIC_FILE}.bz2:skkdic
-DIST_SUBDIR=    migemo
+DIST_SUBDIR=	migemo
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Japanese incremental search tool
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 .if !defined(SLAVE_PORT)
 USE_AUTOTOOLS=	automake14 autoconf213
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.am ${FILESDIR}/extra-patch-configure.in
@@ -34,7 +38,7 @@ RUN_DEPENDS+=	${RUBY_SITELIBDIR}/romkan.rb:${PORTSDIR}/japanese/ruby-romkan \
 CONFIGURE_ARGS+=--with-rubydir=${RUBY_SITELIBDIR}
 MAKE_JOBS_UNSAFE=	yes
 
-SKKDIC_FILE=	SKK-JISYO.L-20060709
+SKKDIC_FILE=	SKK-JISYO.L-20101223
 
 .include <bsd.port.pre.mk>
 
@@ -43,17 +47,19 @@ BROKEN=		Does not compile on ia64
 .endif
 
 post-extract:
-.if !defined(SLAVE_PORT)
+.if ${SLAVE_PORT} == "no"
 	${BZIP2_CMD} -cd ${DISTDIR}/${DIST_SUBDIR}/${SKKDIC_FILE}.bz2 > ${WRKSRC}/SKK-JISYO.L
 .endif
 
 post-configure:
-.if !defined(SLAVE_PORT)
+.if ${SLAVE_PORT} == "no"
 	(cd ${WRKSRC}; ${CAT} SKK-JISYO.L | ${RUBY} migemo-convert.rb > migemo-dict)
+	${CP} ${AUTOMAKE_DIR}/config.guess ${WRKSRC}
+	${CP} ${AUTOMAKE_DIR}/config.sub ${WRKSRC}
 .endif
 
 post-install:
-.if defined(SLAVE_PORT)
+.if ${SLAVE_PORT} == "yes"
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/japanese/migemo/distinfo b/japanese/migemo/distinfo
index ce07e27692c6..8b11b5c6c964 100644
--- a/japanese/migemo/distinfo
+++ b/japanese/migemo/distinfo
@@ -1,6 +1,4 @@
-MD5 (migemo/migemo-0.40.tar.gz) = 7021c45096b6816fccf16f8389324a91
 SHA256 (migemo/migemo-0.40.tar.gz) = 89c2125e903edf6f6fe035137eceef79382fce43783e5da240fc4a34b0878934
 SIZE (migemo/migemo-0.40.tar.gz) = 1674941
-MD5 (migemo/SKK-JISYO.L-20060709.bz2) = 44bee55f8c1757f583b0d26b398a2379
-SHA256 (migemo/SKK-JISYO.L-20060709.bz2) = 272f8b9fefc459dc5f27b48cb1a80e87dcc8625db687581c301a0e3d3532e504
-SIZE (migemo/SKK-JISYO.L-20060709.bz2) = 1679913
+SHA256 (migemo/SKK-JISYO.L-20101223.bz2) = d478b99ab69e1b6206965f4433fd7ef1b3edaeae0fe9ba8dfff89a4d4d0c89b0
+SIZE (migemo/SKK-JISYO.L-20101223.bz2) = 1694174