diff --git a/mk_mmc.sh b/mk_mmc.sh
index 2b77d96..c58ddec 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -333,9 +333,9 @@ sudo cp -v ${TEMPDIR}/dl/${MLO} ${TEMPDIR}/disk/MLO
 sudo cp -v ${TEMPDIR}/dl/${UBOOT} ${TEMPDIR}/disk/u-boot.bin
 
 echo "uInitrd Installer"
-sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod ${TEMPDIR}/disk/uInitrd
+sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod ${TEMPDIR}/disk/uInitrd.net
 echo "uInitrd Normal Boot"
-sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${DIR}/dl/${DIST}/initrd.img-${KERNEL} ${TEMPDIR}/disk/uInitrd.final
+sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${DIR}/dl/${DIST}/initrd.img-${KERNEL} ${TEMPDIR}/disk/uInitrd
 echo "uImage"
 sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage
 
diff --git a/scripts/dvi.cmd b/scripts/dvi.cmd
index 2d35c27..8639914 100644
--- a/scripts/dvi.cmd
+++ b/scripts/dvi.cmd
@@ -9,7 +9,7 @@ setenv mpurate 800
 fi
 setenv dvimode 1280x720MR-16@60
 setenv vram 12MB
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd.net; bootm 0x80300000 0x81600000'
 setenv bootargs console=tty0 root=/dev/ram0 rw vram=${vram} omapfb.mode=dvi:${dvimode} buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/flash-kernel.conf b/scripts/flash-kernel.conf
index 96e069e..155287d 100644
--- a/scripts/flash-kernel.conf
+++ b/scripts/flash-kernel.conf
@@ -17,6 +17,9 @@ case "$DIST" in
     maverick)
             FLASH_KERNEL_SKIP=yes
         ;;
+    natty)
+            FLASH_KERNEL_SKIP=yes
+        ;;
 esac
 
 fi
diff --git a/scripts/lucid-tweaks.diff b/scripts/lucid-tweaks.diff
index e1392df..219ab3c 100644
--- a/scripts/lucid-tweaks.diff
+++ b/scripts/lucid-tweaks.diff
@@ -32,8 +32,8 @@ index 61bc6ae..fea0a1b 100644
 +		mount /dev/mmcblk0p1 /tmp/mmc
 +		cp /tmp/mmc/boot.scr /tmp/mmc/netinstall.scr
 +		cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr
-+		mv /tmp/mmc/uInitrd /tmp/mmc/uInitrd.net
-+		mv /tmp/mmc/uInitrd.final /tmp/mmc/uInitrd
++		rm -f  /tmp/mmc/uInitrd.net
++		sync
 +		umount /tmp/mmc
 +
 +		mkdir -p /target/boot/uboot
diff --git a/scripts/maverick-tweaks.diff b/scripts/maverick-tweaks.diff
index 50af855..5a83932 100644
--- a/scripts/maverick-tweaks.diff
+++ b/scripts/maverick-tweaks.diff
@@ -32,8 +32,8 @@ index 61bc6ae..fea0a1b 100644
 +		mount /dev/mmcblk0p1 /tmp/mmc
 +		cp /tmp/mmc/boot.scr /tmp/mmc/netinstall.scr
 +		cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr
-+		mv /tmp/mmc/uInitrd /tmp/mmc/uInitrd.net
-+		mv /tmp/mmc/uInitrd.final /tmp/mmc/uInitrd
++		rm -f  /tmp/mmc/uInitrd.net
++		sync
 +		umount /tmp/mmc
 +
 +		mkdir -p /target/boot/uboot
diff --git a/scripts/serial.cmd b/scripts/serial.cmd
index 65b9bd1..6755c5d 100644
--- a/scripts/serial.cmd
+++ b/scripts/serial.cmd
@@ -7,7 +7,7 @@ if test "${beaglerev}" = "xMB"; then
 echo "Kernel is not ready for 1Ghz limiting to 800Mhz"
 setenv mpurate 800
 fi
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd.net; bootm 0x80300000 0x81600000'
 setenv bootargs console=ttyS2,115200n8 root=/dev/ram0 rw buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/squeeze-tweaks.diff b/scripts/squeeze-tweaks.diff
index 1414418..26d382a 100644
--- a/scripts/squeeze-tweaks.diff
+++ b/scripts/squeeze-tweaks.diff
@@ -12,8 +12,8 @@ index 0000000..6d06fc7
 +	mount /dev/mmcblk0p1 /tmp/mmc
 +	rm -f /tmp/mmc/boot.scr /tmp/mmc/netinstall.scr
 +	cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr
-+	rm -f /tmp/mmc/uInitrd
-+	mv /tmp/mmc/uInitrd.final /tmp/mmc/uInitrd
++	rm -f  /tmp/mmc/uInitrd.net
++	sync
 +	sync
 +	umount /tmp/mmc
 +