diff --git a/reform2-imx8mq/mkuserland-new.sh b/reform2-imx8mq/mkuserland-new.sh
index 82badae7f5c4866ed117212fc16334ffb40e6889..22d1e6cbdf98dba47f43648f770e16937a25b716 100755
--- a/reform2-imx8mq/mkuserland-new.sh
+++ b/reform2-imx8mq/mkuserland-new.sh
@@ -73,7 +73,7 @@ apt install -y sway grim slurp xwayland xterm xfce4-terminal rofi arc-theme thun
 
 # install applications
 
-apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp
+apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp wmaker
 apt install -y chromium evolution freecad ardour sxiv neverball scummvm dosbox wf-recorder wev linphone-desktop
 
 # install patched software from mntre
diff --git a/reform2-imx8mq/template-skel/bin/reform-windowmaker b/reform2-imx8mq/template-skel/bin/reform-windowmaker
new file mode 100755
index 0000000000000000000000000000000000000000..3efd2e8b8de1d4ef007304665b0f8ec6b1673b01
--- /dev/null
+++ b/reform2-imx8mq/template-skel/bin/reform-windowmaker
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# This is a script to demonstrate cage + Xwayland as a replacement for standalone Xorg.
+# You can modify this to launch classic X window managers / DEs.
+#
+# Note that you should disable any x11 compositors. I.e. to launch xfce4:
+# xfwm4 --compositor=off &
+# exec xfce4-session
+#
+
+cage -- /usr/local/bin/Xwayland -retro &
+sleep 1
+
+export WAYLAND_DISPLAY=null # Hack, but works
+export DISPLAY=:0
+export GDK_BACKEND=x11
+unset SDL_VIDEODRIVER
+
+xterm &
+
+exec wmaker