diff --git a/mk_mmc.sh b/mk_mmc.sh
index 51fda7b..8786503 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -36,6 +36,7 @@ unset SMSC95XX_MOREMEM
 unset DO_UBOOT_DD
 unset KERNEL_DEB
 unset HAS_BEAGLE_ULCD
+unset USE_UENV
 
 SCRIPT_VERSION="1.11"
 IN_VALID_UBOOT=1
@@ -698,7 +699,13 @@ sudo mkimage -A arm -O linux -T kernel -C none -a ${ZRELADD} -e ${ZRELADD} -n ${
 echo "debian netinstall.cmd"
 cat ${TEMPDIR}/boot.scr/netinstall.cmd
 sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${TEMPDIR}/boot.scr/netinstall.cmd ${TEMPDIR}/disk/boot.scr
+
+if [ "${USE_UENV}" ] ; then
+sudo cp -v ${DIR}/scripts/uEnv.txt/beaglebone.cmd ${TEMPDIR}/disk/uEnv.txt
+cat ${TEMPDIR}/disk/uEnv.txt
+else
 sudo cp -v ${DIR}/scripts/uEnv.txt/uEnv.cmd ${TEMPDIR}/disk/uEnv.txt
+fi
 
 echo "boot.cmd"
 cat ${TEMPDIR}/boot.scr/boot.cmd
@@ -941,10 +948,14 @@ case "$UBOOT_TYPE" in
  unset IN_VALID_UBOOT
  DO_UBOOT=1
  ABI_VER=10
- SERIAL="ttyO2"
+ SERIAL="ttyO0"
  is_omap
+ UIMAGE_ADDR="0x80007fc0"
+ UINITRD_ADDR="0x80807fc0"
+ USE_UENV=1
 
  SERIAL_MODE=1
+ EXPERIMENTAL_KERNEL=1
         ;;
     igepv2)
 
diff --git a/scripts/uEnv.txt/beaglebone.cmd b/scripts/uEnv.txt/beaglebone.cmd
new file mode 100644
index 0000000..ead6d25
--- /dev/null
+++ b/scripts/uEnv.txt/beaglebone.cmd
@@ -0,0 +1,7 @@
+bootfile=uImage.net
+address_uimage=0x80007fc0
+address_uinitrd=0x80807fc0
+bootargs=earlyprintk console=ttyO0,115200n8 root=/dev/ram0 rw
+mmc_load_uimage_deb=fatload mmc ${mmc_dev} ${address_uimage} ${bootfile}
+mmc_load_uinitrd_deb=fatload mmc ${mmc_dev} ${address_uinitrd} uInitrd.net
+mmc_load_uimage=run mmc_load_uimage_deb; run mmc_load_uinitrd_deb; run mmc_args; bootm ${address_uimage} ${address_uinitrd}