diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 79e06fdd6e6b..b2a5896573bc 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,64 +1,68 @@
 PORTNAME=	gamescope
-DISTVERSION=	3.9
+DISTVERSION=	3.9.1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	98bc90ecf55c.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
-PATCHFILES+=	acc8a1bed4e8.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
-PATCHFILES+=	afa1c085ebbf.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
+PATCHFILES+=	63cd0609e14a.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
+PATCHFILES+=	80a01b036545.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
+PATCHFILES+=	b62b583e810a.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	d59836199ebe.patch:-p1 # https://github.com/Plagman/gamescope/issues/120
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Micro-compositor from SteamOS
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		evdev-proto>0:devel/evdev-proto \
 		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=1.17:graphics/wayland-protocols \
 		wlroots>=0.13.0<0.14.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libdrm.so:graphics/libdrm \
 		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=	emersion:libliftoff:v0.1.0-3-g516cf94:libliftoff/subprojects/libliftoff \
-		nothings:stb:c0c9826:stb/subprojects/stb
+		nothings:stb:af1a5bc:stb/subprojects/stb
 CPPFLAGS+=	-D_WITH_DPRINTF # XXX Remove after FreeBSD 11 EOL
 PLIST_FILES=	bin/${PORTNAME}
 
 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
 
 # Bundle wlroots due to breaking changes:
 # https://github.com/swaywm/wlroots/commit/9ecfa4343a6d
 # https://github.com/swaywm/wlroots/commit/a109a80dca50
 BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*} \
 		xwayland-devel>0:x11-servers/xwayland-devel
 LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
 		libudev.so:devel/libudev-devd \
 		libseat.so:sysutils/seatd \
 		libinput.so:x11/libinput \
 		libxcb-errors.so:x11/xcb-util-errors \
 		libxcb-render-util.so:x11/xcb-util-renderutil \
 		libxcb-icccm.so:x11/xcb-util-wm
 RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
 USE_XORG+=	pixman xcb
 USE_GL+=	gbm egl
 GH_TUPLE+=	swaywm:wlroots:0.13.0:wlroots/subprojects/wlroots
 PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
 
+post-extract:
+# Merge patch_directory for subprojects without meson.build
+	@(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..)
+
 .include <bsd.port.mk>
diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
index 0e32ff61538f..3a9c258c58ca 100644
--- a/x11-wm/gamescope/distinfo
+++ b/x11-wm/gamescope/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1630628293
-SHA256 (Plagman-gamescope-3.9_GH0.tar.gz) = f84caba2cf6b65d382f41716c0dee5cfeba22e1c06b2539ad0cdae59fa8fcac1
-SIZE (Plagman-gamescope-3.9_GH0.tar.gz) = 84424
+TIMESTAMP = 1631515174
+SHA256 (Plagman-gamescope-3.9.1_GH0.tar.gz) = 2ff1c6d43427c2314554c8a43b33b1cfc7e483ca102399da4cb24f8d428ec972
+SIZE (Plagman-gamescope-3.9.1_GH0.tar.gz) = 85517
 SHA256 (emersion-libliftoff-v0.1.0-3-g516cf94_GH0.tar.gz) = 6577292c106aaec29db5296f37c6e796171cb7bad9a5316a5b65b9e9cd8139bc
 SIZE (emersion-libliftoff-v0.1.0-3-g516cf94_GH0.tar.gz) = 29766
-SHA256 (nothings-stb-c0c9826_GH0.tar.gz) = fc0d6eb72f1b44ace232208c6daf456a80e80dd28e9fa6decebd58bf3c1746d0
-SIZE (nothings-stb-c0c9826_GH0.tar.gz) = 1386315
+SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058
+SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334
 SHA256 (swaywm-wlroots-0.13.0_GH0.tar.gz) = f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3
 SIZE (swaywm-wlroots-0.13.0_GH0.tar.gz) = 503575
-SHA256 (98bc90ecf55c.patch) = b904097410bfd604b2d0550f25a82c72e119cf91ac67b9d6a2e32f5975b5005c
-SIZE (98bc90ecf55c.patch) = 2836
-SHA256 (acc8a1bed4e8.patch) = 3a2fb132c2d23cb0456d5e5d7a8889d6c68752437970d068ffede66750e5a57c
-SIZE (acc8a1bed4e8.patch) = 1595
-SHA256 (afa1c085ebbf.patch) = aa2d0a443e705a11b9e197c88dfd3f64edc4af49237eccc706c06cce6a70612c
-SIZE (afa1c085ebbf.patch) = 1108
+SHA256 (63cd0609e14a.patch) = 9a69cf71d1be1fd622f2fbfca48c7b621a10ab806f81a380d55d8b38bf4436dd
+SIZE (63cd0609e14a.patch) = 2885
+SHA256 (80a01b036545.patch) = c1e7b2412a8fdda26b6c1cef77fb18681e50dd4953dd52b9a439578b52791546
+SIZE (80a01b036545.patch) = 1595
+SHA256 (b62b583e810a.patch) = 5dd6f689d1f0a344aeeb1d142659f25754c463cf604c943e000cecd888554c0b
+SIZE (b62b583e810a.patch) = 1132
 SHA256 (d59836199ebe.patch) = ae610295347e8d564d27cbd028dd55e44f2bb56d104e806069c112dc802d2a93
 SIZE (d59836199ebe.patch) = 2588