diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile
index 921a6beae122..fd8a8f6752f1 100644
--- a/x11-wm/wlmaker/Makefile
+++ b/x11-wm/wlmaker/Makefile
@@ -1,55 +1,59 @@
 PORTNAME=	wlmaker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3
-PORTREVISION=	2
+DISTVERSION=	0.4
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland compositor inspired by Window Maker
 WWW=		https://github.com/phkaeser/wlmaker
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.31:graphics/wayland-protocols
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots017 \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	foot:x11/foot
 
 USES=		bison cmake compiler:c11 gnome pkgconfig xorg
 USE_GITHUB=	yes
 USE_GNOME=	cairo
 USE_XORG=	xcb
 GH_ACCOUNT=	phkaeser
-GH_TUPLE=	phkaeser:libbase:df7ce2a:libbase/submodules/libbase
+GH_TUPLE=	phkaeser:libbase:69a87c3:libbase/submodules/libbase
 CMAKE_OFF=	${WITH_DEBUG:D:Uconfig_DEBUG}
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/wlmclock \
+		@comment\ bin/example_toplevel \
 		share/icons/${PORTNAME}/chrome-48x48.png \
 		share/icons/${PORTNAME}/clip-48x48.png \
 		share/icons/${PORTNAME}/firefox-48x48.png \
 		share/icons/${PORTNAME}/terminal-48x48.png \
+		share/icons/${PORTNAME}/wlmclock-64x64.png \
+		share/applications/wlmclock.desktop \
 		share/wayland-sessions/${PORTNAME}.desktop \
 		${NULL}
 
 post-patch:
+# Temporarily force wlroots 0.17
+	@${REINPLACE_CMD} '/PKG.*wlroots-0.18/d' ${WRKSRC}/CMakeLists.txt
 # Respect -O level from global CFLAGS or CMAKE_BUILD_TYPE
 	@${REINPLACE_CMD} '/-O[0-9]/d' \
 		${WRKSRC}/submodules/libbase/CMakeLists.txt \
 		${WRKSRC}/CMakeLists.txt
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/clip.c \
 		${WRKSRC}/src/launcher.c
 # Respect LOCALBASE for apps and use open source Chrome
 	@${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,' \
 		 -e 's/google-chrome/chrome/' \
 		${WRKSRC}/src/action.c \
 		${WRKSRC}/etc/*.plist
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276743
 	@${GREP} -Flr _POSIX_C_SOURCE ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		'/_POSIX_C_SOURCE/d'
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo
index 9736af504226..3650e8ce0978 100644
--- a/x11-wm/wlmaker/distinfo
+++ b/x11-wm/wlmaker/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1720077606
-SHA256 (phkaeser-wlmaker-v0.3_GH0.tar.gz) = bae426bcc8d9c77bfe0c7e452d0f6ee9b73aeb30b6b276c46212ebf6ede954e6
-SIZE (phkaeser-wlmaker-v0.3_GH0.tar.gz) = 280776
-SHA256 (phkaeser-libbase-df7ce2a_GH0.tar.gz) = 2aefe449869cf9824e6150ba924d81bd9cc8a369232ad89060c2607fbbb9ba19
-SIZE (phkaeser-libbase-df7ce2a_GH0.tar.gz) = 99929
+TIMESTAMP = 1729422998
+SHA256 (phkaeser-wlmaker-v0.4_GH0.tar.gz) = 814bb1caf536e6a443cef79bbb0c9722a3866fee5d5c89ccf76504abff9051d2
+SIZE (phkaeser-wlmaker-v0.4_GH0.tar.gz) = 356667
+SHA256 (phkaeser-libbase-69a87c3_GH0.tar.gz) = d34c704c787e50506e282880fbf0027edc7f76eb7f3c2eacef7563b2fca4e5ef
+SIZE (phkaeser-libbase-69a87c3_GH0.tar.gz) = 100236
diff --git a/x11-wm/wlmaker/files/patch-session b/x11-wm/wlmaker/files/patch-session
index 5c130bcd9763..5434bb648974 100644
--- a/x11-wm/wlmaker/files/patch-session
+++ b/x11-wm/wlmaker/files/patch-session
@@ -1,32 +1,41 @@
 Avoid Debian specifics when starting from a GUI login manager
 
---- share/CMakeLists.txt.orig	2024-07-04 07:20:06 UTC
+--- share/CMakeLists.txt.orig	2024-08-30 23:53:51 UTC
 +++ share/CMakeLists.txt
-@@ -18,17 +18,10 @@ CONFIGURE_FILE(
+@@ -18,20 +18,13 @@ CONFIGURE_FILE(
    ${CMAKE_CURRENT_SOURCE_DIR}/wrap-wlmaker.sh.in
    ${CMAKE_CURRENT_BINARY_DIR}/wrap-wlmaker.sh
    @ONLY)
 -INSTALL(
 -  FILES ${CMAKE_CURRENT_BINARY_DIR}/wrap-wlmaker.sh
 -  TYPE BIN
 -  PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
 -              GROUP_READ GROUP_EXECUTE
 -              WORLD_READ WORLD_EXECUTE)
 -
  CONFIGURE_FILE(
    ${CMAKE_CURRENT_SOURCE_DIR}/wlmaker.desktop.in
    ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.desktop
    @ONLY)
  INSTALL(
    FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.desktop
 -  TYPE DATA)
 +  DESTINATION "share/wayland-sessions")
+ 
+ CONFIGURE_FILE(
+   ${CMAKE_CURRENT_SOURCE_DIR}/wlmclock.desktop.in
+@@ -39,4 +32,4 @@ INSTALL(
+   @ONLY)
+ INSTALL(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmclock.desktop
+-  TYPE DATA)
++  DESTINATION "share/applications")
 --- share/wlmaker.desktop.in.orig	2024-07-04 07:20:06 UTC
 +++ share/wlmaker.desktop.in
 @@ -1,5 +1,5 @@ Comment=A Wayland compositor inspired by Window Maker
  [Desktop Entry]
  Name=WaylandMaker
  Comment=A Wayland compositor inspired by Window Maker
 -Exec=@CMAKE_INSTALL_PREFIX@/bin/wrap-wlmaker.sh
 +Exec=wlmaker
  Type=Application