--- /etc/X11/xdm/Xsession	2009-03-11 19:17:16.000000000 +0100
+++ /etc/X11/xdm/Xsession	2009-03-11 20:50:22.000000000 +0100
@@ -36,13 +36,14 @@
 # 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"
 else
-	if [ -r "$resources" ]; then
-		/usr/bin/xrdb -load "$resources"
+	if [ -r "$xinitrc" ]; then
+		exec /bin/sh "$xinitrc"
+	else
+		exec /bin/sh /etc/X11/xinit/xinitrc
 	fi
-	exec /usr/bin/xsm
 fi