diff --git a/mk_mmc.sh b/mk_mmc.sh
index 7f72889..ce62030 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1160,17 +1160,22 @@ script_readme
 
 	__EOF__
 
-cat > ${TEMPDIR}/minimal_xfce.sh <<basic_xfce
-#!/bin/sh
+	cat > ${TEMPDIR}/minimal_xfce.sh <<-__EOF__
+		#!/bin/sh
 
-sudo apt-get update
-if lsb_release -c | grep -E 'oneiric|precise' ; then
-sudo apt-get -y install xubuntu-desktop
-else
-sudo apt-get -y install xfce4 gdm xubuntu-gdm-theme xubuntu-artwork xserver-xorg-video-omap3 network-manager
-fi
+		sudo apt-get update
+		if lsb_release -c | grep -E 'oneiric|precise|quantal' ; then
+		       sudo apt-get -y install xubuntu-desktop
+		else
+		       sudo apt-get -y install xfce4 gdm xubuntu-gdm-theme xubuntu-artwork xserver-xorg-video-omap3 network-manager
+		fi
+
+		echo "Disabling eth0 in /etc/network/interfaces so xfce's network-manager works"
+		sudo sed -i 's/auto eth0/#auto eth0/g' /etc/network/interfaces
+		sudo sed -i 's/allow-hotplug eth0/#allow-hotplug eth0/g' /etc/network/interfaces
+		sudo sed -i 's/iface eth0 inet dhcp/#iface eth0 inet dhcp/g' /etc/network/interfaces
 
-basic_xfce
+	__EOF__
 
 	cat > ${TEMPDIR}/xorg.conf <<-__EOF__
 		Section "Device"
@@ -1272,8 +1277,8 @@ basic_xfce
 	cp -v ${TEMPDIR}/update_boot_files.sh ${TEMPDIR}/disk/tools/update_boot_files.sh
 	chmod +x ${TEMPDIR}/disk/tools/update_boot_files.sh
 
- cp -v ${TEMPDIR}/minimal_xfce.sh ${TEMPDIR}/disk/tools/minimal_xfce.sh
- chmod +x ${TEMPDIR}/disk/tools/minimal_xfce.sh
+	cp -v ${TEMPDIR}/minimal_xfce.sh ${TEMPDIR}/disk/tools/minimal_xfce.sh
+	chmod +x ${TEMPDIR}/disk/tools/minimal_xfce.sh
 
 	cp -v ${TEMPDIR}/xorg.conf ${TEMPDIR}/disk/tools/xorg.conf
 	cp -v ${TEMPDIR}/build_omapdrm_drivers.sh ${TEMPDIR}/disk/tools/build_omapdrm_drivers.sh