diff --git a/mk_mmc.sh b/mk_mmc.sh
index 141732b..c8335ad 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -960,6 +960,13 @@ case "$DIST" in
 	 cp -v ${DIR}/scripts/debian-finish.sh ${TEMPDIR}/initrd-tree/etc/finish-install.sh
         ;;
 esac
+
+if [ "$SERIAL_MODE" ];then
+ #Squeeze: keymaps aren't an issue with serial mode so disable preseed workaround:
+ sed -i -e 's:d-i console-tools:#d-i console-tools:g' ${TEMPDIR}/initrd-tree/preseed.cfg
+ sed -i -e 's:d-i debian-installer:#d-i debian-installer:g' ${TEMPDIR}/initrd-tree/preseed.cfg
+ sed -i -e 's:d-i console-keymaps-at:#d-i console-keymaps-at:g' ${TEMPDIR}/initrd-tree/preseed.cfg
+fi
 }
 
 function initrd_fixes {
diff --git a/scripts/squeeze-preseed.cfg b/scripts/squeeze-preseed.cfg
index 8d05730..b3a5cc9 100644
--- a/scripts/squeeze-preseed.cfg
+++ b/scripts/squeeze-preseed.cfg
@@ -5,7 +5,8 @@ d-i apt-setup/contrib boolean true
 
 # Squeeze only: (doesn't seem to effect maverick/natty/oneiric/precise..)
 # (working around a gcc/bug, where netinstall locks up here, cross compiled *.deb would work fine...)
-d-i	console-tools/archs string skip-config
+# Note: this workaround is disabled in serial mode
+d-i console-tools/archs string skip-config
 d-i debian-installer/locale string en_US
 d-i console-keymaps-at/keymap select us