diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 2311194b57f6..12ec8ea7119e 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	21.0.99.1-553
-DISTVERSIONSUFFIX=	-g141e7dd8a
+DISTVERSION=	21.0.99.1-582
+DISTVERSIONSUFFIX=	-g0c1a93d31
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES+=	https://github.com/mirror/${GL_PROJECT}/commit/:github
 PATCHFILES+=	cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	3930d00746b0.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	707c37b7ab9e.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	8b9bf0a22640.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1047
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 45ef3b4e3b29..ee0b25063e43 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1698913080
-SHA256 (xserver-xorg-server-21.0.99.1-553-g141e7dd8a.tar.bz2) = e32773bcaa79e8265129c96426ac43a8831c0a1e874ac6579380899812a98ce7
-SIZE (xserver-xorg-server-21.0.99.1-553-g141e7dd8a.tar.bz2) = 3700375
+TIMESTAMP = 1702428289
+SHA256 (xserver-xorg-server-21.0.99.1-582-g0c1a93d31.tar.bz2) = 7a84367eac0ea15d1754e43fa8c4bfba3d6ac5156b8353d5107bd84c9d054316
+SIZE (xserver-xorg-server-21.0.99.1-582-g0c1a93d31.tar.bz2) = 3704642
 SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
 SIZE (cd6c9c1246af.patch) = 3730
-SHA256 (3930d00746b0.patch) = acae16d3636d12e631a14e2584a4ae5d527dfb9897b897631f7c8c8e3d5f49c7
-SIZE (3930d00746b0.patch) = 18587
+SHA256 (707c37b7ab9e.patch) = db8a2acbc8b8ceeeef0c6aa4b06b632ef074b1319194cc9794e3ae715062e425
+SIZE (707c37b7ab9e.patch) = 18662
 SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
 SIZE (3b0d1a3a2296.patch) = 2513
 SHA256 (8b9bf0a22640.patch) = a44b46488e9b038b546e756d96ee7e2856f58c8fa30b81ed02d75716fd2f07f2