diff --git a/Kconfig b/Kconfig
index 79cf15ca9de..25faff9f9bd 100644
--- a/Kconfig
+++ b/Kconfig
@@ -24,6 +24,7 @@ config ALLOW_BSD_COMPONENTS
 		are not included in the setup menu:
 		FS
 		    NFS client file system
+		    SPIFFS File System
 		Wireless
 		    Bluetooth LE support
 
diff --git a/fs/spiffs/Kconfig b/fs/spiffs/Kconfig
index c2d4d410b33..c9929d1a3e8 100644
--- a/fs/spiffs/Kconfig
+++ b/fs/spiffs/Kconfig
@@ -6,7 +6,7 @@
 config FS_SPIFFS
 	bool "SPIFFS File System"
 	default n
-	depends on !DISABLE_MOUNTPOINT
+	depends on !DISABLE_MOUNTPOINT && ALLOW_BSD_COMPONENTS
 	---help---
 		Build the SPIFFS file system.  This is a port of version 0.3.7 of
 		the SPIFFS file system by  Peter Andersson.  It was originally