diff --git a/mk_mmc.sh b/mk_mmc.sh
index b0320cb..4766fcc 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -163,6 +163,9 @@ fi
  #Set uInitrd boot address
  sed -i -e 's:UINITRD_ADDR:'$UINITRD_ADDR':g' ${DIR}/scripts/boot.scr/*.cmd
 
+ #Set the Serial Console
+ sed -i -e 's:SERIAL_CONSOLE:'$SERIAL_CONSOLE':g' ${DIR}/scripts/boot.scr/*.cmd
+
  if [ "$USB_ROOTFS" ];then
   sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/boot.scr/dvi-normal-*.cmd
   sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/boot.scr/serial-normal-*.cmd
@@ -743,6 +746,9 @@ function reset_scripts {
  #Set uInitrd boot address
  sed -i -e 's:'$UINITRD_ADDR':UINITRD_ADDR:g' ${DIR}/scripts/boot.scr/*.cmd
 
+ #Set the Serial Console
+ sed -i -e 's:'$SERIAL_CONSOLE':SERIAL_CONSOLE:g' ${DIR}/scripts/boot.scr/*.cmd
+
  if [ "$USB_ROOTFS" ];then
   sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/boot.scr/dvi-normal-*.cmd
   sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/boot.scr/serial-normal-*.cmd
@@ -801,6 +807,7 @@ case "$UBOOT_TYPE" in
  ABI_VER=1
  UIMAGE_ADDR="0x80300000"
  UINITRD_ADDR="0x81600000"
+ SERIAL_CONSOLE="ttyO2,115200n8"
 
         ;;
     beagle)
@@ -812,6 +819,7 @@ case "$UBOOT_TYPE" in
  ABI_VER=7
  UIMAGE_ADDR="0x80300000"
  UINITRD_ADDR="0x81600000"
+ SERIAL_CONSOLE="ttyO2,115200n8"
 
         ;;
     panda)
@@ -824,6 +832,7 @@ case "$UBOOT_TYPE" in
  SMSC95XX_MOREMEM=1
  UIMAGE_ADDR="0x80300000"
  UINITRD_ADDR="0x81600000"
+ SERIAL_CONSOLE="ttyO2,115200n8"
 
         ;;
     touchbook)
@@ -835,6 +844,7 @@ case "$UBOOT_TYPE" in
  ABI_VER=5
  UIMAGE_ADDR="0x80300000"
  UINITRD_ADDR="0x81600000"
+ SERIAL_CONSOLE="ttyO2,115200n8"
 
  BETA_KERNEL=1
  SERIAL_MODE=1
@@ -849,6 +859,7 @@ case "$UBOOT_TYPE" in
  ABI_VER=6
  UIMAGE_ADDR="0x80300000"
  UINITRD_ADDR="0x81600000"
+ SERIAL_CONSOLE="ttyO2,115200n8"
 
  #with the crane, we need the beta kernel and serial-more
  BETA_KERNEL=1
@@ -864,6 +875,7 @@ case "$UBOOT_TYPE" in
  ABI_VER=8
  UIMAGE_ADDR="0x70800000"
  UINITRD_ADDR="0x72100000"
+ SERIAL_CONSOLE="ttymxc0,115200"
 
  BETA_KERNEL=1
  SERIAL_MODE=1
diff --git a/scripts/boot.scr/dvi-normal-maverick.cmd b/scripts/boot.scr/dvi-normal-maverick.cmd
index 6f4eaa5..37e1021 100644
--- a/scripts/boot.scr/dvi-normal-maverick.cmd
+++ b/scripts/boot.scr/dvi-normal-maverick.cmd
@@ -2,6 +2,6 @@ echo "Debug: Maverick DVI"
 setenv dvimode 1280x720MR-16@60
 setenv vram 12MB
 setenv bootcmd 'fatload mmc 0:1 UIMAGE_ADDR uImage; fatload mmc 0:1 UINITRD_ADDR uInitrd; bootm UIMAGE_ADDR UINITRD_ADDR'
-setenv bootargs console=ttyO2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=SERIAL_CONSOLE console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/boot.scr/dvi-normal-natty.cmd b/scripts/boot.scr/dvi-normal-natty.cmd
index 26a5158..629584d 100644
--- a/scripts/boot.scr/dvi-normal-natty.cmd
+++ b/scripts/boot.scr/dvi-normal-natty.cmd
@@ -2,6 +2,6 @@ echo "Debug: Natty DVI"
 setenv dvimode 1280x720MR-16@60
 setenv vram 12MB
 setenv bootcmd 'fatload mmc 0:1 UIMAGE_ADDR uImage; fatload mmc 0:1 UINITRD_ADDR uInitrd; bootm UIMAGE_ADDR UINITRD_ADDR'
-setenv bootargs console=ttyO2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=SERIAL_CONSOLE console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/boot.scr/dvi-normal-squeeze.cmd b/scripts/boot.scr/dvi-normal-squeeze.cmd
index 58893ea..18b2947 100644
--- a/scripts/boot.scr/dvi-normal-squeeze.cmd
+++ b/scripts/boot.scr/dvi-normal-squeeze.cmd
@@ -2,6 +2,6 @@ echo "Debug: Squeeze DVI"
 setenv dvimode 1280x720MR-16@60
 setenv vram 12MB
 setenv bootcmd 'fatload mmc 0:1 UIMAGE_ADDR uImage; fatload mmc 0:1 UINITRD_ADDR uInitrd; bootm UIMAGE_ADDR UINITRD_ADDR'
-setenv bootargs console=ttyO2,115200n8 console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=SERIAL_CONSOLE console=tty0 root=/dev/mmcblk0p5 ro vram=${vram} omapfb.mode=dvi:${dvimode} buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/boot.scr/serial-normal-maverick.cmd b/scripts/boot.scr/serial-normal-maverick.cmd
index 11df429..8ae1e5f 100644
--- a/scripts/boot.scr/serial-normal-maverick.cmd
+++ b/scripts/boot.scr/serial-normal-maverick.cmd
@@ -1,5 +1,5 @@
 echo "Debug: Maverick Serial"
 setenv bootcmd 'fatload mmc 0:1 UIMAGE_ADDR uImage; fatload mmc 0:1 UINITRD_ADDR uInitrd; bootm UIMAGE_ADDR UINITRD_ADDR'
-setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=SERIAL_CONSOLE root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/boot.scr/serial-normal-natty.cmd b/scripts/boot.scr/serial-normal-natty.cmd
index 6c6f7e0..e90a5a8 100644
--- a/scripts/boot.scr/serial-normal-natty.cmd
+++ b/scripts/boot.scr/serial-normal-natty.cmd
@@ -1,5 +1,5 @@
 echo "Debug: Natty Serial"
 setenv bootcmd 'fatload mmc 0:1 UIMAGE_ADDR uImage; fatload mmc 0:1 UINITRD_ADDR uInitrd; bootm UIMAGE_ADDR UINITRD_ADDR'
-setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=SERIAL_CONSOLE root=/dev/mmcblk0p5 ro fixrtc buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/boot.scr/serial-normal-squeeze.cmd b/scripts/boot.scr/serial-normal-squeeze.cmd
index 4f763b9..e65c986 100644
--- a/scripts/boot.scr/serial-normal-squeeze.cmd
+++ b/scripts/boot.scr/serial-normal-squeeze.cmd
@@ -1,5 +1,5 @@
 echo "Debug: Squeeze Serial"
 setenv bootcmd 'fatload mmc 0:1 UIMAGE_ADDR uImage; fatload mmc 0:1 UINITRD_ADDR uInitrd; bootm UIMAGE_ADDR UINITRD_ADDR'
-setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p5 ro buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=SERIAL_CONSOLE root=/dev/mmcblk0p5 ro buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/boot.scr/serial.cmd b/scripts/boot.scr/serial.cmd
index 057833b..11f4840 100644
--- a/scripts/boot.scr/serial.cmd
+++ b/scripts/boot.scr/serial.cmd
@@ -1,5 +1,5 @@
 echo "Debug: running debian netinstall"
 setenv bootcmd 'fatload mmc 0:1 UIMAGE_ADDR uImage.net; fatload mmc 0:1 UINITRD_ADDR uInitrd.net; bootm UIMAGE_ADDR UINITRD_ADDR'
-setenv bootargs console=ttyO2,115200n8 root=/dev/ram0 rw buddy=${buddy} mpurate=${mpurate}
+setenv bootargs console=SERIAL_CONSOLE root=/dev/ram0 rw buddy=${buddy} mpurate=${mpurate}
 boot