diff --git a/japanese/mecab-ipadic/Makefile b/japanese/mecab-ipadic/Makefile
index c8d8e3869e3c..f823569995ad 100644
--- a/japanese/mecab-ipadic/Makefile
+++ b/japanese/mecab-ipadic/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	mecab-ipadic
 DISTVERSION=	2.7.0-20070801
 PORTREVISION=	3
 CATEGORIES=	japanese textproc
 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
 
 .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:japanese/mecab
 
 USES=		perl5
 USE_PERL5=	build
 
 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
+PORTSCOUT=	skipv:3.0.0-00000000,4.0.0-00000000,5.0.0-00000000
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 PLIST=		${MASTERDIR}/pkg-plist.cset
 
 CONFLICTS_INSTALL=	ja-mecab-ipadic-[^0-9]*
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 061a53af6398..776e5a18d165 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	mecab
 DISTVERSION=	0.996
 PORTREVISION=	5
 CATEGORIES=	japanese textproc
-MASTER_SITES=	https://drive.google.com/uc?export=download&id=1SJjk4IylQaO2yGc0vMtx5MHhZcjaeMLZ&dummy=/
+MASTER_SITES=	https://drive.google.com/uc?export=download&id=1SJjk4IylQaO2yGc0vMtx5MHhZcjaeMLZ&dummy=/ \
+		https://github.com/PROoshio/mecab/raw/master/
 
 MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 WWW=		https://taku910.github.io/mecab/
 
 LICENSE=	BSD3CLAUSE GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-USES=		gettext-tools iconv libtool localbase perl5
+USES=		gettext-tools iconv libtool perl5
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_lib_stdcpp_main=no
 
 INSTALL_TARGET=	install-strip
 
+PORTSCOUT=	skipv:6.000
 PORTDOCS=	AUTHORS README *.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} '/^libmecab_la_LIBADD =/s/$$/ $$(LTLIBICONV)/' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} \
 		-e '/CFLAGS/s|-O3|${CFLAGS}|' \
 		-e '/CXXFLAGS/s|-O3|${CXXFLAGS}|' \
 		${WRKSRC}/configure
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/mecabrc \
 		${STAGEDIR}${PREFIX}/etc/mecabrc.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:N*.html:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>