diff --git a/src/rootfsinstall.sh b/src/rootfsinstall.sh
index 8321dcf..18650af 100755
--- a/src/rootfsinstall.sh
+++ b/src/rootfsinstall.sh
@@ -3,6 +3,7 @@
 #
 # Based on rpi-install by: Davide Madrisan
 # Modified by: Silvan Calarco <silvan.calarco@mambasoft.it>
+# License: GPL 3.0
 #
 
 SYSTEMFSTYPE=ext4
@@ -183,9 +184,7 @@ case $TARGETDEVICE in
         BOOTFSTYPE=fat16
         BOOTFSSIZE=22M
         BOOTFSSTART=1049k
-        KERNELVER="4.9.17-baytrail"
-        KERNELDEST="@BOOT@/vmlinuz-$KERNELVER"
-        INSTALLPACKAGES="kernel-baytrail kernel-baytrail-headers \
+        INSTALLPACKAGES="kernel-mamba-x86_64 kernel-mamba-x86_64-headers \
            chipone_ts grub-efi rtl8723bs_bt rtl8723bs axpd acpi_tables_patch $INSTALLPACKAGES"
         REMOVEPACKAGES=""
         FSTAB_ROOT_DEVICE="/dev/sda2"
@@ -458,13 +457,17 @@ if [ ! "${IMAGEMODE}" ]; then
 if [ "$TARGETDEVICE" = "baytrail" ]; then
    # create EFI Grub 64 bit image
    mkdir -p $BOOTMP/EFI/BOOT/
-   grub-mkimage -o $BOOTMP/EFI/BOOT/bootx64.efi -O x86_64-efi -p /efi/boot \
+   chroot $ROOTMP grub-mkimage -o /tmp/bootx64.efi -O x86_64-efi -p /efi/boot \
       part_gpt part_msdos ntfs ntfscomp hfsplus fat ext2 normal chain boot linux echo \
       help gfxterm gettext png efi_gop efi_uga search search_label search_fs_uuid \
       usb_keyboard all_video || {
       errorAndExit $"Error: unable to create GRUB x86_64-efi image" &>>$LOGFILE
    }
+   mv $ROOTMP/tmp/bootx64.efi $BOOTMP/EFI/BOOT/
 
+   for f in $ROOTMP/lib/modules/*mamba-x86_64; do
+      KERNELVER=`basename $f`
+   done
    KERNELDEST="vmlinuz-$KERNELVER"
    INITRAMFSDEST="initramfs-$KERNELVER.img"
    chroot $ROOTMP depmod $KERNELVER