diff --git a/japanese/skk-jawiki/Makefile b/japanese/skk-jawiki/Makefile
index 5c335eb501db..79eeb4c9c68e 100644
--- a/japanese/skk-jawiki/Makefile
+++ b/japanese/skk-jawiki/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	skk-jawiki
-DISTVERSION=	2026.04.01.141931
+DISTVERSION=	2026.06.21.141122
 CATEGORIES=	japanese
 MASTER_SITES=	https://github.com/tokuhirom/jawiki-kana-kanji-dict/releases/download/v${DISTVERSION}/
 DISTFILES=	SKK-JISYO.jawiki
 
 MAINTAINER=	mce@FreeBSD.org
 COMMENT=	SKK dictionary from Wikipedia (Japanese edition)
 WWW=		https://github.com/tokuhirom/jawiki-kana-kanji-dict
 
 LICENSE=	MIT
 
 NO_ARCH=	yes
 
 SKKDIR=		share/skk
 SKKDIC=		SKK-JISYO.jawiki
 
 PLIST_FILES=	${DICS:S|^|${SKKDIR}/|}
 
 OPTIONS_DEFAULT=		EUCCDB
 OPTIONS_MULTI=			DICTIONARY
 OPTIONS_MULTI_DICTIONARY=	EUC EUCCDB UTF8 UTF8CDB
 EUC_DESC=			EUC-JP Charset dictionary
 EUCCDB_DESC=			EUC-JP Charset dictionary (cdb)
 UTF8_DESC=			UTF8 Charset dictionary
 UTF8CDB_DESC=			UTF8 Charset dictionary (cdb)
 
 EUC_BUILD_DEPENDS=		${LOCALBASE}/bin/nkf:japanese/nkf
 EUCCDB_BUILD_DEPENDS=		${LOCALBASE}/bin/nkf:japanese/nkf \
-				${LOCALBASE}/bin/cdb:databases/tinycdb
-UTF8CDB_BUILD_DEPENDS=		${LOCALBASE}/bin/cdb:databases/tinycdb
+				${LOCALBASE}/bin/cdbmake:databases/cdb
+UTF8CDB_BUILD_DEPENDS=		${LOCALBASE}/bin/cdbmake:databases/cdb
 
 EUC_VARS=			DICS=${SKKDIC}
 EUCCDB_VARS=			DICS+=${SKKDIC}.cdb
 UTF8_VARS=			DICS+=${SKKDIC}.utf8
 UTF8CDB_VARS=			DICS+=${SKKDIC}.utf8.cdb
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/
 
 .include <bsd.port.options.mk>
 
 do-build:
 	${MV} ${WRKSRC}/${SKKDIC} ${WRKSRC}/${SKKDIC}.orig
 .if ${PORT_OPTIONS:MUTF8*}
 	${ECHO_CMD} ';; -*- mode: fundamental; coding: utf-8 -*-' | \
 		${CAT} - ${WRKSRC}/${SKKDIC}.orig > ${WRKSRC}/${SKKDIC}.utf8
 .endif
 .if ${PORT_OPTIONS:MEUC*}
 	${ECHO_CMD} ';; -*- mode: fundamental; coding: euc-jp -*-' \
 		> ${WRKSRC}/${SKKDIC}
 	${LOCALBASE}/bin/nkf --oc=eucJP-ms ${WRKSRC}/${SKKDIC}.orig \
 		>> ${WRKSRC}/${SKKDIC}
 .endif
 .for dic in ${DICS:M*.cdb}
 	${AWK} '/^[^;]/ { \
 			s = substr($$0, index($$0, " ") + 1); \
 			print "+" length($$1) "," length(s) ":" $$1 "->" s; \
 		} \
 		END { \
 			print ""; \
 		}' < ${WRKSRC}/${dic:S|.cdb||} | \
-	${LOCALBASE}/bin/cdb -c -t - ${WRKSRC}/${dic}
+	${LOCALBASE}/bin/cdbmake ${WRKSRC}/${dic} ${WRKSRC}/${dic}.tmp
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SKKDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DICS} ${STAGEDIR}${PREFIX}/${SKKDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/skk-jawiki/distinfo b/japanese/skk-jawiki/distinfo
index 2ff0004f3eb9..000a63fbfc94 100644
--- a/japanese/skk-jawiki/distinfo
+++ b/japanese/skk-jawiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1775058068
-SHA256 (SKK-JISYO.jawiki) = 0edd7313119547b3195588c36830ea2989f682ad44cc90f1d301b9ad7c98b53c
-SIZE (SKK-JISYO.jawiki) = 28586417
+TIMESTAMP = 1782087714
+SHA256 (SKK-JISYO.jawiki) = fa78bd3f96c04975023bdd34da5ac682882f11dbf0cb3aec9f935672259325bc
+SIZE (SKK-JISYO.jawiki) = 28828997