diff --git a/Xclients b/Xclients
index 2a8a377..fb4e15a 100755
--- a/Xclients
+++ b/Xclients
@@ -37,6 +37,12 @@ elif [ -n "$STARTKDE" ]; then
     exec "$STARTKDE"
 fi
 
+# We should also support /etc/X11/xinit/Xclients.d scripts
+XCLIENTS_D=/etc/X11/xinit/Xclients.d
+if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then
+    exec -l $SHELL -c "$SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
+fi
+
 # Failsafe.
 
 # these files are left sitting around by TheNextLevel.