diff --git a/hwpack/omap3-beagle-xm-v3.8.conf b/hwpack/omap3-beagle-xm-v3.8.conf
new file mode 100644
index 0000000..a9c28f6
--- /dev/null
+++ b/hwpack/omap3-beagle-xm-v3.8.conf
@@ -0,0 +1,43 @@
+#!/bin/bash
+#http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5
+#        --dtb omap3-beagle-xm (BeagleBoard xM (v3.8.x))
+
+board="BEAGLEBOARD_XM"
+SYSTEM="beagle_xm"
+
+#Bootloader:
+bootloader_http="http://rcn-ee.net/deb/tools/latest/"
+bootloader_latest_file="bootloader-ng"
+
+#Bootloader Partition:
+bootloader_location="fatfs_boot"
+boot_partition_size="64"
+spl_name="MLO"
+boot_name="u-boot.img"
+
+#Bootloader: u-boot settings
+boot_image="bootz"
+boot_script="uEnv.txt"
+boot_fstype="fat"
+uboot_SCRIPT_ENTRY="loaduimage"
+uboot_CMD_LOAD="fatload"
+
+#Kernel:
+#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
+kernel_subarch="omap"
+kernel_repo="TESTING"
+
+usbnet_mem="16384"
+
+#Kernel: Bootloader Settings:
+kernel_addr="0x80300000"
+initrd_addr="0x81600000"
+load_addr="0x80008000"
+dtb_addr="0x815f0000"
+dtb_file=
+
+SERIAL="ttyO2"
+SERIAL_CONSOLE="${SERIAL},115200n8"
+
+SERIAL_MODE=1
+USE_KMS=1
diff --git a/mk_mmc.sh b/mk_mmc.sh
index a29a73a..4e4b213 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1447,18 +1447,9 @@ function check_uboot_type {
 		convert_uboot_to_dtb_board
 		;;
 	beagle_xm_kms)
-		uboot_SCRIPT_ENTRY="loaduimage"
-		uboot_CMD_LOAD="fatload"
-		SYSTEM="beagle_xm"
-		board="BEAGLEBOARD_XM"
-		is_omap
-		usbnet_mem="16384"
-		#dtb_file="omap3-beagle.dtb"
-
-		USE_KMS=1
-		unset HAS_OMAPFB_DSS2
-
-		kernel_repo="TESTING"
+		echo "Note: [--dtb omap3-beagle-xm-v3.8] now replaces [--uboot beagle_xm_kms]"
+		source "${DIR}"/hwpack/omap3-beagle-xm.conf
+		convert_uboot_to_dtb_board
 		;;
 	bone)
 		need_am335x_firmware="1"