diff --git a/xap/awesome/xinitrc.awesome b/xap/awesome/xinitrc.awesome
old mode 100644
new mode 100755
index 64cea70e..93d73beb
--- a/xap/awesome/xinitrc.awesome
+++ b/xap/awesome/xinitrc.awesome
@@ -7,23 +7,16 @@ sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
 
-if [ -f $sysresources ]; then
-    /usr/bin/xrdb -merge $sysresources
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+    CK_LAUNCH_SESSION= ck-launch-session
+else
+    CK_LAUNCH_SESSION=
 fi
-
-if [ -f $sysmodmap ]; then
-    /usr/bin/xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    /usr/bin/xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    /usr/bin/xmodmap $usermodmap
-fi
-
 [ -x $HOME/.config/awesome/startup.sh ] \
-	&& $HOME/.config/awesome/startup.sh \
-	|| exec awesome
+	&& exec $CK_LAUNCH_SESSION $HOME/.config/awesome/startup.sh \
+	|| exec $CK_LAUNCH_SESSION awesome