diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
index 165f69ad1774..48792bc24c3a 100644
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -1,63 +1,58 @@
 PORTNAME=	xwayland
-PORTVERSION=	23.2.7
-PORTREVISION=	1
+PORTVERSION=	24.1.0
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
 
 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.30: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=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 
 MESON_ARGS=	-Dxvfb=false \
 		-Dxcsecurity=true \
 		-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=		CSD EI NVIDIA
+OPTIONS_DEFINE=		CSD EI
 OPTIONS_DEFAULT=	CSD EI
 
 CSD_DESC=		Client-side decorations via libdecor
 CSD_LIB_DEPENDS=	libdecor-0.so:x11-toolkits/libdecor
 CSD_MESON_TRUE=		libdecor
 
 EI_DESC=		Emulated input via libei
 EI_LIB_DEPENDS=		libei.so:x11/libei
 EI_MESON_OFF=		-Dxwayland_ei=false
 
-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 5c6e6bd967bc..2051c06bfe8f 100644
--- a/x11-servers/xwayland/distinfo
+++ b/x11-servers/xwayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715754215
-SHA256 (xwayland-23.2.7.tar.xz) = 769e5133929ca4a4141d8e8d34dbbceea1dceaa93cf7a0b90ad7e76965e40055
-SIZE (xwayland-23.2.7.tar.xz) = 1295016
+TIMESTAMP = 1715754099
+SHA256 (xwayland-24.1.0.tar.xz) = bef21c4f18807a4ed571c4e2df60ab63b5466bbd502ecceb2485b892ab76dcc2
+SIZE (xwayland-24.1.0.tar.xz) = 1301180