diff --git a/hwpack/dt-beagleboard-xm.conf b/hwpack/dt-beagleboard-xm.conf
index 16186e3..44e618f 100644
--- a/hwpack/dt-beagleboard-xm.conf
+++ b/hwpack/dt-beagleboard-xm.conf
@@ -48,6 +48,7 @@ conf_fdtaddr="0x815f0000"
 conf_initrdaddr="0x81600000"
 need_dtbs=1
 need_ti_connectivity_firmware=1
+conf_kernel_usb_not_builtin=1
 
 #SYSTEM="video"
 #SYSTEM="serial"
diff --git a/lib/wheezy-preseed.cfg b/lib/wheezy-preseed.cfg
index 2953450..fe22ff9 100644
--- a/lib/wheezy-preseed.cfg
+++ b/lib/wheezy-preseed.cfg
@@ -3,6 +3,12 @@
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 
+# The Wheezy, USB disabled (no keyboard access) till after you select keymap bug...
+#(this is not needed 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
+
 #Removes the prompt about missing modules:
 # Continue without installing a kernel?
 d-i base-installer/kernel/skip-install boolean true
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 2d58c27..984e56f 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1008,6 +1008,17 @@ initrd_preseed_settings () {
 	setup_parition_recipe
 	cp -v "${DIR}/lib/${DIST}-preseed.cfg" ${TEMPDIR}/initrd-tree/preseed.cfg
 
+	case "${DIST}" in
+	wheezy)
+		if [ ! "${SERIAL_MODE}" ] && [ "${conf_kernel_usb_not_builtin}" ]; then
+			#Wheezy: 
+			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
+		;;
+	esac
+
 	cd "${DIR}"/
 }