diff --git a/textproc/UCD/Makefile b/textproc/UCD/Makefile
index 6282531b746e..81ab15c8c3c9 100644
--- a/textproc/UCD/Makefile
+++ b/textproc/UCD/Makefile
@@ -1,49 +1,48 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
 PORTNAME=	UCD
 PORTVERSION=	14.0.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.unicode.org/Public/zipped/${PORTVERSION}/:src\
-		ftp://www.unicode.org/Public/zipped/${PORTVERSION}/:src	\
-		http://www.unicode.org/:lic
+MASTER_SITES=	https://www.unicode.org/Public/zipped/${DISTVERSION}/:src	\
+		https://raw.githubusercontent.com/unicode-org/unihan-database/f1e8e08a138bc7e834958c8d50d26ec4bca305d3/:lic
 DISTFILES=	${PORTNAME}.zip:src	\
-		license.html:lic
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+		LICENSE.md:lic
+DIST_SUBDIR=	unicode-${PORTNAME}/${DISTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Character Database
 
 LICENSE=	Unicode_License_Agreement
 LICENSE_NAME=	Unicode License Agreement
-LICENSE_FILE=	${_DISTDIR}/license.html
+LICENSE_FILE=	${_DISTDIR}/LICENSE.md
 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 b2ef394dd4ad..1027ab72fba7 100644
--- a/textproc/UCD/distinfo
+++ b/textproc/UCD/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1636479610
-SHA256 (UCD-14.0.0/UCD.zip) = 033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600
-SIZE (UCD-14.0.0/UCD.zip) = 6985828
-SHA256 (UCD-14.0.0/license.html) = b182dd3a71fd6e072a1a778f2957fb3267a08283b54f8f4e66dab3ccfc1f4f23
-SIZE (UCD-14.0.0/license.html) = 2315
-SHA256 (UCD-14.0.0/Unihan.zip) = 2ae4519b2b82cd4d15379c17e57bfb12c33c0f54da4977de03b2b04bcf11852d
-SIZE (UCD-14.0.0/Unihan.zip) = 7116482
+TIMESTAMP = 1641658467
+SHA256 (unicode-UCD/14.0.0/UCD.zip) = 033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600
+SIZE (unicode-UCD/14.0.0/UCD.zip) = 6985828
+SHA256 (unicode-UCD/14.0.0/LICENSE.md) = 5d43f530cda324f2cb937c705347d7e8f4dfc2840eca437bf083423f5b571edc
+SIZE (unicode-UCD/14.0.0/LICENSE.md) = 2360
+SHA256 (unicode-UCD/14.0.0/Unihan.zip) = 2ae4519b2b82cd4d15379c17e57bfb12c33c0f54da4977de03b2b04bcf11852d
+SIZE (unicode-UCD/14.0.0/Unihan.zip) = 7116482