diff --git a/pyneo-rootfs.sh b/pyneo-rootfs.sh
index ae541a0..541fd0a 100755
--- a/pyneo-rootfs.sh
+++ b/pyneo-rootfs.sh
@@ -31,7 +31,7 @@ for PROC in "hald" "dbus-daemon" "gsm0710muxd" "pyneod"; do
 done
 
 # cdebotstrap
-cdebootstrap --include ifupdown,udev,netbase,vim-tiny,module-init-tools,curl,wget,openssh-server,screen,less,rsyslog,psmisc,rsync,console-tools,iputils-ping,mtd-utils,wireless-tools,conspy,console-setup-mini,dhcdbd,dhcp3-client,dnsmasq,bluetooth,bluez,bluez-utils,bluez-alsa,bluez-gstreamer,netplug,nodm,rdate,klogd,vpnc,wpasupplicant --flavour=minimal $DIST $ROOTDIR http://ftp.debian.org/debian
+cdebootstrap --include ifupdown,udev,netbase,vim-tiny,module-init-tools,curl,wget,openssh-server,screen,less,rsyslog,psmisc,rsync,console-tools,iputils-ping,mtd-utils,wireless-tools,conspy,console-setup-mini,dhcdbd,dhcp3-client,dnsmasq,bluetooth,bluez,bluez-utils,bluez-alsa,bluez-gstreamer,netplug,rdate,klogd,vpnc,wpasupplicant --flavour=minimal $DIST $ROOTDIR http://ftp.debian.org/debian
 
 if [ -n "`cat $ROOTDIR/etc/apt/sources.list | grep invalid`" ]; then
 	echo "debootstrap failed"
@@ -94,6 +94,10 @@ sed -i "s/\([2-6]:23:respawn:\/sbin\/getty 38400 tty[2-6]\)/#\1/" $ROOTDIR/etc/i
 # enable fs fixes
 sed -i "s/\(FSCKFIX=\)no/\1yes/" $ROOTDIR/etc/default/rcS
 
+# add default user
+chroot $ROOTDIR useradd user -p //plGAV7Hp3Zo -s /bin/bash
+mkdir $ROOTDIR/home/user
+
 # add enlightenment repository
 if $EFL; then
 	echo deb http://packages.enlightenment.org/debian lenny main extras >> $ROOTDIR/etc/apt/sources.list
@@ -114,7 +118,7 @@ fi
 
 # install xorg
 if $XORG; then
-	chroot $ROOTDIR apt-get install xorg xserver-xorg-input-tslib xserver-xorg-video-glamo -qq
+	chroot $ROOTDIR apt-get install xorg xserver-xorg-input-tslib xserver-xorg-video-glamo nodm matchbox-window-manager -qq
 	# /etc/X11/xorg.conf
 	cat > $ROOTDIR/etc/X11/xorg.conf << __END__
 Section "Device"
@@ -122,6 +126,7 @@ Section "Device"
        Driver          "fbdev"
 EndSection
 __END__
+	echo 'exec matchbox-window-manager -use_titlebar no -use_cursor no' > $ROOTDIR/home/user/.xsession
 fi
 
 # install pyneo
@@ -262,10 +267,6 @@ __END__
 chmod +x $ROOTDIR/usr/sbin/firstboot.sh
 ln -sf /usr/sbin/firstboot.sh $ROOTDIR/etc/rcS.d/S99firstboot
 
-# add default user
-chroot $ROOTDIR useradd user -p //plGAV7Hp3Zo -s /bin/bash
-mkdir $ROOTDIR/home/user
-
 # cleanup
 rm -f $ROOTDIR/etc/ssh/ssh_host_*
 rm -f $ROOTDIR/var/lib/apt/lists/*