diff --git a/x/xinitrc b/x/xinitrc
index c9e7ceb..95347e8 100755
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -21,5 +21,17 @@ start_wm() {
     exec i3 -c "$HOME/.i3/config" >> "$LOGDIR/i3/i3.log"
 }
 
+autostart() {
+    if [[ -d "$HOME/.autostart" ]] ; then
+        log "Looking for autostart files."
+        for f in "$HOME/.autostart/"*.sh ; do
+            if [[ -x "$f" ]] ; then
+                log "Executing autostart file \"$f\""
+                . "$f"
+            fi
+        done
+    fi
+}
 
+autostart
 start_wm