diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index ac8219b9f3..81a72ac9ae 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -206,13 +206,14 @@ echo "#########################################################"
 
 # create filesystem
   echo "creating filesystem on $PART1..."
-  mkfs.vfat "$PART1" -n System
+  mkfs.vfat "$PART1" -I -n System
 
   echo "creating filesystem on $PART2..."
   mkfs.ext4 "$PART2" -L Storage
 
 # remount loopback device
   if [ "$DISK" = "/dev/loop0" ]; then
+    sync
     losetup -d $DISK
     losetup $DISK $IMGFILE -o 1048576 --sizelimit 131071488
     PART1=$DISK
@@ -223,12 +224,12 @@ echo "#########################################################"
   if [ -d /dev/shm ]; then
     rm -rf /dev/shm/openelec_install
     mkdir -p /dev/shm/openelec_install
-    mount "$PART1" /dev/shm/openelec_install
+    mount -t vfat "$PART1" /dev/shm/openelec_install
     MOUNTPOINT=/dev/shm/openelec_install
   else
     rm -rf /tmp/openelec_install
     mkdir -p /tmp/openelec_install
-    mount "$PART1" /tmp/openelec_install
+    mount -t vfat "$PART1" /tmp/openelec_install
     MOUNTPOINT=/tmp/openelec_install
   fi