diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6d43ef9..f4c7402 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -105,6 +105,9 @@ TARGET_USERIMAGES_USE_F2FS         := true
 BOARD_CACHEIMAGE_PARTITION_SIZE    := 209715200
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE  := ext4
 
+# Extended Filesystem Support
+TARGET_EXFAT_DRIVER := sdfat
+
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(LOCAL_PATH)/config.fs
 
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 1f140b5..94fcb9d 100755
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -11,8 +11,8 @@
 /dev/block/platform/msm_sdcc.1/by-name/userdata     /data           f2fs    nosuid,nodev,noatime,rw,inline_xattr                                                            wait,check,formattable,encryptable=footer,length=-16384
 /dev/block/platform/msm_sdcc.1/by-name/cache        /cache          ext4    nosuid,nodev,noatime,noauto_da_alloc,errors=continue,commit=20                                  wait,check,formattable
 /dev/block/platform/msm_sdcc.1/by-name/cache        /cache          f2fs    nosuid,nodev,noatime,rw,inline_xattr                                                            wait,check,formattable
-/dev/block/platform/msm_sdcc.1/by-name/apnhlos      /firmware       vfat    ro,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0                    wait
-/dev/block/platform/msm_sdcc.1/by-name/modem        /firmware-modem vfat    ro,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0                    wait
+/dev/block/platform/msm_sdcc.1/by-name/apnhlos      /firmware       sdfat    ro,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0                    wait
+/dev/block/platform/msm_sdcc.1/by-name/modem        /firmware-modem sdfat    ro,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0                    wait
 /dev/block/platform/msm_sdcc.1/by-name/efs          /efs            ext4    nosuid,nodev,noatime,noauto_da_alloc,journal_async_commit,errors=panic                          wait,check
 /dev/block/platform/msm_sdcc.1/by-name/fota         /misc           emmc    defaults                                                                                        defaults