diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index 4beb26390650..d26363f1814c 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,65 +1,72 @@
 PORTNAME=	wlroots
 DISTVERSION=	0.13.0
 CATEGORIES=	x11-toolkits
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	7c0e2a271a4c.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064
 PATCHFILES+=	e1b5323f56c3.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Modular Wayland compositor library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland>=1.18:graphics/wayland \
 		wayland-protocols>=1.17:graphics/wayland-protocols
 LIB_DEPENDS=	libudev.so:devel/libudev-devd \
 		libdrm.so:graphics/libdrm \
 		libwayland-server.so:graphics/wayland \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	libudev-devd>=0.4.1:devel/libudev-devd \
 		mesa-dri>0:graphics/mesa-dri
 
 USES=		compiler:c11 gl meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl gbm glesv2
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	swaywm
 MESON_ARGS=	-Dexamples=false
 
-OPTIONS_DEFINE=	CONSOLEKIT LIBSEAT UUID X11
+OPTIONS_DEFINE=	CONSOLEKIT LIBSEAT NVIDIA UUID X11
 OPTIONS_DEFAULT=LIBSEAT UUID X11
 OPTIONS_SUB=	yes
 
 CONSOLEKIT_DESC=	DRM sessions without root via ConsoleKit2 (experimental)
 CONSOLEKIT_PATCH_SITES=	https://github.com/unrelentingtech/${GH_PROJECT}/commit/:ck2
 CONSOLEKIT_PATCHFILES=	fb837ae10b1f.patch:-p1:ck2 # https://github.com/swaywm/wlroots/pull/1467
 CONSOLEKIT_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libconsolekit.so:sysutils/consolekit2
 CONSOLEKIT_MESON_ENABLED=	consolekit2
 .if make(makesum)
 .MAKEFLAGS:		WITH+=CONSOLEKIT
 .endif
 
 LIBSEAT_DESC=		DRM sessions with/without root via libseat
 LIBSEAT_LIB_DEPENDS=	libseat.so:sysutils/seatd
 LIBSEAT_MESON_ENABLED=	libseat
 
+NVIDIA_DESC=		EGLStreams support for DRM backend (experimental)
+NVIDIA_PATCH_SITES=	https://github.com/danvd/${GH_PROJECT}-eglstreams/commit/:nvidia
+NVIDIA_PATCHFILES=	eba4b66f92ca.patch:-p1:nvidia # https://github.com/swaywm/wlroots/pull/2769
+.if make(makesum)
+.MAKEFLAGS:		WITH+=NVIDIA
+.endif
+
 # uuid_create() is random on NetBSD and OpenBSD but not DragonFly and FreeBSD
 # See also https://github.com/netbsd/src/commit/8651e9a438af
 UUID_DESC=		Exported surfaces to use random UUIDs via libuuid
 UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 X11_LIB_DEPENDS=	libxcb-errors.so:x11/xcb-util-errors \
 			libxcb-render-util.so:x11/xcb-util-renderutil \
 			libxcb-icccm.so:x11/xcb-util-wm
 X11_BUILD_DEPENDS=	xwayland-devel>0:x11-servers/xwayland-devel
 X11_RUN_DEPENDS=	xwayland-devel>0:x11-servers/xwayland-devel
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	x11-backend xwayland
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index cbe229bd594e..d797fa4fa287 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,9 +1,11 @@
 TIMESTAMP = 1617734115
 SHA256 (swaywm-wlroots-0.13.0_GH0.tar.gz) = f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3
 SIZE (swaywm-wlroots-0.13.0_GH0.tar.gz) = 503575
 SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e
 SIZE (7c0e2a271a4c.patch) = 5729
 SHA256 (e1b5323f56c3.patch) = 13145323caf9e56412ee3766fb9eacca9c6e4ca7088a320e79bc1512c0afe522
 SIZE (e1b5323f56c3.patch) = 4028
 SHA256 (fb837ae10b1f.patch) = ecf07d813ae796eca946e909a35434a93b07fc349d6ca8b48d7834cb2dfb4071
 SIZE (fb837ae10b1f.patch) = 27075
+SHA256 (eba4b66f92ca.patch) = a271c30c414fb2ae2cb6e0cbca77c37c1e15a3b160097f6e78298bfcec8df352
+SIZE (eba4b66f92ca.patch) = 96009
diff --git a/x11-toolkits/wlroots/pkg-message b/x11-toolkits/wlroots/pkg-message
index 63f713926391..ba814bf0ca4d 100644
--- a/x11-toolkits/wlroots/pkg-message
+++ b/x11-toolkits/wlroots/pkg-message
@@ -1,20 +1,21 @@
 [
 { type: install
   message: <<EOM
 Known issues:
 - On FreeBSD 11.* kernel needs to be rebuilt with EVDEV_SUPPORT
 - On FreeBSD 11.* drm-kmod needs https://github.com/FreeBSDDesktop/kms-drm/pull/213
+- NVIDIA may be affected by https://github.com/aritger/eglstreams-kms-example/issues/7
 
 When built with LIBSEAT enabled you may see the following:
 
     [ERROR] [libseat] [libseat/libseat.c:73] libseat_open_seat: No backend was able to open a seat
     [ERROR] [backend/session/libseat.c:102] Unable to create seat: Function not implemented
 
 Possible solutions (select one):
 - Ignore libseat errors to let wlroots use direct session
 - Start seatd (e.g., `service seatd onestart`) and optionally
   prevent compositor from using SUID (e.g., `chmod u-s $(which sway)`)
 - Rebuild sysutils/seatd with SUID enabled
 EOM
 }
 ]