diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 7e7e0e5..0729007 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -4,27 +4,41 @@
 # - Fedora Live Spin with the light-weight XFCE Desktop Environment
 #
 # Maintainer(s):
-# - Rahul Sundaram <sundaram a fedoraproject.org>
+# - Rahul Sundaram    <sundaram@fedoraproject.org>
+# - Christoph Wickert <chris@christoph-wickert.de>
+# - Kevin Fenzi       <kevin@tummy.com>
 
 %include fedora-live-base.ks
 
 %packages
+
+# gdm depends on gnome-session but lacks a dependency. Temporary workaround
+
+gnome-session
+
 firefox
 NetworkManager-vpnc
 NetworkManager-openvpn
 NetworkManager-gnome
+NetworkManager-pptp
+
+#nss-mdns
 
 # we don't include @office so that we don't get OOo.  but some nice bits
 
 abiword
 gnumeric
+
 evince
 -evince-dvi
+-evince-djvu
+
 gimp
 inkscape
+
 galculator
 desktop-backgrounds-compat
-xscreensaver-base
+gnome-screensaver
 setroubleshoot
 
 # development
@@ -34,7 +48,6 @@ geany
 xdg-user-dirs
 @java
 totem
--totem-xine
 totem-mozplugin
 pidgin
 claws-mail
@@ -44,7 +57,8 @@ drivel
 liferea
 quodlibet
 gftp
-mirage
+ristretto
+asunder
 tracker-search-tool
 
 gnome-power-manager
@@ -97,45 +111,23 @@ xfce4-websearch-plugin
 xfwm4-themes
 
 # dictionaries are big
--aspell-*
--man-pages-*
--scim-tables-*
+#-aspell-*
+#-man-pages-*
+#-scim-tables-*
 
-fonts-ISO8859-2 
-cjkunifonts-ukai 
-madan-fonts 
-fonts-KOI8-R 
-fonts-KOI8-R-100dpi 
-tibetan-machine-uni-fonts
-
-
-#-wqy-bitmap-fonts
-#-dejavu-fonts-experimental
-#-dejavu-fonts
-
-# drop more fonts
-#-lohit-fonts-*
-#-thaifonts-scalable
-#-paktype-fonts
-#-VLGothic-fonts
-#-baekmuk-ttf-fonts-*
-#-kacst-fonts
-#-lklug-fonts
-#-jomolhari-fonts
-#-abyssinica-fonts
-#-cjkunifonts-uming
-#
 # more fun with space saving
--scim-lang-chinese
-scim-chewing
-scim-pinyin
+#-scim-lang-chinese
+#scim-chewing
+#scim-pinyin
 -gimp-help
 
+
 # save some space
 -autofs
 -nss_db
 -sendmail
-
+ssmtp
+-acpid
 # system-config-printer does printer management better
 # xfprint has now been made as optional in comps.
 system-config-printer
@@ -168,20 +160,25 @@ EOF
 cat >> /etc/rc.d/init.d/fedora-live << EOF
 chown -R fedora:fedora /home/fedora
 
-# set up timed auto-login for after 10 seconds
-cat >> /etc/gdm/custom.conf << _EOF_
+# disable screensaver locking
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
+# set up timed auto-login for after 60 seconds
+cat >> /etc/gdm/custom.conf << FOE
 [daemon]
 TimedLoginEnable=true
 TimedLogin=fedora
-TimedLoginDelay=10
-_EOF_
+TimedLoginDelay=60
+FOE
 
-if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
-    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
-    chown fedora:fedora /home/fedora/.face
-    # TODO: would be nice to get e-d-s to pick this one up too... but how?
-fi
 EOF
 
+
+%post
+
+# remove this session file from gnome-session package to make xfce the default
+# temporary hack till this file is split up from the package
+
+rm -rf /usr/share/xsessions/gnome.session
+
 %end
 
diff --git a/fedora-livedvd-developer.ks b/fedora-livedvd-developer.ks
index 60ff68a..deff919 100644
--- a/fedora-livedvd-developer.ks
+++ b/fedora-livedvd-developer.ks
@@ -2,7 +2,7 @@
 
 part / --size 6000
 
-%packages --ignoremissing
+%packages
 # Libraries
 @development-libs
 @gnome-software-development