diff --git a/textproc/UCD/Makefile b/textproc/UCD/Makefile
index 56bb990be3b6..53f69d63f43a 100644
--- a/textproc/UCD/Makefile
+++ b/textproc/UCD/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	UCD
-PORTVERSION=	16.0.0 # must sync with deskutils/gucharmap
+PORTVERSION=	17.0.0 # must sync with deskutils/gucharmap
 PORTEPOCH=	1
 CATEGORIES=	textproc
-MASTER_SITES=	https://www.unicode.org/Public/zipped/${DISTVERSION}/:src	\
-		https://raw.githubusercontent.com/unicode-org/unihan-database/0da97601945f29dbd34ebc1a2f3bbd28bf3f8462/:lic
+MASTER_SITES=	https://www.unicode.org/Public/${PORTVERSION}/${PORTNAME:tl}/:src	\
+		https://raw.githubusercontent.com/unicode-org/unihan-database/12da7b1f81ef6055b43d640095602e31bac4a17b/:lic
 DISTFILES=	${PORTNAME}.zip:src	\
-		LICENSE.md:lic
+		LICENSE:lic
 DIST_SUBDIR=	unicode-${PORTNAME}/${DISTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Character Database
 WWW=		https://unicode.org/ucd/
 
 LICENSE=	Unicode_License_Agreement
 LICENSE_NAME=	Unicode License Agreement
-LICENSE_FILE=	${_DISTDIR}/LICENSE.md
+LICENSE_FILE=	${_DISTDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	HAN
 OPTIONS_DEFAULT=HAN
 OPTIONS_SUB=	yes
 HAN_DESC=	Unified Han database of Hanzi/Kanji/Hanja Chinese characters
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHAN}
 DISTFILES+=	Unihan.zip:src
 .endif
 
 DATADIR=	${PREFIX}/share/unicode/ucd
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${STAGEDIR}${DATADIR} &&	\
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${PORTNAME}.zip ${EXTRACT_AFTER_ARGS})
 .if ${PORT_OPTIONS:MHAN}
 	(cd ${STAGEDIR}${DATADIR} &&	\
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/Unihan.zip ${EXTRACT_AFTER_ARGS})
 	# Gucharmap also needs this zipfile
 	${INSTALL_DATA} ${_DISTDIR}/Unihan.zip ${STAGEDIR}${DATADIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/UCD/distinfo b/textproc/UCD/distinfo
index dabf957808ec..f05121e8cb1c 100644
--- a/textproc/UCD/distinfo
+++ b/textproc/UCD/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1736283190
-SHA256 (unicode-UCD/16.0.0/UCD.zip) = c86dd81f2b14a43b0cc064aa5f89aa7241386801e35c59c7984e579832634eb2
-SIZE (unicode-UCD/16.0.0/UCD.zip) = 9020779
-SHA256 (unicode-UCD/16.0.0/LICENSE.md) = 5d43f530cda324f2cb937c705347d7e8f4dfc2840eca437bf083423f5b571edc
-SIZE (unicode-UCD/16.0.0/LICENSE.md) = 2360
-SHA256 (unicode-UCD/16.0.0/Unihan.zip) = b8f000df69de7828d21326a2ffea462b04bc7560022989f7cc704f10521ef3e0
-SIZE (unicode-UCD/16.0.0/Unihan.zip) = 8382485
+TIMESTAMP = 1757592047
+SHA256 (unicode-UCD/17.0.0/UCD.zip) = 2066d1909b2ea93916ce092da1c0ee4808ea3ef8407c94b4f14f5b7eb263d28e
+SIZE (unicode-UCD/17.0.0/UCD.zip) = 9101877
+SHA256 (unicode-UCD/17.0.0/LICENSE) = 3c6db60b8370017760844db801630c623fcac17fbf481b11f65cf7586996bf52
+SIZE (unicode-UCD/17.0.0/LICENSE) = 2033
+SHA256 (unicode-UCD/17.0.0/Unihan.zip) = f7a48b2b545acfaa77b2d607ae28747404ce02baefee16396c5d2d7a8ef34b5e
+SIZE (unicode-UCD/17.0.0/Unihan.zip) = 8518517