diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 23040873243c..04b600191709 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -1,61 +1,50 @@
 PORTNAME=	ddskk
-DISTVERSION=	16.2
-PORTREVISION=	16
+DISTVERSION=	17.1.20230702
 CATEGORIES=	japanese elisp
-MASTER_SITES=	ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
-		http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \
-		http://openlab.ring.gr.jp/skk/maintrunk/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 WWW=		http://openlab.ring.gr.jp/skk/
 
 LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/READMEs/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	skk-dev
+GH_TAGNAME=	8c47f46
+
 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}" \
 		SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
 		SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
 ALL_TARGET=	elc info
 NO_ARCH=	yes
 
 INFO=		skk
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \
 		${WRKSRC}/skk-setup.el.in
 
-pre-build:
-.for i in skk-lookup.el skk-jisx0213.el
-	@${MV} ${WRKSRC}/${i} ${WRKDIR}
-.endfor
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
-.for i in skk-lookup.el skk-jisx0213.el
-	${INSTALL_DATA} ${WRKDIR}/${i} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
-.endfor
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in AUTHORS.ja CODENAME.ja Contributors Development.ja.org FAQ.ja NEWS.ja
+.for i in AUTHORS.ja CODENAME.ja Contributors Development.ja.org FAQ.ja NEWS.ja history.md
 	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for i in Emacs.ad dot.emacs dot.skk
+.for i in dot.emacs dot.skk
 	${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/ddskk/distinfo b/japanese/ddskk/distinfo
index c0da3724edff..4f3a4cbbfb76 100644
--- a/japanese/ddskk/distinfo
+++ b/japanese/ddskk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505714160
-SHA256 (ddskk-16.2.tar.gz) = 76d13486d7615a75d71107782684e7100cae32f21cec6a44731c192010a7a108
-SIZE (ddskk-16.2.tar.gz) = 886618
+TIMESTAMP = 1710476925
+SHA256 (skk-dev-ddskk-17.1.20230702-8c47f46_GH0.tar.gz) = 842ab3e2d820624d70b17c7b08f2ceaf9d5b70c0dce2ff03b0ba6b0c854bbbff
+SIZE (skk-dev-ddskk-17.1.20230702-8c47f46_GH0.tar.gz) = 956889
diff --git a/japanese/ddskk/files/patch-Makefile b/japanese/ddskk/files/patch-Makefile
index 85d00984a259..d3c6588146d9 100644
--- a/japanese/ddskk/files/patch-Makefile
+++ b/japanese/ddskk/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	2017-03-04 05:21:04 UTC
+--- Makefile.orig	2024-03-17 07:41:26 UTC
 +++ Makefile
-@@ -9,7 +9,7 @@ BZIP2     = bzip2 -9
- DATE	  = date
+@@ -13,7 +13,7 @@ FIND	  = find . -maxdepth 1 -name
  EMACS	  = emacs
  ETAGS	  = etags
--FLAGS     = -batch -q -no-site-file -l SKK-MK
-+FLAGS     = -batch -q -no-site-file --eval '(setq PREFIX "${PREFIX}")' --eval '(setq SKK_LISPDIR "${SKK_LISPDIR}")' --eval '(setq skk-server-host nil)' -l SKK-MK
+ FIND	  = find . -maxdepth 1 -name
+-FLAGS     = --batch --no-init-file --quick --load SKK-MK
++FLAGS     = --batch --no-init-file --quick --eval '(setq PREFIX "${PREFIX}")' --eval '(setq SKK_LISPDIR "${SKK_LISPDIR}")' --eval '(setq skk-server-host nil)' --load SKK-MK
  GIT       = git
  GZIP      = gzip -9
  MD5	  = md5
diff --git a/japanese/ddskk/files/patch-SKK-MK b/japanese/ddskk/files/patch-SKK-MK
new file mode 100644
index 000000000000..4d95174babdc
--- /dev/null
+++ b/japanese/ddskk/files/patch-SKK-MK
@@ -0,0 +1,16 @@
+--- SKK-MK.orig	2024-03-17 07:41:31 UTC
++++ SKK-MK
+@@ -229,11 +229,13 @@ This version of SKK requires MULE features"))
+		skk-inline
+		skk-isearch
+		skk-jisx0201
++		skk-jisx0213
+		skk-jisyo-edit-mode
+		skk-kakasi
+		skk-kcode
+		skk-leim
+		skk-look
++		skk-lookup
+		skk-macs
+		skk-num
+                skk-search-web
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index 53ce8e07fa74..0400ed75838f 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -1,92 +1,94 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/cdb.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/cdb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/context-skk.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/context-skk.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/leim-list.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-act.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-act.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-azik.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-azik.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cdb.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cdb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-decor.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-decor.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-emacs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-emacs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-hint.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-hint.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-inline.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-inline.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-search-web.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-search-web.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server-completion.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server-completion.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-setup.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-show-mode.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-show-mode.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-sticky.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-sticky.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tankan.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tankan.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/tar-util.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/tar-util.elc
 share/skk/NICOLA-SKK.tut
 share/skk/SKK.tut
 share/skk/SKK.tut.E
 share/skk/skk.xpm