diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile
index 0aa792491da4..be05f3785585 100644
--- a/x11-wm/wlmaker/Makefile
+++ b/x11-wm/wlmaker/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	wlmaker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1-439
-DISTVERSIONSUFFIX=	-ga4483c1
+DISTVERSION=	0.1-441
+DISTVERSIONSUFFIX=	-gf183a22
 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/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	foot:x11/foot
 
 USES=		cmake compiler:c11 gnome pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo
 GH_ACCOUNT=	phkaeser
-GH_TUPLE=	phkaeser:libbase:722571f:libbase/submodules/libbase
-CFLAGS+=	-ffile-prefix-map="${WRKSRC}"=
+GH_TUPLE=	phkaeser:libbase:66a3992:libbase/submodules/libbase
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/wlmclock \
 		share/icons/${PORTNAME}/chrome-48x48.png \
 		share/icons/${PORTNAME}/clip-48x48.png \
 		share/icons/${PORTNAME}/firefox-48x48.png \
 		share/icons/${PORTNAME}/terminal-48x48.png \
 		${NULL}
 
 post-patch:
 # Drop dependency on unreleased version of libwayland
 	@${REINPLACE_CMD} -e 's/1\.22\.90/1.22.0/' \
 		${WRKSRC}/CMakeLists.txt
+# Respect PREFIX for icons
+	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
+		${WRKSRC}/src/decorations.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/dock.c \
 		${WRKSRC}/src/${PORTNAME}.c
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo
index 68352ed9d313..6b00db70096e 100644
--- a/x11-wm/wlmaker/distinfo
+++ b/x11-wm/wlmaker/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1706324453
-SHA256 (phkaeser-wlmaker-v0.1-439-ga4483c1_GH0.tar.gz) = 57d1d36555feab21ec52e8547f6b7a89098d8fe12d4238c4a1d3cfad76646b7b
-SIZE (phkaeser-wlmaker-v0.1-439-ga4483c1_GH0.tar.gz) = 249851
-SHA256 (phkaeser-libbase-722571f_GH0.tar.gz) = a085299099b8e9addc7c8601fbe32a912922dde4c322c72abdeab9e32a4fe91a
-SIZE (phkaeser-libbase-722571f_GH0.tar.gz) = 94478
+TIMESTAMP = 1706391352
+SHA256 (phkaeser-wlmaker-v0.1-441-gf183a22_GH0.tar.gz) = b01c66a4cf95d753fd7ce9505da14cbf97d86f5e86717eeea58405be7eac5180
+SIZE (phkaeser-wlmaker-v0.1-441-gf183a22_GH0.tar.gz) = 249788
+SHA256 (phkaeser-libbase-66a3992_GH0.tar.gz) = afbcc20e370221a8821a043d572e7d00bd57fd33bca24879a54127ffae2ebaad
+SIZE (phkaeser-libbase-66a3992_GH0.tar.gz) = 94622
diff --git a/x11-wm/wlmaker/files/patch-CMakeLists.txt b/x11-wm/wlmaker/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..fab638a2fd27
--- /dev/null
+++ b/x11-wm/wlmaker/files/patch-CMakeLists.txt
@@ -0,0 +1,18 @@
+https://github.com/phkaeser/wlmaker/issues/28
+
+--- CMakeLists.txt.orig	2024-01-27 20:11:04 UTC
++++ CMakeLists.txt
+@@ -50,8 +50,12 @@ OPTION(config_DOXYGEN_CRITICAL "Whether to fail on dox
+ OPTION(config_DOXYGEN_CRITICAL "Whether to fail on doxygen warnings" OFF)
+ 
+ # Toplevel compile options, for GCC.
+-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
++IF(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
+   ADD_COMPILE_OPTIONS(-Wall -Wextra -Werror)
++
++  IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
++    ADD_COMPILE_OPTIONS(-Wno-self-assign)
++  ENDIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ 
+   IF(config_DEBUG)
+     ADD_COMPILE_OPTIONS(-ggdb -DDEBUG)