diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3dbc180..b9d5e33 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -64,11 +64,13 @@ TARGET_KERNEL_CLANG_COMPILE    := false
 TARGET_KERNEL_SOURCE           := kernel/nvidia/kernel-$(TARGET_TEGRA_KERNEL)-nx
 TARGET_KERNEL_CONFIG           := tegra_android_defconfig
 TARGET_KERNEL_ADDITIONAL_FLAGS := \
-    NV_BUILD_KERNEL_OPTIONS=$(TARGET_TEGRA_KERNEL)
-    HOSTCFLAGS="-fuse-ld=lld -Wno-unused-command-line-argument"
+    NV_BUILD_KERNEL_OPTIONS=$(TARGET_TEGRA_KERNEL) \
+    HOSTCFLAGS="-fuse-ld=lld -Wno-unused-command-line-argument" \
+    CONFIG_EXFAT_FS=m
 
 TARGET_KERNEL_EXT_MODULE_ROOT := kernel/nvidia
 TARGET_KERNEL_EXT_MODULES := \
+    exfat:kbuild \
     nvgpu/drivers/gpu/nvgpu:kbuild
 include device/nintendo/nx/modules.mk
 
diff --git a/lineage.dependencies b/lineage.dependencies
index ff88f6c..83f427c 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -19,6 +19,10 @@
    "repository": "android_kernel_nvidia_cypress-fmac-upstream",
    "target_path": "kernel/nvidia/cypress-fmac-upstream"
  },
+ {
+   "repository": "android_kernel_nvidia_exfat",
+   "target_path": "kernel/nvidia/exfat"
+ },
  {
    "repository": "android_kernel_nvidia_kernel-nx",
    "target_path": "kernel/nvidia/kernel-4.9-nx"
diff --git a/modules.mk b/modules.mk
index 84581ed..d9d234d 100644
--- a/modules.mk
+++ b/modules.mk
@@ -78,6 +78,10 @@ BOARD_VENDOR_KERNEL_MODULES_LOAD += \
     cx25840 \
     cx231xx-dvb
 
+# FS
+BOARD_VENDOR_KERNEL_MODULES_LOAD += \
+    exfat
+
 # USB Storage
 BOARD_VENDOR_KERNEL_MODULES_LOAD += \
     usb-storage
@@ -99,6 +103,7 @@ BOARD_VENDOR_KERNEL_MODULES_LOAD += \
 
 # Copy to recovery
 BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD := \
+    exfat \
     hid-nvidia-blake \
     hid-jarvis-remote \
     usb-storage