diff --git a/japanese/mecab-jawiki/Makefile b/japanese/mecab-jawiki/Makefile
index 3678bdf3cd04..e904c2f39cc2 100644
--- a/japanese/mecab-jawiki/Makefile
+++ b/japanese/mecab-jawiki/Makefile
@@ -1,10 +1,49 @@
-PKGNAMEPREFIX=	ja-mecab-
+PORTNAME=	mecab-jawiki
+DISTVERSION=	2026.04.01.141931
+CATEGORIES=	japanese
+MASTER_SITES=	https://github.com/tokuhirom/jawiki-kana-kanji-dict/releases/download/v${DISTVERSION}/
+DISTFILES=	mecab-userdic.csv
 
+MAINTAINER=	mce@FreeBSD.org
 COMMENT=	MeCab dictionary from Wikipedia (Japanese edition)
+WWW=		https://github.com/tokuhirom/jawiki-kana-kanji-dict
 
-MASTERDIR=	${.CURDIR}/../skk-jawiki
-DESCR=		${.CURDIR}/pkg-descr
+LICENSE=	MIT
 
-MECAB=		yes
+BUILD_DEPENDS=	${LOCALBASE}/libexec/mecab/mecab-dict-index:japanese/mecab
 
-.include "${MASTERDIR}/Makefile"
+NO_ARCH=	yes
+
+MECABDIR=	lib/mecab/dic/ipadic
+MECABDIC=	jawiki.dic
+
+PLIST_FILES=	${MECABDIR}/${MECABDIC}
+
+OPTIONS_DEFAULT=	UTF8
+OPTIONS_SINGLE=		CHARSET
+OPTIONS_SINGLE_CHARSET=	EUCJP SHIFTJIS 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_BUILD_DEPENDS=	ja-mecab-ipadic-eucjp>0:japanese/mecab-ipadic-eucjp
+EUCJP_VARS=		CSET=euc-jp
+SHIFTJIS_BUILD_DEPENDS=	ja-mecab-ipadic-sjis>0:japanese/mecab-ipadic-sjis
+SHIFTJIS_VARS=		CSET=shiftjis
+UTF8_BUILD_DEPENDS=	ja-mecab-ipadic-utf8>0:japanese/mecab-ipadic-utf8
+UTF8_VARS=		CSET=utf-8
+
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
+
+do-build:
+	${LOCALBASE}/libexec/mecab/mecab-dict-index \
+		-d ${LOCALBASE}/${MECABDIR} -u ${WRKSRC}/${MECABDIC} \
+		-f utf-8 -t ${CSET} ${WRKSRC}/${DISTFILES}
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${MECABDIR}
+	${INSTALL_DATA} ${WRKSRC}/${MECABDIC} ${STAGEDIR}${PREFIX}/${MECABDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/mecab-jawiki/distinfo b/japanese/mecab-jawiki/distinfo
new file mode 100644
index 000000000000..e581c2715f62
--- /dev/null
+++ b/japanese/mecab-jawiki/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1775057774
+SHA256 (mecab-userdic.csv) = 4a66bd0396cbdcd9294768a168135f7665e362d2c8ea47e0d674e1a8f07cbd29
+SIZE (mecab-userdic.csv) = 88736124
diff --git a/japanese/mecab-jawiki/files/patch-mecab-userdic.csv b/japanese/mecab-jawiki/files/patch-mecab-userdic.csv
new file mode 100644
index 000000000000..0f0ed4dd1eed
--- /dev/null
+++ b/japanese/mecab-jawiki/files/patch-mecab-userdic.csv
@@ -0,0 +1,10 @@
+--- mecab-userdic.csv.orig	2026-03-30 10:48:37 UTC
++++ mecab-userdic.csv
+@@ -202595,7 +202595,6 @@ Gwen,1288,1288,4569,名詞,固有名詞,一般,*,*,*,G
+ グスコーブドリの伝記,1288,1288,4569,名詞,固有名詞,一般,*,*,*,グスコーブドリの伝記,ぐすこーぶどりのでんき,ぐすこーぶどりのでんき
+ グスタフ朝時代,1288,1288,4569,名詞,固有名詞,一般,*,*,*,グスタフ朝時代,ぐすたふちょうじだい,ぐすたふちょうじだい
+ グスタフ列車砲,1288,1288,4569,名詞,固有名詞,一般,*,*,*,グスタフ列車砲,ぐすたふれっしゃほう,ぐすたふれっしゃほう
+-"gusto,1288,1288,4569,名詞,固有名詞,一般,*,*,*,"gusto,ぐすと,ぐすと
+ グズマニア属,1288,1288,4569,名詞,固有名詞,一般,*,*,*,グズマニア属,ぐずまにあぞく,ぐずまにあぞく
+ ぐず焼き祭り,1288,1288,4569,名詞,固有名詞,一般,*,*,*,ぐず焼き祭り,ぐずやきまつり,ぐずやきまつり
+ 虞世基,1288,1288,4569,名詞,固有名詞,一般,*,*,*,虞世基,ぐせいき,ぐせいき