diff --git a/mk_mmc.sh b/mk_mmc.sh
index 43e5b3d..93d3f0e 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -925,11 +925,17 @@ if [ ! "${DO_UBOOT_DD}" ] ; then
  fi
 fi
 
+VMLINUZ="vmlinuz-*"
+UIMAGE="uImage.net"
+
+if [ -f ${TEMPDIR}/kernel/boot/${VMLINUZ} ]; then
+ LINUX_VER=$(ls ${TEMPDIR}/kernel/boot/${VMLINUZ} | awk -F'vmlinuz-' '{print $2}')
+ echo "Using mkimage to create uImage"
+ mkimage -A arm -O linux -T kernel -C none -a ${ZRELADD} -e ${ZRELADD} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/${VMLINUZ} ${TEMPDIR}/disk/${UIMAGE}
+fi
+
 echo "uInitrd Installer"
 mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net
-echo "uImage"
-mkimage -A arm -O linux -T kernel -C none -a ${ZRELADD} -e ${ZRELADD} -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net
-
 
 if [ "${USE_UENV}" ] ; then
  echo "Copying uEnv.txt based boot scripts to Boot Partition"