diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 9bb81c2b9b14..1d7e7bf723a4 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,62 +1,60 @@
 PORTNAME=	gamescope
-DISTVERSION=	3.11.49
-PORTREVISION=	2
+DISTVERSION=	3.11.51
 CATEGORIES=	x11-wm # wayland: depends on https://github.com/Plagman/gamescope/issues/543
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	2a84a44f6897.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	e0927f7bce95.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	a618ea074660.patch:-p1 # https://github.com/Plagman/gamescope/issues/120
-PATCHFILES+=	91fbb22bda68.patch:-p1 # https://github.com/Plagman/gamescope/pull/677
-PATCHFILES+=	f4a33bd37e49.patch:-p1 # https://github.com/Plagman/gamescope/pull/632
-PATCHFILES+=	be5e7d23e49e.patch:-p1 # wlroots 0.16 (black screen fix)
-PATCHFILES+=	bb67298e95a1.patch:-p1 # wlroots 0.16 (xwayland hang fix)
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Micro-compositor from SteamOS
 WWW=		https://github.com/Plagman/gamescope
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		evdev-proto>0:devel/evdev-proto \
 		libliftoff>=0.3.0<0.4.0:graphics/libliftoff \
 		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=1.17:graphics/wayland-protocols \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libdrm.so:graphics/libdrm \
 		libliftoff.so:graphics/libliftoff \
 		libvulkan.so:graphics/vulkan-loader \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c++11-lib meson pkgconfig sdl xorg
 USE_GITHUB=	yes
 USE_SDL=	sdl2
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm
 GH_ACCOUNT=	Plagman
-GH_TUPLE=	nothings:stb:af1a5bc:stb/subprojects/stb
-PLIST_FILES=	bin/${PORTNAME}
+GH_TUPLE=	nothings:stb:af1a5bc:stb/subprojects/stb \
+		Joshua-Ashton:vkroots:e6b8949:vkroots/subprojects/vkroots
+PLIST_FILES=	bin/${PORTNAME} \
+		lib/libVkLayer_FROG_${PORTNAME}_wsi.so \
+		share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.json
 MESON_ARGS=	--force-fallback-for= # allow system wlroots + libliftoff
 
 OPTIONS_DEFINE=	PIPEWIRE
 OPTIONS_DEFAULT=PIPEWIRE
 
 PIPEWIRE_DESC=		Screen capture via PipeWire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_MESON_ENABLED=	pipewire
 
 post-extract:
 # Merge patch_directory for subprojects without meson.build
 	@(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..)
 .if defined(PATCHFILES) && ${PATCHFILES:M91fbb22bda68*}
 # Pretend to be a regular file for vendor patch to apply as is
 	@${RMDIR} ${WRKSRC}/subprojects/wlroots
 	@${ECHO_CMD} "Subproject commit 9f41627aa10a94d9427bc315fa3d363a61b94d7c" \
 		>${WRKSRC}/subprojects/wlroots
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
index 37870e79ed1c..26943899971a 100644
--- a/x11-wm/gamescope/distinfo
+++ b/x11-wm/gamescope/distinfo
@@ -1,19 +1,13 @@
-TIMESTAMP = 1668542511
-SHA256 (Plagman-gamescope-3.11.49_GH0.tar.gz) = 41008c4a4cde1661046cfe837f483cede118fa2670c31ab1c01b2ae90a8f7291
-SIZE (Plagman-gamescope-3.11.49_GH0.tar.gz) = 203449
+TIMESTAMP = 1670438874
+SHA256 (Plagman-gamescope-3.11.51_GH0.tar.gz) = 0ffe1c3e3cdf40e20b45b758f8e4c334c5c0941eb05437e59e9c6aaf8c948a1e
+SIZE (Plagman-gamescope-3.11.51_GH0.tar.gz) = 209920
 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058
 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334
+SHA256 (Joshua-Ashton-vkroots-e6b8949_GH0.tar.gz) = 2b2e949642d93a9eba7340e7828d38ea0dac822939812020ec63c02e4c4dbc72
+SIZE (Joshua-Ashton-vkroots-e6b8949_GH0.tar.gz) = 272574
 SHA256 (2a84a44f6897.patch) = fd892d4477885926b0ef5793d5222764afa2ba334fd25c4cc671c89812e100b5
 SIZE (2a84a44f6897.patch) = 2931
 SHA256 (e0927f7bce95.patch) = 6bbab2f37d7e76a1eade6d81bc0b441cc09f0020143bafb53555b767bf056600
 SIZE (e0927f7bce95.patch) = 1609
 SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424
 SIZE (a618ea074660.patch) = 2589
-SHA256 (91fbb22bda68.patch) = 024f58139f8d07c01138f3dcf39170dbfd48802b11001d73c7cdb494752e315f
-SIZE (91fbb22bda68.patch) = 17412
-SHA256 (f4a33bd37e49.patch) = dd22a0f5e4f0af44b65d04c22c2a67c992b0a3098adb83ddf52e5bcf222c9ec3
-SIZE (f4a33bd37e49.patch) = 1514
-SHA256 (be5e7d23e49e.patch) = 0c9ca3bcb9a580ed7774f2bff1d3b07a34da3ec35ea7292b90e84b315bf3eccf
-SIZE (be5e7d23e49e.patch) = 1216
-SHA256 (bb67298e95a1.patch) = 8268172903cb57f74abb6e4f6a4729125321c2229593d2af9ff317123bc1282c
-SIZE (bb67298e95a1.patch) = 5714