diff --git a/.xsessionrc b/.xsessionrc
--- a/.xsessionrc
+++ b/.xsessionrc
@@ -20,7 +20,8 @@ fi
 
 urxvtd -q -o -f
 
-make -s -C ~/.i3
+make -s -C ~/.i3 || \
+  { cat .i3/config.d/* > .i3/config && cat .i3/status.d/* > .i3/status }
 
 if [ -r ~/.xsessionrc.local ]; then
   . ~/.xsessionrc.local