diff -Nru ltsp-5.3.6/debian/changelog ltsp-5.3.6/debian/changelog
--- ltsp-5.3.6/debian/changelog	2012-03-27 15:54:22.000000000 +0000
+++ ltsp-5.3.6/debian/changelog	2012-03-29 17:42:38.000000000 +0000
@@ -1,3 +1,12 @@
+ltsp (5.3.6-0ubuntu3) precise; urgency=low
+
+  * ltsp-live: Fix gettext domain of ltsp-live.desktop. (LP: #967436)
+  * ltsp-server: Remove old nbdrootd and nbdswapd inetd.conf entries (LP: #946537)
+  * ltsp-server: For Edubuntu, cleanup /etc/apt/sources.list and /etc/resolv.conf
+    in the chroot to remove entries added by the DC builder (LP: #967608)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 29 Mar 2012 13:42:37 -0400
+
 ltsp (5.3.6-0ubuntu2) precise; urgency=low
 
   * Make sure we exit plymouth before starting the screen sessions. (LP: #966267)
diff -Nru ltsp-5.3.6/debian/ltsp-server.postinst ltsp-5.3.6/debian/ltsp-server.postinst
--- ltsp-5.3.6/debian/ltsp-server.postinst	2012-03-27 15:49:01.000000000 +0000
+++ ltsp-5.3.6/debian/ltsp-server.postinst	2012-03-28 20:55:48.000000000 +0000
@@ -65,6 +65,12 @@
                 echo "192.168.0.1 ssh-ecdsa $ecdsa_key" >> /opt/ltsp/i386/etc/ssh/ssh_known_hosts
             fi
 
+            # Try to get something reasonable in /etc/resolv.conf
+            cat /etc/resolv.conf > /opt/ltsp/i386/etc/resolv.conf || true
+
+            # Replace any remaining reference to our chroot builder
+            sed -i "s/ftpmaster.internal/archive.ubuntu.com/g" /opt/ltsp/i386/etc/apt/sources.list
+
             # Rebuild the image
             ltsp-update-image -a i386
             ltsp-update-kernels
@@ -76,6 +82,12 @@
             echo "Moving your current /etc/nbd-server/config to /etc/nbd-server/config.ltsp-backup"
             echo "A new configuration file will be generated when you next run ltsp-update-image"
             mv /etc/nbd-server/config /etc/nbd-server/config.ltsp-backup
+
+            if [ -f /etc/inetd.conf ]; then
+                echo "Removing old /etc/inetd.conf entries"
+                sed -i '/nbdrootd/d' /etc/inetd.conf || true
+                sed -i '/nbdswapd/d' /etc/inetd.conf || true
+            fi
         fi
         if [ ! -f /etc/nbd-server/config ] && [ -f /usr/share/nbd-server/nbd-server.conf.tmpl ]; then
             cp /usr/share/nbd-server/nbd-server.conf.tmpl /etc/nbd-server/config
diff -Nru ltsp-5.3.6/debian/scripts/ltsp-live.desktop ltsp-5.3.6/debian/scripts/ltsp-live.desktop
--- ltsp-5.3.6/debian/scripts/ltsp-live.desktop	2012-03-27 15:49:01.000000000 +0000
+++ ltsp-5.3.6/debian/scripts/ltsp-live.desktop	2012-03-28 19:44:44.000000000 +0000
@@ -7,4 +7,4 @@
 Name=Start LTSP-Live
 Comment=Starts an LTSP server from the live CD
 Categories=GNOME;KDE;System;
-X-Ubuntu-Gettext-Domain=ltsp-livecd
+X-Ubuntu-Gettext-Domain=ltsp-live