diff --git a/x11-wm/dwl/Makefile b/x11-wm/dwl/Makefile
index 2a5464365c59..cbbfe7eb633c 100644
--- a/x11-wm/dwl/Makefile
+++ b/x11-wm/dwl/Makefile
@@ -1,72 +1,68 @@
 PORTNAME=	dwl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.1
-PORTREVISION=	1
+DISTVERSION=	0.4-rc1
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	cba259e9bf4a.patch:-p1 # https://github.com/djpohly/dwl/pull/212
+PATCHFILES+=	cb53dfd1fd6e.patch:-p1 # https://github.com/djpohly/dwl/pull/342
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	dwm for Wayland
 WWW=		https://github.com/djpohly/dwl
 
 LICENSE=	CC0-1.0 GPLv3+ MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_CC0-1.0=	${WRKSRC}/LICENSE.tinywl
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.dwm
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols \
-		wlroots>=0.15.0:x11-toolkits/wlroots
+		wlroots>=0.16.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 gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	djpohly
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz \
 		share/wayland-sessions/${PORTNAME}.desktop
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	ADDONS DOCS X11
 OPTIONS_DEFAULT=ADDONS X11
 
 ADDONS_DESC=		Install extra applications: ${ADDONS_RUN_DEPENDS:C/\:.*//}
-ADDONS_RUN_DEPENDS?=	alacritty:x11/alacritty \
+ADDONS_RUN_DEPENDS?=	foot:x11/foot \
 			bemenu-run:x11/bemenu
 
+X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 X11_USES=		xorg
 X11_USE=		XORG=xcb
-X11_CFLAGS=		-DXWAYLAND
+X11_MAKE_ARGS=		XWAYLAND="-DXWAYLAND" XLIBS="xcb xcb-icccm"
 
 pre-everything::
 	@${ECHO_MSG} "To build ${PORTNAME} with your own config.h set ${PORTNAME:tu}_CONF variable"
 	@${ECHO_MSG} "either in ${.CURDIR:T}/Makefile.local, make.conf(5), environ(7) or command line e.g.,"
 	@${ECHO_MSG} "\$$ make install clean ${PORTNAME:tu}_CONF=/path/to/${PORTNAME}/config.h"
 
 post-extract:
 # .if exists(...) before bsd.port.mk ignores *_CONF in make.conf(5) and Makefile.local
 	@if [ -e "${${PORTNAME:tu}_CONF}" ]; then \
 		${ECHO_MSG} "Creating symlink: config.h -> ${${PORTNAME:tu}_CONF}"; \
 		${LN} -fs "${${PORTNAME:tu}_CONF}" ${WRKSRC}/config.h; \
 	fi
 
-post-patch-X11-off:
-	@${REINPLACE_CMD} 's/ xcb//' ${WRKSRC}/Makefile
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/wayland-sessions
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \
 		${STAGEDIR}${DOCSDIR})
 
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/dwl/distinfo b/x11-wm/dwl/distinfo
index fd1463ee1367..c7e1e9bd98e4 100644
--- a/x11-wm/dwl/distinfo
+++ b/x11-wm/dwl/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1649644728
-SHA256 (djpohly-dwl-v0.3.1_GH0.tar.gz) = 5d550b0ee6d99d0b537269b8389af4b95d1ab0b63e7bb8c2309f6c57a2d6c9c9
-SIZE (djpohly-dwl-v0.3.1_GH0.tar.gz) = 51347
-SHA256 (cba259e9bf4a.patch) = bc2aed48b3652ae2a00ebc04a40654d1b22676c6bd6a001f23dd52801bac8696
-SIZE (cba259e9bf4a.patch) = 1348
+TIMESTAMP = 1669998789
+SHA256 (djpohly-dwl-v0.4-rc1_GH0.tar.gz) = eedfc6ce112d1c28d780ff1c96b593f4c37c29d95fb9a9e5a4538777a6ab4374
+SIZE (djpohly-dwl-v0.4-rc1_GH0.tar.gz) = 53966
+SHA256 (cb53dfd1fd6e.patch) = f772cd61ad5ff2d8b0d3bd59c7282cc075edf537d2a5f219002a6261effc5c10
+SIZE (cb53dfd1fd6e.patch) = 710