diff --git a/config/common.mk b/config/common.mk
index 0bd76198..1d61f227 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -172,9 +172,6 @@ PRODUCT_PACKAGES += \
     htop \
     powertop \
     lsof \
-    mount.exfat \
-    fsck.exfat \
-    mkfs.exfat \
     mkfs.f2fs \
     fsck.f2fs \
     fibmap.f2fs \
@@ -187,6 +184,15 @@ PRODUCT_PACKAGES += \
     sqlite3 \
     strace
 
+WITH_EXFAT ?= true
+ifeq ($(WITH_EXFAT),true)
+TARGET_USES_EXFAT := true
+PRODUCT_PACKAGES += \
+    mount.exfat \
+    fsck.exfat \
+    mkfs.exfat
+endif
+
 # Openssh
 PRODUCT_PACKAGES += \
     scp \