diff --git a/config/Xsession.cpp b/config/Xsession.cpp
index 0bf8a7c..033b6a8 100644
--- a/config/Xsession.cpp
+++ b/config/Xsession.cpp
@@ -51,6 +51,7 @@ XCOMM The startup script is not intended to have arguments.
 
 startup=$HOME/.xsession
 resources=$HOME/.Xresources
+xinitrc=$HOME/.xinitrc
 
 if [ -s "$startup" ]; then
 	exec /bin/sh -ls -c "$startup"
@@ -76,5 +77,9 @@ else
                 exec `eval $XDESKTOP`
         }
 #endif
-	exec BINDIR/xsm
+	if [ -r "$xinitrc" ]; then
+		exec /bin/sh -ls -c "$xinitrc"
+	else
+		exec /bin/sh -l /etc/X11/xinit/xinitrc
+	fi
 fi