diff --git a/mk_mmc.sh b/mk_mmc.sh
index e327f65..5182eeb 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -10,6 +10,7 @@ KERNEL_PATCH=13
 unset MMC
 unset FIRMWARE
 unset SERIAL_MODE
+unset IS_BETA
 
 BOOT_LABEL=boot
 PARTITION_PREFIX=""
@@ -51,10 +52,27 @@ function dl_xload_uboot {
   wget -c --directory-prefix=${DIR}/dl/ http://ftp.debian.org/debian/dists/${DIST}/main/installer-armel/current/images/versatile/netboot/initrd.gz
  fi
 
+if [ "${IS_BETA}" ] ; then
+
+KERNEL_REL=2.6.34-rc7
+KERNEL_PATCH=0
+
+ if test "-$DIST-" = "-lucid-"
+ then
+  KERNEL=${KERNEL_REL}-dl${KERNEL_PATCH}
+ else
+  KERNEL=${KERNEL_REL}-d${KERNEL_PATCH}
+ fi
+
+ wget -c --directory-prefix=${DIR}/dl/ ${MIRROR}${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb
+
+else
+
  wget -c --directory-prefix=${DIR}/dl/ ${MIRROR}kernel/beagle/${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb
- #wget -c --directory-prefix=${DIR}/dl/ ${MIRROR}${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb
  wget -c --directory-prefix=${DIR}/dl/ ${MIRROR}${DIST}/v${KERNEL}/initrd.img-${KERNEL}
 
+fi
+
 if [ "${FIRMWARE}" ] ; then
 
  echo ""
@@ -152,6 +170,7 @@ fi
  then
    sudo cp -v ${DIR}/scripts/e2fsck.conf ${DIR}/initrd-tree/etc/e2fsck.conf
    sudo cp -v ${DIR}/scripts/flash-kernel.conf ${DIR}/initrd-tree/etc/flash-kernel.conf
+   sudo cp -v ${DIR}/scripts/ttyS2.conf ${DIR}/initrd-tree/etc/ttyS2.conf
    sudo dpkg -x ${DIR}/dl/mtd-utils_20090606-1_armel.deb ${DIR}/initrd-tree
  fi
 
@@ -318,6 +337,9 @@ Optional:
 
 --serial-mode
 
+Testing:
+--beta
+
 Additional/Optional options:
 -h --help
     this help
@@ -362,6 +384,9 @@ while [ ! -z "$1" ]; do
         --serial-mode)
             SERIAL_MODE=1
             ;;
+        --beta)
+            IS_BETA=1
+            ;;
     esac
     shift
 done
diff --git a/scripts/dvi-normal-lucid.cmd b/scripts/dvi-normal-lucid.cmd
index 54ceefd..d2351e6 100644
--- a/scripts/dvi-normal-lucid.cmd
+++ b/scripts/dvi-normal-lucid.cmd
@@ -1,4 +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/mmcblk0p5 ro omapfb.mode=dvi:1280x720MR-16@60 fixrtc buddy=${buddy}
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
+setenv bootargs console=tty0 console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro omapfb.mode=dvi:1280x720MR-16@60 fixrtc buddy=${buddy}
 boot
 
diff --git a/scripts/dvi-normal-squeeze.cmd b/scripts/dvi-normal-squeeze.cmd
index 2ef9783..c46b5f8 100644
--- a/scripts/dvi-normal-squeeze.cmd
+++ b/scripts/dvi-normal-squeeze.cmd
@@ -1,4 +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 buddy=${buddy}
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
+setenv bootargs console=tty0 console=ttyS2,115200n8 root=/dev/mmcblk0p2 ro omapfb.mode=dvi:1280x720MR-16@60 buddy=${buddy}
 boot
 
diff --git a/scripts/dvi.cmd b/scripts/dvi.cmd
index 7982b75..5ce65ae 100644
--- a/scripts/dvi.cmd
+++ b/scripts/dvi.cmd
@@ -1,4 +1,4 @@
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
 setenv bootargs console=tty0 root=/dev/ram0 rw omapfb.mode=dvi:1280x720MR-16@60 buddy=${buddy}
 boot
 
diff --git a/scripts/lucid-tweaks.diff b/scripts/lucid-tweaks.diff
index a11464e..bc81030 100644
--- a/scripts/lucid-tweaks.diff
+++ b/scripts/lucid-tweaks.diff
@@ -8,8 +8,8 @@ index 61bc6ae..fea0a1b 100644
  
 +	cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
 +	cp /etc/e2fsck.conf /target/etc/e2fsck.conf
-+
-+
++	mkdir -p /target/etc/init/
++	cp /etc/ttyS2.conf /target/etc/init/ttyS2.conf
 +
 +
  	return 0
diff --git a/scripts/serial-normal-lucid.cmd b/scripts/serial-normal-lucid.cmd
index 24fd778..723fd8a 100644
--- a/scripts/serial-normal-lucid.cmd
+++ b/scripts/serial-normal-lucid.cmd
@@ -1,4 +1,4 @@
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
 setenv bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy}
 boot
 
diff --git a/scripts/serial-normal-squeeze.cmd b/scripts/serial-normal-squeeze.cmd
index da326f9..0c573ed 100644
--- a/scripts/serial-normal-squeeze.cmd
+++ b/scripts/serial-normal-squeeze.cmd
@@ -1,4 +1,4 @@
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
 setenv bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p2 ro buddy=${buddy}
 boot
 
diff --git a/scripts/serial.cmd b/scripts/serial.cmd
index 14d6a61..44868a8 100644
--- a/scripts/serial.cmd
+++ b/scripts/serial.cmd
@@ -1,4 +1,4 @@
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80000000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80300000 0x81600000'
 setenv bootargs console=ttyS2,115200n8 root=/dev/ram0 rw buddy=${buddy}
 boot
 
diff --git a/scripts/ttyS2.conf b/scripts/ttyS2.conf
new file mode 100644
index 0000000..254d79a
--- /dev/null
+++ b/scripts/ttyS2.conf
@@ -0,0 +1,5 @@
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [!2345]
+
+respawn
+exec /sbin/getty 115200 ttyS2