diff --git a/fedora-livecd-education.ks b/fedora-livecd-education.ks
new file mode 100644
index 0000000..3100a1d
--- /dev/null
+++ b/fedora-livecd-education.ks
@@ -0,0 +1,108 @@
+# fedora-livecd-education.ks
+#
+# Description:
+# - Fedora Live Spin with the purpose to create a ready-to-go 
+#   development environment for contributing to educational
+#   projects inside, but also outside of the Fedora ecosystem.
+#
+# Maintainers:
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Fedora Education SIG
+
+%include fedora-live-base.ks
+
+# please don't forget to adjust the instLangs argument
+# if you are going to create a localized spin
+%packages --excludedocs --instLangs en_US
+
+# desktop environments
+@sugar-desktop
+@xfce-desktop
+
+# education
+avogadro
+kdeedu
+
+# internet
+alpine
+empathy
+firefox
+
+# office
+abiword
+gnumeric
+evince
+
+# graphics
+blender
+inkscape
+gimp
+mirage
+
+# audio & video
+totem
+totem-gstreamer
+totem-mozplugin
+-totem-xine
+-xine-lib
+
+# others
+geany
+gnash-plugin
+
+# system
+alsa-plugins-pulseaudio
+desktop-backgrounds-compat
+gnome-power-manager
+liveusb-creator
+NetworkManager-gnome
+pavucontrol
+setroubleshoot
+xdg-user-dirs
+
+# remove imsettings-xfce for now until it gets re-written
+-imsettings-xfce
+
+# dictionaries are big
+-aspell-*
+-hunspell-*
+-man-pages-*
+-words
+
+# exclude input methods
+-scim*
+-m17n*
+
+# save some space
+-autofs
+-nss_db
+-sendmail
+ssmtp
+-acpid
+-isdn4k-utils
+-gimp-help
+-gimp-help-browser
+
+%post
+
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+EOF
+
+cat >> /etc/rc.d/init.d/livesys << EOF
+chown -R liveuser:liveuser /home/liveuser
+
+# 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=liveuser
+TimedLoginDelay=60
+FOE
+
+EOF
+
+%end
diff --git a/fedora-livedvd-education.ks b/fedora-livedvd-education.ks
deleted file mode 100644
index d14603e..0000000
--- a/fedora-livedvd-education.ks
+++ /dev/null
@@ -1,159 +0,0 @@
-# fedora-livedvd-education.ks
-#
-# Description:
-# - Fedora Live Spin with the purpose to create a ready-to-go 
-#   development environment for contributing to educational
-#   projects inside, but also outside of the Fedora ecosystem.
-#
-# Maintainers:
-# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
-# - Fedora Education SIG
-
-%include fedora-live-base.ks
-
-# we need more space now
-part / --size=8192
-
-%packages
-
-# desktop environments
-@gnome-desktop
-@sugar-desktop
-sugar-emulator
-
-# education
-gnuplot
-kdeedu
-moodle
-octave
-
-# internet
-# education-bookmarks
-firefox
-java-1.6.0-openjdk-plugin
-xchat-gnome
-
-# office
-evince
-openoffice.org-calc
-openoffice.org-impress
-openoffice.org-math
-openoffice.org-writer
-
-# graphics
-gimp
-inkscape
-
-# audio & video
-totem
-totem-mozplugin
-
-# stuff to make sugar-jhbuild work out of the box
-avahi-gobject-devel
-avahi-tools
-enchant-devel
-fribidi-devel
-icon-naming-utils
-icon-slicer
-libcroco-devel
-libffi-devel
-libgsf-devel
-librsvg2-devel
-loudmouth-devel
-olpcsound-devel
-poppler-glib-devel
-python-distutils-extra
-redhat-lsb
-wv-devel
-xulrunner-devel-unstable
-xulrunner-python-devel
-
-# development
-@development-libs
-@development-tools
-@fedora-packager
-@gnome-software-development
-giggle
-numpy
-pygame
-
-# eclipse environment
-@eclipse
-eclipse-eclox
-# eclipse-texlipse
-
-# virtualization
-@virtualization
-
-# additional removals from gnome
--evolution
--gok
--gthumb
--nautilus-sendto
--orca
--tomboy
-
-# remove some sugar packages
--sugar-finance
--sugar-help
--sugar-xoirc
--sugar-xomail
-
-# dictionaries are big
--aspell-*
--hunspell-*
--man-pages-*
--words
-
-# exclude input methods
--scim*
--m17n*
-
-# save some space
--gnome-user-docs
--nss_db
--vino
--isdn4k-utils
--dasher
--tomboy
-# not needed for gnome
--acpid
-
-%end
-
-%post
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# enable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout true >/dev/null
-
-# 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=liveuser
-TimedLoginDelay=60
-FOE
-
-# create file for xchat default servers
-mkdir -p /home/liveuser/.xchat-gnome
-
-cat >> /home/liveuser/.xchat-gnome/servlist_.conf << FOE
-v=0.26.0
-
-N=FreeNode
-J=#fedora-edu,#sugar,#teachingopensource
-F=3
-D=0
-S=irc.freenode.net
-FOE
-
-chown liveuser:liveuser /home/liveuser/.xchat-gnome/servlist_.conf
-
-EOF
-
-%end