diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
index b4cd01a6293d..607ca5a2204d 100644
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -1,65 +1,64 @@
 PORTNAME=	xwayland
-PORTVERSION=	22.1.8
-PORTREVISION=	1
+PORTVERSION=	23.2.2
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	42e34498f87a.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	0d56c27582a2.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	1f7b28547011.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	cd6c9c1246af.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	3930d00746b0.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	3b0d1a3a2296.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 server as Wayland Client
 WWW=		https://wayland.freedesktop.org/xserver.html
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
 		wayland-protocols>=1.18:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libwayland-client.so:graphics/wayland \
 		libxcvt.so:x11/libxcvt
 RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 		xkeyboard-config>0:x11/xkeyboard-config
 
 CONFLICTS_INSTALL=	${PORTNAME}-devel
 
 USES=		compiler:c11 gl meson pkgconfig xorg tar:xz
 USE_GL=		egl gbm gl
 USE_XORG=	pixman xau xfont2 xkbfile xshmfence xtrans
 
 MESON_ARGS=	-Dxvfb=false \
 		-Dxdmcp=false \
 		-Dxcsecurity=false \
 		-Ddri3=true \
 		-Dglamor=true \
 		-Dsha1=libmd \
 		-Dipv6=true \
 		-Dxkb_dir=${LOCALBASE}/share/X11/xkb \
 		-Dxkb_output_dir=/var/lib/xkb \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 
 # Keep in sync with xorg-server
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
 FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
 DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/misc/	\
 	${FONTPATH_ROOT}/TTF/ \
 	${FONTPATH_ROOT}/OTF/ \
 	${FONTPATH_ROOT}/Type1/ \
 	${FONTPATH_ROOT}/100dpi/ \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
 OPTIONS_DEFINE=	NVIDIA
 
 NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland
 NVIDIA_MESON_TRUE=	xwayland_eglstream
 
 .include <bsd.port.mk>
diff --git a/x11-servers/xwayland/distinfo b/x11-servers/xwayland/distinfo
index 79b0d6d33ab5..0d7db41e1dec 100644
--- a/x11-servers/xwayland/distinfo
+++ b/x11-servers/xwayland/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1679734051
-SHA256 (xwayland-22.1.8.tar.xz) = d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73
-SIZE (xwayland-22.1.8.tar.xz) = 1273668
-SHA256 (42e34498f87a.patch) = 64cd5eed076cdc575f1189e8491fb752054970032697445e6c192b4e63cac2a4
-SIZE (42e34498f87a.patch) = 10310
-SHA256 (0d56c27582a2.patch) = b7a53f6f52c197ac42ae521881c2d5e986f9983f5eb3640ecf1adb51356db40f
-SIZE (0d56c27582a2.patch) = 17463
-SHA256 (1f7b28547011.patch) = 483d5e636f011570953579a53814c45789958af94d003cda19cedd394df93ed8
-SIZE (1f7b28547011.patch) = 2472
+TIMESTAMP = 1698308401
+SHA256 (xwayland-23.2.2.tar.xz) = 9f7c0938d2a41e941ffa04f99c35e5db2bcd3eec034afe8d35d5c810a22eb0a8
+SIZE (xwayland-23.2.2.tar.xz) = 1298400
+SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
+SIZE (cd6c9c1246af.patch) = 3730
+SHA256 (3930d00746b0.patch) = acae16d3636d12e631a14e2584a4ae5d527dfb9897b897631f7c8c8e3d5f49c7
+SIZE (3930d00746b0.patch) = 18587
+SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
+SIZE (3b0d1a3a2296.patch) = 2513