diff --git a/mk_mmc.sh b/mk_mmc.sh
index da419c9..65fbc61 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -112,10 +112,11 @@ fi
  sudo rm -rfd ${DIR}/initrd-tree/lib/modules/*-versatile/
  sudo rm -rfd ${DIR}/initrd-tree/lib/firmware/*-versatile/
 
+ sudo patch -p1 -s < ${DIR}/scripts/${DIST}-tweaks.diff
+
  if test "-$DIST-" = "-lucid-"
  then
    sudo cp -v ${DIR}/scripts/flash-kernel.conf ${DIR}/initrd-tree/etc/flash-kernel.conf
-   sudo patch -p1 -s < ${DIR}/scripts/lucid-tweaks.diff
    sudo dpkg -x ${DIR}/dl/mtd-utils_20090606-1_armel.deb ${DIR}/initrd-tree
  fi
 
@@ -177,12 +178,12 @@ sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${
 
 if [ "${SERIAL_MODE}" ] ; then
  sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/serial.cmd ${DIR}/disk/boot.scr
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/serial-normal.cmd ${DIR}/disk/normal.scr
- sudo cp -v ${DIR}/scripts/serial-normal.cmd ${DIR}/disk/boot.cmd
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/serial-normal-${DIST}.cmd ${DIR}/disk/normal.scr
+ sudo cp -v ${DIR}/scripts/serial-normal-${DIST}.cmd ${DIR}/disk/boot.cmd
 else
  sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/dvi.cmd ${DIR}/disk/boot.scr
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/dvi-normal.cmd ${DIR}/disk/normal.scr
- sudo cp -v ${DIR}/scripts/dvi-normal.cmd ${DIR}/disk/boot.cmd
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/dvi-normal-${DIST}.cmd ${DIR}/disk/normal.scr
+ sudo cp -v ${DIR}/scripts/dvi-normal-${DIST}.cmd ${DIR}/disk/boot.cmd
 fi
 
 echo "#!/bin/sh" > /tmp/rebuild_uinitrd.sh
@@ -248,11 +249,11 @@ function check_distro {
  unset IN_VALID_DISTRO
  fi
 
- if test "-$DISTRO_TYPE-" = "-sid-"
- then
- DIST=sid
- unset IN_VALID_DISTRO
- fi
+# if test "-$DISTRO_TYPE-" = "-sid-"
+# then
+# DIST=sid
+# unset IN_VALID_DISTRO
+# fi
 
  if [ "$IN_VALID_DISTRO" ] ; then
    usage
@@ -270,12 +271,11 @@ required options:
 --distro <distro>
     Debian:
       squeeze <default>
-      sid
     Ubuntu
       lucid
 
 --firmware
-    Add's debian non-free firmware, (increase's file size)
+    Add distro firmware
 
 Optional:
 --dvi-mode 
diff --git a/scripts/dvi-normal.cmd b/scripts/dvi-normal-lucid.cmd
similarity index 100%
rename from scripts/dvi-normal.cmd
rename to scripts/dvi-normal-lucid.cmd
diff --git a/scripts/dvi-normal-squeeze.cmd b/scripts/dvi-normal-squeeze.cmd
new file mode 100644
index 0000000..5692868
--- /dev/null
+++ b/scripts/dvi-normal-squeeze.cmd
@@ -0,0 +1,4 @@
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 0x81600000'
+setenv bootargs 'console=tty0 root=/dev/mmcblk0p2 ro omapfb.mode=dvi:1280x720MR-16@60'
+boot
+
diff --git a/scripts/serial-normal.cmd b/scripts/serial-normal-lucid.cmd
similarity index 100%
rename from scripts/serial-normal.cmd
rename to scripts/serial-normal-lucid.cmd
diff --git a/scripts/serial-normal-squeeze.cmd b/scripts/serial-normal-squeeze.cmd
new file mode 100644
index 0000000..76c8e16
--- /dev/null
+++ b/scripts/serial-normal-squeeze.cmd
@@ -0,0 +1,4 @@
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 0x81600000'
+setenv bootargs 'console=ttyS2,115200n8 root=/dev/mmcblk0p2 ro omapfb.mode=dvi:1280x720MR-16@60'
+boot
+
diff --git a/scripts/squeeze-tweaks.diff b/scripts/squeeze-tweaks.diff
new file mode 100644
index 0000000..d7386ab
--- /dev/null
+++ b/scripts/squeeze-tweaks.diff
@@ -0,0 +1,32 @@
+diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh
+index 61bc6ae..75aa52f 100644
+--- a/lib/chroot-setup.sh
++++ b/lib/chroot-setup.sh
+@@ -110,6 +110,8 @@ EOF
+ 	APT_LISTCHANGES_FRONTEND=none
+ 	export APT_LISTCHANGES_FRONTEND
+ 
++	cp /etc/e2fsck.conf /target/etc/e2fsck.conf
++
+ 	return 0
+ }
+ 
+@@ -120,6 +122,18 @@ chroot_cleanup () {
+ 		mv /target/sbin/initctl.REAL /target/sbin/initctl
+ 	fi
+ 
++	if [ -e /etc/rcn.conf ]; then
++		mkdir -p /tmp/mmc
++		mount /dev/mmcblk0p1 /tmp/mmc
++		cp /tmp/mmc/boot.scr /tmp/mmc/netinstall.scr
++		cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr
++		cp /tmp/mmc/uInitrd /tmp/mmc/uInitrd.net
++		cp /tmp/mmc/uInitrd.final /tmp/mmc/uInitrd
++		cp -r /lib/modules/`uname -r`/ /target/lib/modules/
++		rm -f /etc/rcn.conf
++		umount /tmp/mmc
++	fi
++
+ 	# Undo the mounts done by the packages during installation.
+ 	# Reverse sorting to umount the deepest mount points first.
+ 	# Items with count of 1 are new.