diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 58472ab4b92f..9157bc19f070 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -1,35 +1,31 @@
 PORTNAME=	libXft
-DISTVERSION=	2.3.5
-PORTREVISION=	1
+DISTVERSION=	2.3.6
 CATEGORIES=	x11-fonts
 
-PATCH_SITES=	https://gitlab.freedesktop.org/xorg/lib/libxft/-/commit/
-PATCHFILES=	95284856783b824a714b7506762f4adce3bb17ce.diff:-p1
-
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Client-sided font API for X applications
 WWW=		https://www.freedesktop.org/wiki/Software/Xft/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		tar:xz xorg xorg-cat:lib
 USE_XORG=	x11 xorgproto xrender
 INSTALL_TARGET=	install-strip
 
 post-extract:
 	@${CP} ${FILESDIR}/xft-config.in \
 		${WRKSRC}/xft-config.in
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ac_config_files/s|xft\.pc|xft\.pc xft-config|' \
 		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xft-config \
 		${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXft/distinfo b/x11-fonts/libXft/distinfo
index 5eb27938aa8f..4bc1579a8c7d 100644
--- a/x11-fonts/libXft/distinfo
+++ b/x11-fonts/libXft/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1662796684
-SHA256 (xorg/lib/libXft-2.3.5.tar.xz) = 684fd6ec83db80b391b8111f604d9225772b26bb78bba261d77a5eaddab6a1ee
-SIZE (xorg/lib/libXft-2.3.5.tar.xz) = 303772
-SHA256 (xorg/lib/95284856783b824a714b7506762f4adce3bb17ce.diff) = 93c3e46ef66ca7c8ecf3488abeff88d2e84f20400fe0cf1a33168bcae4bff2dd
-SIZE (xorg/lib/95284856783b824a714b7506762f4adce3bb17ce.diff) = 1106
+TIMESTAMP = 1662843890
+SHA256 (xorg/lib/libXft-2.3.6.tar.xz) = 60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022
+SIZE (xorg/lib/libXft-2.3.6.tar.xz) = 304252
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index 5185c433f0e1..cc07d48d898b 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -1,86 +1,86 @@
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
 lib/libXft.a
 lib/libXft.so
 lib/libXft.so.2
-lib/libXft.so.2.3.5
+lib/libXft.so.2.3.6
 libdata/pkgconfig/xft.pc
 man/man3/Xft.3.gz
 man/man3/XftCharExists.3.gz
 man/man3/XftCharFontSpecRender.3.gz
 man/man3/XftCharIndex.3.gz
 man/man3/XftCharSpecRender.3.gz
 man/man3/XftColorAllocName.3.gz
 man/man3/XftColorAllocValue.3.gz
 man/man3/XftColorFree.3.gz
 man/man3/XftDefaultHasRender.3.gz
 man/man3/XftDefaultSet.3.gz
 man/man3/XftDefaultSubstitute.3.gz
 man/man3/XftDrawChange.3.gz
 man/man3/XftDrawCharFontSpec.3.gz
 man/man3/XftDrawCharSpec.3.gz
 man/man3/XftDrawColormap.3.gz
 man/man3/XftDrawCreate.3.gz
 man/man3/XftDrawCreateAlpha.3.gz
 man/man3/XftDrawCreateBitmap.3.gz
 man/man3/XftDrawDestroy.3.gz
 man/man3/XftDrawDisplay.3.gz
 man/man3/XftDrawDrawable.3.gz
 man/man3/XftDrawGlyphFontSpec.3.gz
 man/man3/XftDrawGlyphSpec.3.gz
 man/man3/XftDrawGlyphs.3.gz
 man/man3/XftDrawPicture.3.gz
 man/man3/XftDrawRect.3.gz
 man/man3/XftDrawSetClip.3.gz
 man/man3/XftDrawSetClipRectangles.3.gz
 man/man3/XftDrawSetSubwindowMode.3.gz
 man/man3/XftDrawSrcPicture.3.gz
 man/man3/XftDrawString16.3.gz
 man/man3/XftDrawString32.3.gz
 man/man3/XftDrawString8.3.gz
 man/man3/XftDrawStringUtf16.3.gz
 man/man3/XftDrawStringUtf8.3.gz
 man/man3/XftDrawVisual.3.gz
 man/man3/XftFontCheckGlyph.3.gz
 man/man3/XftFontClose.3.gz
 man/man3/XftFontCopy.3.gz
 man/man3/XftFontInfoCreate.3.gz
 man/man3/XftFontInfoDestroy.3.gz
 man/man3/XftFontInfoEqual.3.gz
 man/man3/XftFontInfoHash.3.gz
 man/man3/XftFontLoadGlyphs.3.gz
 man/man3/XftFontMatch.3.gz
 man/man3/XftFontOpen.3.gz
 man/man3/XftFontOpenInfo.3.gz
 man/man3/XftFontOpenName.3.gz
 man/man3/XftFontOpenPattern.3.gz
 man/man3/XftFontOpenXlfd.3.gz
 man/man3/XftFontUnloadGlyphs.3.gz
 man/man3/XftGetVersion.3.gz
 man/man3/XftGlyphExtents.3.gz
 man/man3/XftGlyphFontSpecRender.3.gz
 man/man3/XftGlyphRender.3.gz
 man/man3/XftGlyphSpecRender.3.gz
 man/man3/XftInit.3.gz
 man/man3/XftInitFtLibrary.3.gz
 man/man3/XftListFonts.3.gz
 man/man3/XftLockFace.3.gz
 man/man3/XftNameParse.3.gz
 man/man3/XftNameUnparse.3.gz
 man/man3/XftTextExtents16.3.gz
 man/man3/XftTextExtents32.3.gz
 man/man3/XftTextExtents8.3.gz
 man/man3/XftTextExtentsUtf16.3.gz
 man/man3/XftTextExtentsUtf8.3.gz
 man/man3/XftTextRender16.3.gz
 man/man3/XftTextRender16BE.3.gz
 man/man3/XftTextRender16LE.3.gz
 man/man3/XftTextRender32.3.gz
 man/man3/XftTextRender32BE.3.gz
 man/man3/XftTextRender32LE.3.gz
 man/man3/XftTextRender8.3.gz
 man/man3/XftTextRenderUtf16.3.gz
 man/man3/XftTextRenderUtf8.3.gz
 man/man3/XftUnlockFace.3.gz
 man/man3/XftXlfdParse.3.gz