diff --git a/tools/eMMC/bbb-eMMC-flasher-eewiki-ext4.sh b/tools/eMMC/bbb-eMMC-flasher-eewiki-ext4.sh
index 6264226d..7d0da069 100755
--- a/tools/eMMC/bbb-eMMC-flasher-eewiki-ext4.sh
+++ b/tools/eMMC/bbb-eMMC-flasher-eewiki-ext4.sh
@@ -486,7 +486,7 @@ partition_drive () {
 
 	dd_bootloader
 
-	boot_fstype="ext4"
+	boot_fstype=${boot_fstype:-ext4}
 
 	if [ "x${boot_fstype}" = "xfat" ] ; then
 		conf_boot_startmb=${conf_boot_startmb:-"1"}
@@ -574,6 +574,16 @@ message="-----------------------------" ; broadcast
 message="Version: [${version_message}]" ; broadcast
 message="-----------------------------" ; broadcast
 
+if [[ "$1" == --boot_fstype* ]] ; then
+    boot_fstype=${2:-$1}
+    boot_fstype=${boot_fstype#*=}
+    case $boot_fstype in
+        fat | ext4) ;;
+        *) echo "boot_fstype must be fat or ext4"; exit 2 ;;
+    esac
+    message="Using $boot_fstype for boot filesystem" ; broadcast
+fi
+
 check_eeprom
 check_running_system
 cylon_leds & CYLON_PID=$!