diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile
index 662ba6bcd65d..092ac3e127b8 100644
--- a/x11-wm/wlmaker/Makefile
+++ b/x11-wm/wlmaker/Makefile
@@ -1,62 +1,49 @@
 PORTNAME=	wlmaker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.2
+DISTVERSION=	0.7
 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.32:graphics/wayland-protocols
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libwayland-server.so:graphics/wayland \
-		libwlroots-0.18.so:x11-toolkits/wlroots018 \
+		libwlroots-0.19.so:x11-toolkits/wlroots019 \
+		libxdg-basedir.so:x11/libxdg-basedir \
 		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:1cacb0f:libbase/submodules/libbase
+GH_TUPLE=	phkaeser:libbase:aa0da7a:libbase/submodules/libbase
 CMAKE_OFF=	${WITH_DEBUG:D:Uconfig_DEBUG}
-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 \
-		share/icons/${PORTNAME}/wlmclock-64x64.png \
-		share/applications/wlmclock.desktop \
-		share/wayland-sessions/${PORTNAME}.desktop \
-		${DATADIR}/root-menu.plist \
-		${DATADIR}/style.plist \
-		${DATADIR}/wlmaker-state.plist \
-		${DATADIR}/wlmaker.plist \
-		${NULL}
 
 post-patch:
 # 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 and system-wide config
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/clip.c \
 		${WRKSRC}/src/config.c \
 		${WRKSRC}/src/launcher.c \
 		${WRKSRC}/src/${PORTNAME}.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 d81d4542d78a..a7081eebd653 100644
--- a/x11-wm/wlmaker/distinfo
+++ b/x11-wm/wlmaker/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1763900735
-SHA256 (phkaeser-wlmaker-v0.6.2_GH0.tar.gz) = bc0e5ab6d63cfcad331ab7197177215befd5cab47518dd43001dee1e389d1915
-SIZE (phkaeser-wlmaker-v0.6.2_GH0.tar.gz) = 423436
-SHA256 (phkaeser-libbase-1cacb0f_GH0.tar.gz) = ab53054e359dedeae856d45c78e2f3da4d91d8e4cbb61d1864b78cf1e48cb00f
-SIZE (phkaeser-libbase-1cacb0f_GH0.tar.gz) = 133786
+TIMESTAMP = 1766671739
+SHA256 (phkaeser-wlmaker-v0.7_GH0.tar.gz) = 212d4c99227021ce429ab1685440017625415a5f514f906386d0ef16803dc0a7
+SIZE (phkaeser-wlmaker-v0.7_GH0.tar.gz) = 469502
+SHA256 (phkaeser-libbase-aa0da7a_GH0.tar.gz) = 9c22e94db1860926d19a22aa57e8d699999f52daed3919f1295461196f7b1c15
+SIZE (phkaeser-libbase-aa0da7a_GH0.tar.gz) = 134327
diff --git a/x11-wm/wlmaker/files/patch-session b/x11-wm/wlmaker/files/patch-session
index bd47593ae79a..abe89289a875 100644
--- a/x11-wm/wlmaker/files/patch-session
+++ b/x11-wm/wlmaker/files/patch-session
@@ -1,28 +1,11 @@
 Avoid Debian specifics when starting from a GUI login manager
 
---- share/CMakeLists.txt.orig	2025-03-07 20:59:09 UTC
-+++ share/CMakeLists.txt
-@@ -20,7 +20,7 @@ INSTALL(
-   @ONLY)
- INSTALL(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.desktop
--  TYPE DATA)
-+  DESTINATION "share/wayland-sessions")
- 
- CONFIGURE_FILE(
-   ${CMAKE_CURRENT_SOURCE_DIR}/wlmclock.desktop.in
-@@ -28,4 +28,4 @@ INSTALL(
-   @ONLY)
- INSTALL(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmclock.desktop
--  TYPE DATA)
-+  DESTINATION "share/applications")
 --- share/wlmaker.desktop.in.orig	2025-03-07 20:59:09 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/wlmaker.sh
 +Exec=wlmaker
  Type=Application
diff --git a/x11-wm/wlmaker/pkg-plist b/x11-wm/wlmaker/pkg-plist
new file mode 100644
index 000000000000..a4e6b9c77af6
--- /dev/null
+++ b/x11-wm/wlmaker/pkg-plist
@@ -0,0 +1,22 @@
+bin/wlmaker
+bin/wlmclock
+bin/wlmeyes
+etc/xdg/wlmaker/Config.plist
+etc/xdg/wlmaker/RootMenu.plist
+etc/xdg/wlmaker/RootMenuDebian.plist
+etc/xdg/wlmaker/State.plist
+etc/xdg/wlmaker/Themes/Debian.plist
+etc/xdg/wlmaker/Themes/Default.plist
+share/applications/wlmaker.desktop
+share/applications/wlmaker.wlmclock.desktop
+share/applications/wlmaker.wlmeyes.desktop
+share/icons/hicolor/48x48/apps/wlmaker.png
+share/icons/hicolor/64x64/apps/wlmaker.png
+share/icons/hicolor/64x64/apps/wlmclock.png
+share/icons/hicolor/64x64/apps/wlmeyes.png
+share/icons/hicolor/scalable/apps/wlmaker.svg
+share/wayland-sessions/wlmaker.desktop
+%%DATADIR%%/icons/chrome-48x48.png
+%%DATADIR%%/icons/clip-48x48.png
+%%DATADIR%%/icons/firefox-48x48.png
+%%DATADIR%%/icons/terminal-48x48.png