diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 3157fc199a1f..f4a6ddf7dd1e 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	1.20.0-990
-DISTVERSIONSUFFIX=	-gb2a0de4f0
+DISTVERSION=	21.0.99.1-42
+DISTVERSIONSUFFIX=	-gf6f2f203b
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	231720f8b212.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	48a7bfeb4687.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	9fef4b809165.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Wayland client (development snapshot)
 
 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
 RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 		xkeyboard-config>0:x11/xkeyboard-config
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
 USES=		compiler:c11 gl meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GH_ACCOUNT=	freedesktop
 GH_PROJECT=	xorg-xserver
 GH_TUPLE=	freedesktop:xorg-xorgproto:xorgproto-2021.4.99.2:xorgproto/subprojects/xorgproto
 MESON_ARGS=	-D${PORTNAME}=true \
 		-Dxorg=false \
 		-Dxnest=false \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland \
 		"@comment lib/xorg/protocol.txt" \
 		libdata/pkgconfig/xwayland.pc \
 		"@comment man/man1/Xserver.1.gz" \
 		man/man1/Xwayland.1.gz
 
 # 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
 
 .ifdef GH_TUPLE
 post-install:
 # https://github.com/mesonbuild/meson/issues/2550
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/GL
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/X11
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc/xorgproto
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index debb447cd37f..ae1ff3310778 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1625167099
-SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-990-gb2a0de4f0_GH0.tar.gz) = 8402532b15187922cfe20f3d62a6391de9f64d684d51baff74481761af040862
-SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-990-gb2a0de4f0_GH0.tar.gz) = 5861263
+TIMESTAMP = 1625840456
+SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-42-gf6f2f203b_GH0.tar.gz) = 8b338242cf7c26309dec34d7372b3609ceb183481e7715d16f56af08a4503360
+SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-42-gf6f2f203b_GH0.tar.gz) = 5860809
 SHA256 (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = ea68fe40cf55247538fd3f0f891ef0ba229b541b56e0874b7efed60688228638
 SIZE (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = 981510
 SHA256 (231720f8b212.patch) = 50b5ff308e26982ad41f8203303e0c44d3751a2009dc66337c370a1b022f4c0d
 SIZE (231720f8b212.patch) = 10728
 SHA256 (48a7bfeb4687.patch) = 68fa80068da9a93aadb81d123e16d403389218e40ca111fb478cf37916acc826
 SIZE (48a7bfeb4687.patch) = 17556
 SHA256 (9fef4b809165.patch) = c658d16069924edc461cb030136f12b1cb73d82496a2548a5df7f335f3735012
 SIZE (9fef4b809165.patch) = 2466