diff --git a/src/freedombone-format b/src/freedombone-format
index 83be0787..048645f6 100755
--- a/src/freedombone-format
+++ b/src/freedombone-format
@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-2018 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -62,7 +62,7 @@ p
 a
 1
 w
-" | fdisk /dev/${USB_DRIVE_SHORT};mkfs.ext4 -L "$LABEL" /dev/${USB_DRIVE_SHORT}1
+" | fdisk /dev/${USB_DRIVE_SHORT};mkfs.msdos -F 32 -L "$LABEL" /dev/${USB_DRIVE_SHORT}1
 
 echo $"Formatting $USB_DRIVE as LUKS"
 cryptsetup -y -v luksFormat ${USB_DRIVE}
@@ -75,7 +75,7 @@ if [ ! "$?" = "0" ]; then
     echo $"Failed to open LUKS formatted drive $USB_DRIVE"
     exit 37232
 fi
-mkfs.ext4 /dev/mapper/encrypted_usb -L "$LABEL"
+mkfs.msdos -F 32 /dev/mapper/encrypted_usb -L "$LABEL"
 if [ ! "$?" = "0" ]; then
     cryptsetup luksClose encrypted_usb
     echo $'Format of drive $USB_DRIVE failed'