diff --git a/japanese/mecab-ipadic-eucjp/Makefile b/japanese/mecab-ipadic-eucjp/Makefile
index 525f050afc7d..4eb41f14c996 100644
--- a/japanese/mecab-ipadic-eucjp/Makefile
+++ b/japanese/mecab-ipadic-eucjp/Makefile
@@ -1,7 +1,9 @@
 PKGNAMESUFFIX=	-eucjp
 
 COMMENT=	Japanese Morphological Dictionary for MeCab (EUC-JP)
 
 MASTERDIR=	${.CURDIR}/../mecab-ipadic
 
+CSET=		euc-jp
+
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/mecab-ipadic-sjis/Makefile b/japanese/mecab-ipadic-sjis/Makefile
index f914ed2aa0bf..0420b89fbdfa 100644
--- a/japanese/mecab-ipadic-sjis/Makefile
+++ b/japanese/mecab-ipadic-sjis/Makefile
@@ -1,7 +1,9 @@
 PKGNAMESUFFIX=	-sjis
 
 COMMENT=	Japanese Morphological Dictionary for MeCab (Shift JIS)
 
 MASTERDIR=	${.CURDIR}/../mecab-ipadic
 
+CSET=		shiftjis
+
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/mecab-ipadic-utf8/Makefile b/japanese/mecab-ipadic-utf8/Makefile
index 7e36c0495600..90fe6ae1d4fd 100644
--- a/japanese/mecab-ipadic-utf8/Makefile
+++ b/japanese/mecab-ipadic-utf8/Makefile
@@ -1,7 +1,9 @@
 PKGNAMESUFFIX=	-utf8
 
 COMMENT=	Japanese Morphological Dictionary for MeCab (UTF-8)
 
 MASTERDIR=	${.CURDIR}/../mecab-ipadic
 
+CSET=		utf-8
+
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/mecab-ipadic/Makefile b/japanese/mecab-ipadic/Makefile
index 4043fcbd3c0e..c8d8e3869e3c 100644
--- a/japanese/mecab-ipadic/Makefile
+++ b/japanese/mecab-ipadic/Makefile
@@ -1,68 +1,53 @@
 PORTNAME=	mecab-ipadic
 DISTVERSION=	2.7.0-20070801
 PORTREVISION=	3
 CATEGORIES=	japanese textproc
-MASTER_SITES=	https://sourceforge.net/projects/mecab/files/${PORTNAME}/${DISTVERSION}/ \
-		https://distfiles.sigtrap.nl/
+MASTER_SITES=	http://downloads.sourceforge.net/mecab/ \
+		https://github.com/PROoshio/mecab/raw/master/
 
 MAINTAINER=	mce@FreeBSD.org
 COMMENT?=	MeCab IPA dictionary meta-port
 WWW=		https://taku910.github.io/mecab/
 
 .if empty(PKGNAMESUFFIX)
 USES=		metaport
 OPTIONS_SINGLE=	CHARSET
 OPTIONS_SINGLE_CHARSET=	EUCJP SHIFTJIS UTF8
 OPTIONS_DEFAULT=UTF8
 EUCJP_DESC=	Use EUC-JP as dictionary charset
 SHIFTJIS_DESC=	Use SHIFT-JIS as dictionary charset
 UTF8_DESC=	Use UTF-8 as dictionary charset
 
 EUCJP_RUN_DEPENDS=	ja-mecab-ipadic-eucjp>0:japanese/mecab-ipadic-eucjp
 SHIFTJIS_RUN_DEPENDS=	ja-mecab-ipadic-sjis>0:japanese/mecab-ipadic-sjis
 UTF8_RUN_DEPENDS=	ja-mecab-ipadic-utf8>0:japanese/mecab-ipadic-utf8
-.endif
 
-.if !empty(PKGNAMESUFFIX)
+.else
+
 LICENSE=	NAIST ICOT
 LICENSE_COMB=	multi
 LICENSE_NAME_NAIST=	NAIST
 LICENSE_NAME_ICOT=	ICOT
 LICENSE_PERMS_NAIST=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_ICOT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE_NAIST=	${WRKSRC}/COPYING
 LICENSE_FILE_ICOT=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	ja-mecab>=0.94:japanese/mecab
+BUILD_DEPENDS=	ja-mecab>0:japanese/mecab
 
 USES=		perl5
 USE_PERL5=	build
 
-CONFIGURE_ARGS=	--with-dicdir=${PREFIX}/lib/mecab/dic/ipadic
+CONFIGURE_ARGS=	--with-charset=${CSET} \
+		--with-dicdir=${PREFIX}/lib/mecab/dic/ipadic
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
+PORTSCOUT=	skipv:3.0.0-00000000 4.0.0-00000000 5.0.0-00000000
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-.if ${PKGNAMESUFFIX} == "-eucjp"
-CONFIGURE_ARGS+=--with-charset=euc-jp
-.elif ${PKGNAMESUFFIX} == "-sjis"
-CONFIGURE_ARGS+=--with-charset=shiftjis
-.elif ${PKGNAMESUFFIX} == "-utf8"
-CONFIGURE_ARGS+=--with-charset=utf-8
-.endif
-
-PLIST_FILES=	lib/mecab/dic/ipadic/char.bin \
-		lib/mecab/dic/ipadic/dicrc \
-		lib/mecab/dic/ipadic/left-id.def \
-		lib/mecab/dic/ipadic/matrix.bin \
-		lib/mecab/dic/ipadic/pos-id.def \
-		lib/mecab/dic/ipadic/rewrite.def \
-		lib/mecab/dic/ipadic/right-id.def \
-		lib/mecab/dic/ipadic/sys.dic \
-		lib/mecab/dic/ipadic/unk.dic
+PLIST=		${MASTERDIR}/pkg-plist.cset
 
 CONFLICTS_INSTALL=	ja-mecab-ipadic-[^0-9]*
-
-.endif # !empty(PKGNAMESUFFIX)
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/mecab-ipadic/pkg-plist.cset b/japanese/mecab-ipadic/pkg-plist.cset
new file mode 100644
index 000000000000..2660c7e5ebf0
--- /dev/null
+++ b/japanese/mecab-ipadic/pkg-plist.cset
@@ -0,0 +1,9 @@
+lib/mecab/dic/ipadic/char.bin
+lib/mecab/dic/ipadic/dicrc
+lib/mecab/dic/ipadic/left-id.def
+lib/mecab/dic/ipadic/matrix.bin
+lib/mecab/dic/ipadic/pos-id.def
+lib/mecab/dic/ipadic/rewrite.def
+lib/mecab/dic/ipadic/right-id.def
+lib/mecab/dic/ipadic/sys.dic
+lib/mecab/dic/ipadic/unk.dic