diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index c28863b82536..6f985c36fa3d 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -1,82 +1,78 @@
 PORTNAME=	skk-jisyo
-PORTVERSION=	201409
-PORTREVISION=	0
+DISTVERSIONPREFIX=	g
+DISTVERSION=	20240130
 CATEGORIES=	japanese
-MASTER_SITES=	LOCAL/matusita/${PORTNAME}
 .if defined(WITH_SKKJISYO_CDB)
 PKGNAMESUFFIX=	-cdb
 .endif
-DIST_SUBDIR=	skk-jisyo
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Jisyo (dictionary) files for the SKK Japanese-input software
 WWW=		http://openlab.jp/skk/
 
+LICENSE=	GPLv2+
+
 .if defined(WITH_SKKJISYO_CDB)
 BUILD_DEPENDS=	${LOCALBASE}/bin/cdb:databases/tinycdb
 .endif
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	skk-dev
+GH_PROJECT=	dict
+GH_TAGNAME=	b798a46
+
 SKKDIR?=	share/skk
 SKK_JISYO_TYPE?=L M S
 
-USES=		tar:bzip2
-NO_WRKSUBDIR=		yes
-EXTRACT_CMD=		${CP}
-EXTRACT_BEFORE_ARGS=	-p
-EXTRACT_AFTER_ARGS=	${WRKSRC}
 PLIST_SUB+=		SKKDIR=${SKKDIR}
 .for type in ${SKK_JISYO_TYPE}
-DISTFILES+=		SKK-JISYO.${type}.${PORTVERSION}.bz2
 PLIST_FILES+=		${SKKDIR}/SKK-JISYO.${type}${CDBSUFFIX}
 .endfor
 
 .if defined(WITH_SKKJISYO_CDB)
 CDBSUFFIX=		.cdb
 .else
 CDBSUFFIX=		#empty
 NO_BUILD=		yes
 .endif
 
-post-extract:
-	@(cd ${WRKSRC}; ${BZIP2_CMD} -d *.bz2)
-
 .if defined(WITH_SKKJISYO_DELCOMMENTS)
 # Strip comments in transtation candidates list.
 # Candidate list starts with '/', and each candidate is concatenated by
 # '/' (e.g., "/c1/c2/".)  Each candidate may have a comment just after
 # the candidate, leading a marker character ';' (e.g. /c3;comment/).
 post-patch:
 .for type in ${SKK_JISYO_TYPE}
 	${REINPLACE_CMD} -e '/^[^;]/s,;[^/]*/,/,g' -e '/^>/d' \
-		${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION}
+		${WRKSRC}/SKK-JISYO.${type}
 .endfor
 .endif
 
 .if defined(WITH_SKKJISYO_CDB)
 # Convert plaintext jisyo data to CDB database by cdbmake.
 # Each line consists of "+${klen},${dlen}:${key}->${data}", where klen/dlen
 # are length of key/data.  A blank line at the end of data is required.
 # See also: <URL:http://cr.yp.to/cdb/cdbmake.html>.
 do-build:
 .for type in ${SKK_JISYO_TYPE}
 	${AWK} '/^[^;]/ { \
 			s = substr($$0, index($$0, " ") + 1); \
 			print "+" length($$1) "," length(s) ":" $$1 "->" s; \
 		} \
 		END { \
 			print ""; \
 		}' \
-		< ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION} | \
+		< ${WRKSRC}/SKK-JISYO.${type} | \
 	${LOCALBASE}/bin/cdb -c -t - \
-		${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX}
+		${WRKSRC}/SKK-JISYO.${type}${CDBSUFFIX}
 .endfor
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SKKDIR}
 .for type in ${SKK_JISYO_TYPE}
-	${INSTALL_DATA} ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX} \
+	${INSTALL_DATA} ${WRKSRC}/SKK-JISYO.${type}${CDBSUFFIX} \
 		${STAGEDIR}${PREFIX}/${SKKDIR}/SKK-JISYO.${type}${CDBSUFFIX}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/skk-jisyo/distinfo b/japanese/skk-jisyo/distinfo
index 51b319eb4a8f..4a8dadd49b32 100644
--- a/japanese/skk-jisyo/distinfo
+++ b/japanese/skk-jisyo/distinfo
@@ -1,6 +1,3 @@
-SHA256 (skk-jisyo/SKK-JISYO.L.201409.bz2) = b5dfb47ae2d015faffd2df17674829e7a9984cadebb5c1ae7a8c2ecc684b3e1c
-SIZE (skk-jisyo/SKK-JISYO.L.201409.bz2) = 1694434
-SHA256 (skk-jisyo/SKK-JISYO.M.201409.bz2) = 82801d01d66e89ce8a9dc00516efd646a3acf5b2179aa8588177f9bf2aa2dad4
-SIZE (skk-jisyo/SKK-JISYO.M.201409.bz2) = 62529
-SHA256 (skk-jisyo/SKK-JISYO.S.201409.bz2) = c5edfca77db156bc61793747849793653acf897661138df2cd6fc644fde84862
-SIZE (skk-jisyo/SKK-JISYO.S.201409.bz2) = 25959
+TIMESTAMP = 1710656369
+SHA256 (skk-dev-dict-g20240130-b798a46_GH0.tar.gz) = aa49efa1dc407dcf15f8a07bcf6a8860aad0671314fdc01d194216145a5eac75
+SIZE (skk-dev-dict-g20240130-b798a46_GH0.tar.gz) = 17807823