diff --git a/x11-wm/cagebreak/Makefile b/x11-wm/cagebreak/Makefile
index 147938f31ab6..f6835c8f8a32 100644
--- a/x11-wm/cagebreak/Makefile
+++ b/x11-wm/cagebreak/Makefile
@@ -1,50 +1,53 @@
 PORTNAME=	cagebreak
-DISTVERSION=	1.9.1
-PORTREVISION=	1
+DISTVERSION=	2.0.0
 CATEGORIES=	x11-wm wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	3f4a45ee2db1.patch:-p1 # https://github.com/project-repo/cagebreak/pull/37
+PATCHFILES+=	eb900383c51f.patch:-p1 # https://github.com/project-repo/cagebreak/pull/37
+PATCHFILES+=	8126a6857fe2.patch:-p1 # https://github.com/project-repo/cagebreak/pull/37
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland tiling compositor inspired by ratpoison
 WWW=		https://github.com/project-repo/cagebreak
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
-		wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots
+		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libudev.so:devel/libudev-devd \
 		libwayland-server.so:graphics/wayland \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
-USES=		compiler:c11 gnome meson pkgconfig xorg
+USES=		compiler:c11 gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo pango
-USE_XORG=	pixman
 GH_ACCOUNT=	project-repo
 MESON_ARGS=	-Dversion_override="${DISTVERSIONFULL}" # if snapshot
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/xdg/${PORTNAME}/config
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_TRUE=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
-			man/man5/${PORTNAME}-config.5.gz
+			man/man5/${PORTNAME}-config.5.gz \
+			man/man7/${PORTNAME}-socket.7.gz
 
 X11_MESON_TRUE=	xwayland
 
 post-patch:
 # Respect PREFIX for system-wide config
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/${PORTNAME}.c \
 		${WRKSRC}/meson.build
 
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/cagebreak/distinfo b/x11-wm/cagebreak/distinfo
index 7c1ba840899e..ddfe7a4bc698 100644
--- a/x11-wm/cagebreak/distinfo
+++ b/x11-wm/cagebreak/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1659127277
-SHA256 (project-repo-cagebreak-1.9.1_GH0.tar.gz) = 5b283c155a9b7167e18156e5118716d61f5ed8a08849b4f2f905d0035eb1a1e4
-SIZE (project-repo-cagebreak-1.9.1_GH0.tar.gz) = 153007
+TIMESTAMP = 1673212155
+SHA256 (project-repo-cagebreak-2.0.0_GH0.tar.gz) = 14f1a0286a0ceee9cbe6eb23cd4d351be8110d3a786e9dbf4e942cc0aff7bf4f
+SIZE (project-repo-cagebreak-2.0.0_GH0.tar.gz) = 176426
+SHA256 (3f4a45ee2db1.patch) = 923b124306d873b247e765fc24d95cdb735e174d2899f8c38f0372d47c5653cc
+SIZE (3f4a45ee2db1.patch) = 1945
+SHA256 (eb900383c51f.patch) = 3161b796d600d44159f2bfa4257a2eaffe64fa6163ddb91327883519dbf3facd
+SIZE (eb900383c51f.patch) = 674
+SHA256 (8126a6857fe2.patch) = 9ba0b08e7e8a905111352c0902daf553374af03025b830f7637a379343b9c7bd
+SIZE (8126a6857fe2.patch) = 4020