diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 96074dff52fd..990ddd821046 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,42 +1,58 @@
 PORTNAME=	gamescope
 DISTVERSION=	3.8.4
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	8fae1ff56a62.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	f36133f27fbc.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	01ac6a8e2699.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	43f743fcfbd0.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	9ebb1c16d3ad.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
 
-BROKEN=		fails to build after https://github.com/swaywm/wlroots/commit/9ecfa4343a6d
-
 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:b08bbaa:libliftoff/subprojects/libliftoff
 CPPFLAGS+=	-D_WITH_DPRINTF # XXX Remove after FreeBSD 11 EOL
 PLIST_FILES=	bin/${PORTNAME}
 
+# 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"
+
 .include <bsd.port.mk>
diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
index 23b3d9c7e22c..43a46796152d 100644
--- a/x11-wm/gamescope/distinfo
+++ b/x11-wm/gamescope/distinfo
@@ -1,17 +1,19 @@
 TIMESTAMP = 1625025715
 SHA256 (Plagman-gamescope-3.8.4_GH0.tar.gz) = 761d0baa20b683cb3f3bb0126229a05b2912e016970a24c3beba12468d7df6ae
 SIZE (Plagman-gamescope-3.8.4_GH0.tar.gz) = 72030
 SHA256 (emersion-libliftoff-b08bbaa_GH0.tar.gz) = bc689419a96d5e2428b77d3cf9e95f532ae89295345bdaf288df24adc4803a04
 SIZE (emersion-libliftoff-b08bbaa_GH0.tar.gz) = 27461
+SHA256 (swaywm-wlroots-0.13.0_GH0.tar.gz) = f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3
+SIZE (swaywm-wlroots-0.13.0_GH0.tar.gz) = 503575
 SHA256 (8fae1ff56a62.patch) = 7a636fec88d914047abed0c91268ae1b7779f48e36c74efd37868f2c7ba3955e
 SIZE (8fae1ff56a62.patch) = 2778
 SHA256 (f36133f27fbc.patch) = e4aa6245782f96387c7083c749da6a3cd84f4a320ec70b448984572c37f76962
 SIZE (f36133f27fbc.patch) = 2719
 SHA256 (01ac6a8e2699.patch) = 5bea002c034878c1e991cf3efff19f70a666e681966d6361bbc7220c9e93fdd1
 SIZE (01ac6a8e2699.patch) = 1606
 SHA256 (43f743fcfbd0.patch) = e1d6f39d07b704f7b031e57d3d4b6c8092f14015385a9e297a7b7c279cd7449d
 SIZE (43f743fcfbd0.patch) = 1111
 SHA256 (9ebb1c16d3ad.patch) = 8e7c1a46c10d9909d85a673a5a629f293596a5f97d48ad322a8da5e7f24100be
 SIZE (9ebb1c16d3ad.patch) = 3540
 SHA256 (d59836199ebe.patch) = 40b519ef847b979ba088325cdd7170bed91936b79d845c65d2126b2b25166a1e
 SIZE (d59836199ebe.patch) = 2586
diff --git a/x11-wm/gamescope/files/patch-private-wlroots b/x11-wm/gamescope/files/patch-private-wlroots
new file mode 100644
index 000000000000..68b8cc175721
--- /dev/null
+++ b/x11-wm/gamescope/files/patch-private-wlroots
@@ -0,0 +1,35 @@
+wlroots 0.13.0 is out-of-date and has no other consumers. Keep it
+private to gamescope package for now.
+
+--- subprojects/wlroots/include/meson.build.orig	2021-04-07 19:19:31 UTC
++++ subprojects/wlroots/include/meson.build
+@@ -17,7 +17,9 @@ if not features.get('xdg-foreign')
+ 	]
+ endif
+ 
++if not meson.is_subproject()
+ install_subdir('wlr',
+ 	install_dir: get_option('includedir'),
+ 	exclude_files: exclude_files,
+ )
++endif
+--- subprojects/wlroots/include/wlr/meson.build.orig	2021-04-07 19:19:31 UTC
++++ subprojects/wlroots/include/wlr/meson.build
+@@ -21,4 +21,6 @@ ver_h = configure_file(
+ 	configuration: version_data,
+ )
+ 
++if not meson.is_subproject()
+ install_headers(conf_h, ver_h, subdir: 'wlr')
++endif
+--- subprojects/wlroots/meson.build.orig	2021-04-07 19:19:31 UTC
++++ subprojects/wlroots/meson.build
+@@ -153,7 +153,7 @@ lib_wlr = library(
+ 	soversion: soversion,
+ 	dependencies: wlr_deps,
+ 	include_directories: [wlr_inc, proto_inc],
+-	install: true,
++	install: not meson.is_subproject(),
+ 	link_args: symbols_flag,
+ 	link_depends: symbols_file,
+ )