-dd if=/dev/zero of="${target}/${EFI_IMG}" bs=1k count="$SIZE" 2>/dev/null
-$ROOTCMD mkfs.vfat -n GRML "$EFI_IMG" >/dev/null
-$ROOTCMD mmd -i "$EFI_IMG" ::EFI
-$ROOTCMD mmd -i "$EFI_IMG" ::EFI/BOOT
-$ROOTCMD mcopy -i "$EFI_IMG" "$BOOTX64" ::EFI/BOOT/bootx64.efi >/dev/null
+ SIZE=$(du -sk "${target}/${BOOTX64}" | awk -F" " '{print $1'})
+ SIZE=$(((($SIZE / 32 )+2)*32))
+
+ dd if=/dev/zero of="${target}/${EFI_IMG}" bs=1k count="$SIZE" 2>/dev/null
+ $ROOTCMD mkfs.vfat -n GRML "$EFI_IMG" >/dev/null
+ $ROOTCMD mmd -i "$EFI_IMG" ::EFI
+ $ROOTCMD mmd -i "$EFI_IMG" ::EFI/BOOT
+ $ROOTCMD mcopy -i "$EFI_IMG" "$BOOTX64" ::EFI/BOOT/bootx64.efi >/dev/null
+ echo "Generated EFI image $BOOTX64"
+ echo "Generated bootx64 image $EFI_IMG"
+fi