diff --git a/textproc/UCD/Makefile b/textproc/UCD/Makefile
index 89e37dae24e9..1cfdaac73cad 100644
--- a/textproc/UCD/Makefile
+++ b/textproc/UCD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	UCD
 PORTVERSION=	9.0.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.unicode.org/Public/zipped/${PORTVERSION}/:src\
 		ftp://www.unicode.org/Public/zipped/${PORTVERSION}/:src	\
@@ -20,14 +21,29 @@ LICENSE_NAME=	Unicode License Agreement
 LICENSE_FILE=	${_DISTDIR}/copyright.html
 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})
+.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/UCD/distinfo b/textproc/UCD/distinfo
index d2bda344c02c..07a68d4936be 100644
--- a/textproc/UCD/distinfo
+++ b/textproc/UCD/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1488121877
+TIMESTAMP = 1496348753
 SHA256 (UCD-9.0.0/UCD.zip) = df9e028425816fd5117eaea7173704056f88f7cd030681e457c6f3827f9390ec
 SIZE (UCD-9.0.0/UCD.zip) = 5655592
 SHA256 (UCD-9.0.0/copyright.html) = 6e1ac9056574635b40b6d198f09ec063e4cece2c7295593f10194cac9b23f8a5
 SIZE (UCD-9.0.0/copyright.html) = 16571
+SHA256 (UCD-9.0.0/Unihan.zip) = 6afdd48fb3c5d79a527ed27ce2582b2f684c09e16f5d0837fe7e5b0204f46362
+SIZE (UCD-9.0.0/Unihan.zip) = 6558824
diff --git a/textproc/UCD/pkg-plist b/textproc/UCD/pkg-plist
index fa8db050aef0..083c73439a0d 100644
--- a/textproc/UCD/pkg-plist
+++ b/textproc/UCD/pkg-plist
@@ -38,6 +38,14 @@
 %%DATADIR%%/USourceData.txt
 %%DATADIR%%/USourceGlyphs.pdf
 %%DATADIR%%/UnicodeData.txt
+%%HAN%%%%DATADIR%%/Unihan_DictionaryIndices.txt
+%%HAN%%%%DATADIR%%/Unihan_DictionaryLikeData.txt
+%%HAN%%%%DATADIR%%/Unihan_IRGSources.txt
+%%HAN%%%%DATADIR%%/Unihan_NumericValues.txt
+%%HAN%%%%DATADIR%%/Unihan_OtherMappings.txt
+%%HAN%%%%DATADIR%%/Unihan_RadicalStrokeCounts.txt
+%%HAN%%%%DATADIR%%/Unihan_Readings.txt
+%%HAN%%%%DATADIR%%/Unihan_Variants.txt
 %%DATADIR%%/auxiliary/GraphemeBreakProperty.txt
 %%DATADIR%%/auxiliary/GraphemeBreakTest.html
 %%DATADIR%%/auxiliary/GraphemeBreakTest.txt