diff --git a/misc/unicode-emoji/Makefile b/misc/unicode-emoji/Makefile
index c98cd9511c69..062ee74ce140 100644
--- a/misc/unicode-emoji/Makefile
+++ b/misc/unicode-emoji/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	unicode-emoji
-DISTVERSION=	5.0
+DISTVERSION=	15.0
 CATEGORIES=	misc
-MASTER_SITES=	http://www.unicode.org/Public/emoji/${DISTVERSION}/
-DISTFILES=	emoji-data.txt emoji-sequences.txt emoji-test.txt emoji-variation-sequences.txt emoji-zwj-sequences.txt
+MASTER_SITES=	http://www.unicode.org/Public/emoji/${DISTVERSION}/ \
+		http://www.unicode.org/Public/${DISTVERSION}.0/ucd/emoji/:ucd
+DISTFILES=	emoji-data.txt:ucd emoji-sequences.txt emoji-test.txt emoji-variation-sequences.txt:ucd emoji-zwj-sequences.txt
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=	# nothing to extract
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Unicode emoji data files
-WWW=		https://www.unicode.org/emoji
+WWW=		https://www.unicode.org/emoji/
 
 LICENSE=	UNICODE
 LICENSE_NAME=	UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
@@ -21,11 +22,11 @@ NO_ARCH=	yes
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/unicode/emoji
 .for f in ${DISTFILES}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${f} ${STAGEDIR}${PREFIX}/share/unicode/emoji/$f
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${f:S/:ucd$//} ${STAGEDIR}${PREFIX}/share/unicode/emoji/${f:S/:ucd$//}
 .endfor
 
 .for f in ${DISTFILES}
-PLIST_FILES+=	share/unicode/emoji/${f}
+PLIST_FILES+=	share/unicode/emoji/${f:S/:ucd$//}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/unicode-emoji/distinfo b/misc/unicode-emoji/distinfo
index 147b20949c72..4b9669d745f7 100644
--- a/misc/unicode-emoji/distinfo
+++ b/misc/unicode-emoji/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1510207398
-SHA256 (unicode-emoji/5.0/emoji-data.txt) = ae7bb765f0ae7ccfdcb5d8a40ebcabc93202597d92391c698f82f99d73f94e86
-SIZE (unicode-emoji/5.0/emoji-data.txt) = 35041
-SHA256 (unicode-emoji/5.0/emoji-sequences.txt) = 617d0df67f9e1f294a17a9525ff6323d2a9c9403c80e3ac16b8ad65adc897125
-SIZE (unicode-emoji/5.0/emoji-sequences.txt) = 103383
-SHA256 (unicode-emoji/5.0/emoji-test.txt) = fcb5b1dab310dc8210af46372828453431fa6ecdafdae8e051cbb68eb698380c
-SIZE (unicode-emoji/5.0/emoji-test.txt) = 341770
-SHA256 (unicode-emoji/5.0/emoji-variation-sequences.txt) = 0609bcfc939a5799dd93f4a16b066210482d106dbf7827efbdf5ea83d7238ff2
-SIZE (unicode-emoji/5.0/emoji-variation-sequences.txt) = 36120
-SHA256 (unicode-emoji/5.0/emoji-zwj-sequences.txt) = b8080a9b282289d1ba302a2d48a6b01ebb9b4766a6864a037a69cb6acefefb99
-SIZE (unicode-emoji/5.0/emoji-zwj-sequences.txt) = 115207
+TIMESTAMP = 1674934889
+SHA256 (unicode-emoji/15.0/emoji-data.txt) = 29071dba22c72c27783a73016afb8ffaeb025866740791f9c2d0b55cc45a3470
+SIZE (unicode-emoji/15.0/emoji-data.txt) = 111505
+SHA256 (unicode-emoji/15.0/emoji-sequences.txt) = 5c2222d8a432d896a031a68c2f54b04fbf47b0fce2e69853f1eb8a3e945eb56d
+SIZE (unicode-emoji/15.0/emoji-sequences.txt) = 191560
+SHA256 (unicode-emoji/15.0/emoji-test.txt) = 8445f23ac8388e096be19d0262e14fceff856ff52093f2356dc89485f1a853db
+SIZE (unicode-emoji/15.0/emoji-test.txt) = 593240
+SHA256 (unicode-emoji/15.0/emoji-variation-sequences.txt) = 731a630518c4a51c480c407ec10f3476ebe0afc582c7c20c7304f966133cf118
+SIZE (unicode-emoji/15.0/emoji-variation-sequences.txt) = 36542
+SHA256 (unicode-emoji/15.0/emoji-zwj-sequences.txt) = fe357f9117b7746676063765d587137edf9b25903a792bd54935bf0856791182
+SIZE (unicode-emoji/15.0/emoji-zwj-sequences.txt) = 231164