diff --git a/stage-dsf-gui/01-desktop/00-run.sh b/stage-dsf-gui/01-desktop/00-run.sh
index 46f67f5d3d..79c211af95 100755
--- a/stage-dsf-gui/01-desktop/00-run.sh
+++ b/stage-dsf-gui/01-desktop/00-run.sh
@@ -5,7 +5,9 @@ install -m 644 files/dwc.png "${ROOTFS_DIR}/usr/share/icons/dwc.png"
 
 install -m 755 -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/$FIRST_USER_NAME/Desktop"
 install -dm 755 -o 1000 -g 1000 "${ROOTFS_DIR}/home/$FIRST_USER_NAME/.config"
-install -m 755 -o 1000 -g 1000 files/wayfire.ini "${ROOTFS_DIR}/home/$FIRST_USER_NAME/.config/wayfire.ini"
+install -dm 755 -o 1000 -g 1000 "${ROOTFS_DIR}/home/$FIRST_USER_NAME/.config/labwc"
+install -m 755 -o 1000 -g 1000 files/autostart "${ROOTFS_DIR}/home/$FIRST_USER_NAME/.config/labwc/autostart"
+install -m 644 -o 1000 -g 1000 files/wayfire.ini "${ROOTFS_DIR}/home/$FIRST_USER_NAME/.config/wayfire.ini"
 install -m 755 -o 1000 -g 1000 files/launch-dwc.desktop "${ROOTFS_DIR}/home/$FIRST_USER_NAME/Desktop/launch-dwc.desktop"
 install -m 755 -o 1000 -g 1000 files/view-dcs-log.desktop "${ROOTFS_DIR}/home/$FIRST_USER_NAME/Desktop/view-dcs-log.desktop"
 
diff --git a/stage-dsf-gui/01-desktop/files/autostart b/stage-dsf-gui/01-desktop/files/autostart
new file mode 100644
index 0000000000..3d88ff4e06
--- /dev/null
+++ b/stage-dsf-gui/01-desktop/files/autostart
@@ -0,0 +1,2 @@
+# Start DWC on boot
+launch-dwc &