diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
index e2f1ae25a038..3f2a0ee57d37 100644
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -1,58 +1,67 @@
 PORTNAME=	labwc
 DISTVERSION=	0.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	9ef7faf376a1.patch:-p1 # wlroots 0.16
+PATCHFILES+=	cfca377ca2ec.patch:-p1 # wlroots 0.16
+PATCHFILES+=	581a2bb2f10c.patch:-p1 # wlroots 0.16
+PATCHFILES+=	d844f6798b2d.patch:-p1 # wlroots 0.16
+PATCHFILES+=	bca2e9be60c8.patch:-p1 # wlroots 0.16
+PATCHFILES+=	d6c890ed164a.patch:-p1 # wlroots 0.16
+PATCHFILES+=	d8a877749e45.patch:-p1 # wlroots 0.16
+PATCHFILES+=	8fb196cba138.patch:-p1 # wlroots 0.16
+PATCHFILES+=	c06100fa3a45.patch:-p1 # wlroots 0.16
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland stacking compositor
 WWW=		https://github.com/labwc/labwc
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0: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=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GNOME=	cairo libxml2 pango
 USE_XORG=	pixman
 PLIST_FILES=	bin/${PORTNAME} \
 		share/wayland-sessions/${PORTNAME}.desktop
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
 			man/man5/${PORTNAME}-actions.5.gz \
 			man/man5/${PORTNAME}-config.5.gz \
 			man/man5/${PORTNAME}-environment.5.gz \
 			man/man5/${PORTNAME}-menu.5.gz \
 			man/man5/${PORTNAME}-theme.5.gz
 
+X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 X11_MESON_ENABLED=	xwayland
 
-post-extract:
+post-patch:
 # Force system dependencies
 	@${RM} ${WRKSRC}/subprojects/*.wrap
-
-post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 # Respect PREFIX for system-wide config and Openbox themes
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		-e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/docs/${PORTNAME}-config.5.scd \
 		${WRKSRC}/docs/${PORTNAME}-environment.5.scd \
 		${WRKSRC}/src/common/dir.c
 
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/labwc/distinfo b/x11-wm/labwc/distinfo
index fdb3d23be6ab..6a70dec3d400 100644
--- a/x11-wm/labwc/distinfo
+++ b/x11-wm/labwc/distinfo
@@ -1,3 +1,21 @@
 TIMESTAMP = 1657906446
 SHA256 (labwc-labwc-0.5.3_GH0.tar.gz) = 0b67bc89a5d9059fae28822f3ba2373553dea290cd931c9384a91dbeb2054650
 SIZE (labwc-labwc-0.5.3_GH0.tar.gz) = 110293
+SHA256 (9ef7faf376a1.patch) = 94d349d92b969f1589e9566ce41ab8442ceea1ee3384a451c649d534e5392b78
+SIZE (9ef7faf376a1.patch) = 7479
+SHA256 (cfca377ca2ec.patch) = c45eaba3a38b2c5b706524729a78c8d6b94574add898ca581f9f62627d1ea292
+SIZE (cfca377ca2ec.patch) = 918
+SHA256 (581a2bb2f10c.patch) = 2f8bcb000f354c6d1a4976fca972a5ee3f32666cd5242eaf3de32f0c22261586
+SIZE (581a2bb2f10c.patch) = 3737
+SHA256 (d844f6798b2d.patch) = b86f5d87bf9408a5e57e29d26ca9dac9d421bf5b30928b79ff55e0c79d88d0dc
+SIZE (d844f6798b2d.patch) = 9865
+SHA256 (bca2e9be60c8.patch) = bc798c40b5c4483f9ab67efbf39813b5058c4562ef1b230c80f71d372dee36fc
+SIZE (bca2e9be60c8.patch) = 1267
+SHA256 (d6c890ed164a.patch) = df4162d768d44e461a43e28b2a02f454eb73a1345d3f72f298fcced50a1054ec
+SIZE (d6c890ed164a.patch) = 2129
+SHA256 (d8a877749e45.patch) = bb59c777b5ea08d2d4826d1bac16ac30706c60172a8d8c4223183cf665755dcb
+SIZE (d8a877749e45.patch) = 1525
+SHA256 (8fb196cba138.patch) = ceeff1d35d271eab75a1ef9a3d1b9812c2ae4d6f301017d15ea7f16142adeb23
+SIZE (8fb196cba138.patch) = 1586
+SHA256 (c06100fa3a45.patch) = f6420b9d09ed4c48de929bba5248287207a6d3b8fe5b824893d4e08b13a97d2a
+SIZE (c06100fa3a45.patch) = 2523