diff --git a/Xsession b/Xsession
index d2cb6e2..f773cdc 100644
--- a/Xsession
+++ b/Xsession
@@ -23,11 +23,6 @@ if [ -z "$GDMSESSION" ]; then
     fi
 fi
 
-#if ! printenv PATH | grep -q /usr/X11R6/bin
-#then
-#	PATH="${PATH}":/usr/X11R6/bin
-#fi
-
 SWITCHDESKPATH=/usr/share/switchdesk
 
 # Mandatorily source xinitrc-common, which is common code shared between the
@@ -62,11 +57,11 @@ case $# in
        exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
        ;;
     kde|kde1|kde2)
-       exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.kde"
+       exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH startkde"
        ;;
     twm)
         # fall back to twm
-       exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.twm"
+       exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH twm"
        ;;
     *)
        # GDM provies either a command line as the first argument or
diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index a2ba3f0..93f344f 100644
--- a/xorg-x11-xinit.spec
+++ b/xorg-x11-xinit.spec
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.2
-Release:   12%{?dist}
+Release:   13%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Mon Oct 23 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-13
+- Update Xsession to not use switchdesk for the hard coded kde and twm
+  cases.
+
 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-12
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21