diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 34ba6b9..95d52ed 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -65,13 +65,15 @@ vu.lux.olpc.Maze
 vu.lux.olpc.Speak
 EOF
 
-# set up auto-login
-cat > /etc/gdm/custom.conf << EOF
-[daemon]
-AutomaticLoginEnable=True
-AutomaticLogin=liveuser
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/sugar
+DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+
 # Don't use the default system user (in SoaS liveuser) as nick name
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
 
diff --git a/fedora-soas-packages.ks b/fedora-soas-packages.ks
index 27c2cfd..8ae69b6 100644
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -29,9 +29,12 @@
 -libfprint
 -realmd
 -eekboard-libs
+-open-vm-tools*
 
 # == Core Sugar Platform ==
 @sugar-desktop
+-sugar-ruler
+sugar-cp-updater
 
 # Write breaks unless we do this (we don't need it anyway)
 # enable for testing in the F17 dev cycle