diff --git a/build.sh b/build.sh
index 672815d..e40c5f4 100755
--- a/build.sh
+++ b/build.sh
@@ -7,3 +7,5 @@ rm dwm-flexipatch/config.mk dwm-flexipatch/patches.h
 # 	patch -d dwm-final <"$patch"
 # done
 cp config.h dwm-final/
+cd dwm-final
+make
diff --git a/config.h b/config.h
index 0417bb4..aa6f37e 100644
--- a/config.h
+++ b/config.h
@@ -136,7 +136,8 @@ static const char *layoutmenu_cmd = "xmenulayout";
 // static const char *layoutdmenu = "$HOME/.local/libexec/dwm/dmenulayout"; // TODO: Patch layoutmenu to accept shell commands
 
 static const char *const autostart[] = {
-    "sh", "-c", "killall -gw autorun; exec $HOME/.local/libexec/dwm/autorun", NULL,
+    "/bin/sh", "-c", "run-parts \"${XDG_CONFIG_HOME}/dwm/autorun.d\"", NULL,
+    "/bin/sh", "-c", "runsvdir \"${SVDIR}\"", NULL,
     NULL
 };