diff -Nru edubuntu-live-12.01.1/casper/casper-bottom/49edubuntu edubuntu-live-12.03.1/casper/casper-bottom/49edubuntu
--- edubuntu-live-12.01.1/casper/casper-bottom/49edubuntu	2012-01-23 19:27:23.000000000 +0000
+++ edubuntu-live-12.03.1/casper/casper-bottom/49edubuntu	2012-03-12 23:09:05.000000000 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 PREREQ=""
-DESCRIPTION="Disabling sabayon, italc and nanny... Adding LTSP-Live launcher"
+DESCRIPTION="Adding LTSP-Live launcher"
 
 prereqs()
 {
@@ -21,22 +21,6 @@
 
 log_begin_msg "$DESCRIPTION"
 
-# Disable nanny
-if [ -x /root/etc/init.d/nanny ]; then
-    chroot /root update-rc.d -f nanny remove
-    rm /root/etc/xdg/autostart/nanny-systray.desktop
-fi
-
-# Disable iTalc
-if [ -f /root/etc/xdg/autostart/ica.desktop ]; then
-    rm /root/etc/xdg/autostart/ica.desktop
-fi
-
-# Disable sabayon
-if [ -f /root/etc/X11/Xsession.d/60sabayon_apply ]; then
-    rm /root/etc/X11/Xsession.d/60sabayon_apply
-fi
-
 # Adding LTSP-Live launcher to unity
 if [ -f /root/usr/share/glib-2.0/schemas/com.canonical.Unity.gschema.xml ]; then
     sed -i "s/'ubiquity-gtkui.desktop',/'ubiquity-gtkui.desktop', 'ltsp-live.desktop',/g" /root/usr/share/glib-2.0/schemas/com.canonical.Unity.gschema.xml
diff -Nru edubuntu-live-12.01.1/debian/changelog edubuntu-live-12.03.1/debian/changelog
--- edubuntu-live-12.01.1/debian/changelog	2012-01-23 20:57:25.000000000 +0000
+++ edubuntu-live-12.03.1/debian/changelog	2012-03-12 23:09:53.000000000 +0000
@@ -1,3 +1,11 @@
+edubuntu-live (12.03.1) precise; urgency=low
+
+  * Update installer hook for epoptes.
+  * Remove current casper code for italc, sabayon and nanny as we don't
+    ship these anymore.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 12 Mar 2012 19:09:20 -0400
+
 edubuntu-live (12.01.1) precise; urgency=low
 
   * Rework the installer text a little to make it clearer what LTSP
diff -Nru edubuntu-live-12.01.1/debian/install edubuntu-live-12.03.1/debian/install
--- edubuntu-live-12.01.1/debian/install	2012-01-23 19:27:23.000000000 +0000
+++ edubuntu-live-12.03.1/debian/install	2012-03-12 23:06:48.000000000 +0000
@@ -2,5 +2,5 @@
 livecd/ubiquity/plugins/ usr/lib/ubiquity/
 livecd/ubiquity/target-config/60edubuntu-ltsp usr/lib/ubiquity/target-config/
 livecd/ubiquity/target-config/60edubuntu-default-session usr/lib/ubiquity/target-config/
-livecd/ubiquity/target-config/60edubuntu-italc usr/lib/ubiquity/target-config/
+livecd/ubiquity/target-config/60edubuntu-epoptes usr/lib/ubiquity/target-config/
 casper/casper-bottom/49edubuntu usr/share/initramfs-tools/scripts/casper-bottom/
diff -Nru edubuntu-live-12.01.1/debian/postinst edubuntu-live-12.03.1/debian/postinst
--- edubuntu-live-12.01.1/debian/postinst	2012-01-23 19:27:23.000000000 +0000
+++ edubuntu-live-12.03.1/debian/postinst	2012-03-12 23:07:15.000000000 +0000
@@ -3,9 +3,6 @@
 
 . /usr/share/debconf/confmodule
 
-# Hide iTalc from menus on live cd
-echo "Hidden=true" >> /usr/share/applications/italc.desktop
-
 # Rebuild initramfs
 update-initramfs -u
 
diff -Nru edubuntu-live-12.01.1/debian/postrm edubuntu-live-12.03.1/debian/postrm
--- edubuntu-live-12.01.1/debian/postrm	2012-01-23 19:27:23.000000000 +0000
+++ edubuntu-live-12.03.1/debian/postrm	2012-03-12 23:07:38.000000000 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
 set -e
 
-# Unhide iTalc from menus on live cd
-sed -i "s/Hidden=true//g" /usr/share/applications/italc.desktop
+. /usr/share/debconf/confmodule
+
+# Rebuild initramfs
+update-initramfs -u
 
 #DEBHELPER#
 
diff -Nru edubuntu-live-12.01.1/livecd/ubiquity/target-config/60edubuntu-epoptes edubuntu-live-12.03.1/livecd/ubiquity/target-config/60edubuntu-epoptes
--- edubuntu-live-12.01.1/livecd/ubiquity/target-config/60edubuntu-epoptes	1970-01-01 00:00:00.000000000 +0000
+++ edubuntu-live-12.03.1/livecd/ubiquity/target-config/60edubuntu-epoptes	2012-03-12 23:06:28.000000000 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -f /target/var/lib/dpkg/info/epoptes.postinst ]; then
+    # Generate new keys
+    rm -Rf /target/etc/epoptes/
+    chroot /target /var/lib/dpkg/info/epoptes.postinst configure
+
+    # Add user to epoptes group
+    username=$(chroot /target getent passwd 1000 | cut -d: -f1)
+    if [ -n "$username" ]; then
+        chroot /target/ adduser $username epoptes
+    fi
+fi
diff -Nru edubuntu-live-12.01.1/livecd/ubiquity/target-config/60edubuntu-italc edubuntu-live-12.03.1/livecd/ubiquity/target-config/60edubuntu-italc
--- edubuntu-live-12.01.1/livecd/ubiquity/target-config/60edubuntu-italc	2012-01-23 19:27:23.000000000 +0000
+++ edubuntu-live-12.03.1/livecd/ubiquity/target-config/60edubuntu-italc	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -f /target/var/lib/dpkg/info/italc-client.postinst ]; then
-    rm -Rf /target/etc/italc/
-    chroot /target /var/lib/dpkg/info/italc-client.postinst
-fi