diff --git a/mk_mmc.sh b/mk_mmc.sh
index 8c27a0c..109ac1a 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -55,24 +55,8 @@ fi
 
 function set_defaults {
 
- if [ "$BETA" ];then
-  KERNEL_REL=2.6.37
-  KERNEL_PATCH=1
-
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/dvi.cmd
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/dvi-normal-lucid.cmd
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/dvi-normal-maverick.cmd
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/dvi-normal-squeeze.cmd
-
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/serial.cmd
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/serial-normal-lucid.cmd
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/serial-normal-maverick.cmd
-  sed -i 's/ttyS2/ttyO2/g' ${DIR}/scripts/serial-normal-squeeze.cmd
-
- else
-  KERNEL_REL=2.6.35.9
-  KERNEL_PATCH=9
- fi
+ KERNEL_REL=2.6.37
+ KERNEL_PATCH=2
 
  if [ "$USB_ROOTFS" ];then
   sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/dvi-normal-lucid.cmd
@@ -138,13 +122,11 @@ KERNEL=${KERNEL_REL}-x${KERNEL_PATCH}
 
 case "$DIST" in
     lucid)
-	KERNEL=${KERNEL_REL}-l${KERNEL_PATCH}
 	TEST_MD5SUM=$LUCID_MD5SUM
 	HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists"
 	wget -c --directory-prefix=${DIR}/dl/${DIST} http://ports.ubuntu.com/pool/universe/m/mtd-utils/mtd-utils_20090606-1_armel.deb
         ;;
     maverick)
-	KERNEL=${KERNEL_REL}-l${KERNEL_PATCH}
 	TEST_MD5SUM=$MAVERICK_MD5SUM
 	HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists"
         ;;
@@ -354,13 +336,11 @@ case "$DIST" in
     lucid)
 	#sudo cp -v ${DIR}/scripts/e2fsck.conf ${TEMPDIR}/initrd-tree/etc/e2fsck.conf
 	sudo cp -v ${DIR}/scripts/flash-kernel.conf ${TEMPDIR}/initrd-tree/etc/flash-kernel.conf
-	sudo cp -v ${DIR}/scripts/ttyS2.conf ${TEMPDIR}/initrd-tree/etc/ttyS2.conf
 	sudo cp -v ${DIR}/scripts/ttyO2.conf ${TEMPDIR}/initrd-tree/etc/ttyO2.conf
 	sudo dpkg -x ${DIR}/dl/${DIST}/mtd-utils_20090606-1_armel.deb ${TEMPDIR}/initrd-tree
         ;;
     maverick)
 	sudo cp -v ${DIR}/scripts/flash-kernel.conf ${TEMPDIR}/initrd-tree/etc/flash-kernel.conf
-	sudo cp -v ${DIR}/scripts/ttyS2.conf ${TEMPDIR}/initrd-tree/etc/ttyS2.conf
 	sudo cp -v ${DIR}/scripts/ttyO2.conf ${TEMPDIR}/initrd-tree/etc/ttyO2.conf
         ;;
     squeeze)
@@ -786,18 +766,6 @@ echo "done"
 
 function reset_scripts {
 
- if [ "$BETA" ];then
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/dvi.cmd
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/dvi-normal-lucid.cmd
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/dvi-normal-maverick.cmd
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/dvi-normal-squeeze.cmd
-
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/serial.cmd
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/serial-normal-lucid.cmd
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/serial-normal-maverick.cmd
-  sed -i 's/ttyO2/ttyS2/g' ${DIR}/scripts/serial-normal-squeeze.cmd
- fi
-
  if [ "$USB_ROOTFS" ];then
   sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/dvi-normal-lucid.cmd
   sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/dvi-normal-maverick.cmd
@@ -864,7 +832,7 @@ case "$UBOOT_TYPE" in
 
  #with the panda, we need the beta kernel and serial-more
  SERIAL_MODE=1
- BETA=1
+
         ;;
     crane)
 
@@ -874,7 +842,7 @@ case "$UBOOT_TYPE" in
 
  #with the crane, we need the beta kernel and serial-more
  SERIAL_MODE=1
- BETA=1
+
         ;;
 
 esac
@@ -928,7 +896,7 @@ required options:
 
 --uboot <dev board>
     beagle - <Bx, C2/C3/C4, xMA, xMB>
-    panda - <--beta>
+    panda - <serial only>
 
 --distro <distro>
     Debian:
diff --git a/scripts/dvi-normal-lucid.cmd b/scripts/dvi-normal-lucid.cmd
index 4fe5bb7..0fc7d5e 100644
--- a/scripts/dvi-normal-lucid.cmd
+++ b/scripts/dvi-normal-lucid.cmd
@@ -10,6 +10,6 @@ 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 bootargs console=ttyS2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=ttyO2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/dvi-normal-maverick.cmd b/scripts/dvi-normal-maverick.cmd
index 2292cb6..b540e91 100644
--- a/scripts/dvi-normal-maverick.cmd
+++ b/scripts/dvi-normal-maverick.cmd
@@ -10,6 +10,6 @@ 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 bootargs console=ttyS2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=ttyO2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/dvi-normal-squeeze.cmd b/scripts/dvi-normal-squeeze.cmd
index 425acad..0883b1e 100644
--- a/scripts/dvi-normal-squeeze.cmd
+++ b/scripts/dvi-normal-squeeze.cmd
@@ -10,6 +10,6 @@ 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 bootargs console=ttyS2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=ttyO2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/lucid-tweaks.diff b/scripts/lucid-tweaks.diff
index e165979..f3825e4 100644
--- a/scripts/lucid-tweaks.diff
+++ b/scripts/lucid-tweaks.diff
@@ -9,7 +9,7 @@ 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
++	
 +	cp /etc/ttyO2.conf /target/etc/init/ttyO2.conf
 +
  	return 0
diff --git a/scripts/maverick-tweaks.diff b/scripts/maverick-tweaks.diff
index 7c3dcdb..ebd3183 100644
--- a/scripts/maverick-tweaks.diff
+++ b/scripts/maverick-tweaks.diff
@@ -9,7 +9,7 @@ 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
++	
 +	cp /etc/ttyO2.conf /target/etc/init/ttyO2.conf
 +
  	return 0
diff --git a/scripts/serial-normal-lucid.cmd b/scripts/serial-normal-lucid.cmd
index fafb53e..2780bbd 100644
--- a/scripts/serial-normal-lucid.cmd
+++ b/scripts/serial-normal-lucid.cmd
@@ -8,6 +8,6 @@ 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 bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/serial-normal-maverick.cmd b/scripts/serial-normal-maverick.cmd
index c742811..73e31d0 100644
--- a/scripts/serial-normal-maverick.cmd
+++ b/scripts/serial-normal-maverick.cmd
@@ -8,6 +8,6 @@ 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 bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/serial-normal-squeeze.cmd b/scripts/serial-normal-squeeze.cmd
index 3530d0f..e86c815 100644
--- a/scripts/serial-normal-squeeze.cmd
+++ b/scripts/serial-normal-squeeze.cmd
@@ -8,6 +8,6 @@ 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 bootargs console=ttyS2,115200n8 root=/dev/mmcblk0p5 ro buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p5 ro buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/serial.cmd b/scripts/serial.cmd
index 528b3d8..8e015b5 100644
--- a/scripts/serial.cmd
+++ b/scripts/serial.cmd
@@ -8,6 +8,6 @@ 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.net; bootm 0x80300000 0x81600000'
-setenv bootargs console=ttyS2,115200n8 root=/dev/ram0 rw buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=ttyO2,115200n8 root=/dev/ram0 rw buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/ttyS2.conf b/scripts/ttyS2.conf
deleted file mode 100644
index 254d79a..0000000
--- a/scripts/ttyS2.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [!2345]
-
-respawn
-exec /sbin/getty 115200 ttyS2