diff --git a/x11-fonts/fcft/Makefile b/x11-fonts/fcft/Makefile
index 7204244d2855..d167bff7c414 100644
--- a/x11-fonts/fcft/Makefile
+++ b/x11-fonts/fcft/Makefile
@@ -1,29 +1,34 @@
 PORTNAME=	fcft
-DISTVERSION=	2.4.6
+DISTVERSION=	2.5.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Simple library for font loading and glyph rasterization
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	tllist>=1.0.1:devel/tllist \
 		scdoc:textproc/scdoc
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	pixman
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=	HARFBUZZ
-OPTIONS_DEFAULT=HARFBUZZ
+OPTIONS_DEFINE=	HARFBUZZ UTF8PROC
+OPTIONS_DEFAULT=HARFBUZZ UTF8PROC
 
-HARFBUZZ_DESC=		HarfBuzz for text shaping
+HARFBUZZ_DESC=		Shaping of individual grapheme clusters via HarfBuzz
 HARFBUZZ_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
-HARFBUZZ_MESON_ENABLED=	text-shaping
+HARFBUZZ_MESON_ENABLED=	grapheme-shaping
+
+UTF8PROC_DESC=		Shaping of whole text runs via libutf8proc
+UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
+UTF8PROC_MESON_ENABLED=	run-shaping
+UTF8PROC_IMPLIES=	HARFBUZZ
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fcft/distinfo b/x11-fonts/fcft/distinfo
index b55631e1ad6f..e8a0ebb8bc95 100644
--- a/x11-fonts/fcft/distinfo
+++ b/x11-fonts/fcft/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634997248
-SHA256 (fcft-2.4.6.tar.gz) = 58641cb4f5eb2301d34f0e92437b10e5a2ee27dba9e8da3f76d23393278520be
-SIZE (fcft-2.4.6.tar.gz) = 411139
+TIMESTAMP = 1636804181
+SHA256 (fcft-2.5.0.tar.gz) = 58663c684f04154674c52551daa604618e0bb3db6c62492b06b13768fb4f4b3c
+SIZE (fcft-2.5.0.tar.gz) = 440068
diff --git a/x11-fonts/fcft/pkg-plist b/x11-fonts/fcft/pkg-plist
index c076c5377d3e..44cc7fd83d36 100644
--- a/x11-fonts/fcft/pkg-plist
+++ b/x11-fonts/fcft/pkg-plist
@@ -1,19 +1,20 @@
 include/fcft/fcft.h
 include/fcft/stride.h
 lib/libfcft.so
 lib/libfcft.so.3
-lib/libfcft.so.3.4.6
+lib/libfcft.so.3.5.0
 libdata/pkgconfig/fcft.pc
 man/man3/fcft_capabilities.3.gz
 man/man3/fcft_clone.3.gz
 man/man3/fcft_destroy.3.gz
 man/man3/fcft_from_name.3.gz
 man/man3/fcft_glyph_rasterize.3.gz
 man/man3/fcft_grapheme_rasterize.3.gz
 man/man3/fcft_kerning.3.gz
 man/man3/fcft_log_init.3.gz
 man/man3/fcft_precompose.3.gz
+man/man3/fcft_set_emoji_presentation.3.gz
 man/man3/fcft_set_scaling_filter.3.gz
 man/man3/fcft_size_adjust.3.gz
 man/man3/fcft_text_run_destroy.3.gz
 man/man3/fcft_text_run_rasterize.3.gz