diff --git a/drivers/Kconfig b/drivers/Kconfig
index e5fbd42d3bc..9df512945be 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "Device Driver Configuration"
+
 config DEV_NULL
 	bool "Enable /dev/null"
 	default y
diff --git a/fs/Kconfig b/fs/Kconfig
index 2e1fd378376..afea3371271 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -4,6 +4,7 @@
 #
 
 comment "File system configuration"
+
 source fs/fat/Kconfig
 source fs/mmap/Kconfig
 source fs/nfs/Kconfig
diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig
index 4caf300b365..30983799d75 100644
--- a/fs/fat/Kconfig
+++ b/fs/fat/Kconfig
@@ -3,9 +3,6 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menu "FAT file system configuration"
-comment "FAT file system configuration"
-
 config FS_FAT
 	bool "FAT file system"
 	default n
@@ -56,4 +53,3 @@ config FS_FATTIME
 		hardware RTC or other way to get the time and date.
 
 endif
-endmenu
diff --git a/fs/mmap/Kconfig b/fs/mmap/Kconfig
index a7b696c6a79..03482e2d810 100644
--- a/fs/mmap/Kconfig
+++ b/fs/mmap/Kconfig
@@ -3,4 +3,25 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-comment "File mapping emulation"
+config FS_RAMMAP
+	bool "File mapping emulation"
+	default n
+	---help---
+		NuttX operates in a flat open address space and is focused on MCUs that do
+		support Memory Management Units (MMUs).  Therefore, NuttX generally does not
+		require mmap() functionality and the MCUs generally cannot support true
+		memory-mapped files.
+
+		However, memory mapping of files is the mechanism used by NXFLAT, the NuttX
+		tiny binary format, to get files into memory in order to execute them.
+		mmap() support is therefore required to support NXFLAT.
+
+		If FS_RAMMAP is defined in the configuration, then mmap() will
+		support simulation of memory mapped files by copying files whole
+		into RAM.  These copied files have some of the properties of
+		standard memory mapped files.
+
+		See nuttx/fs/mmap/README.txt for additonal information.
+
+if FS_RAMMAP
+endif
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 88a562cb35d..841b1ab8ee0 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -3,4 +3,28 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-comment "Network file system (NFS) client file system"
+config NFS
+	bool "NFS client file system"
+	default n
+	depends on NET && !DISABLE_MOUNTPOINT
+	---help---
+		Enable network file system (NFS) client file system
+
+#if NFS
+
+config NFS_TCPIP
+	bool "TCP/IP RPC support"
+	default n
+	depends on NFS
+	---help---
+		By default, NFS uses a UDP RPC protocol.  Enable this option to
+		build in support for a TCP/IP-based RPC.
+
+config NFS_UNIX_AUTH
+	bool "NFS Unix authentication"
+	default n
+	depends on NFS
+	---help---
+		Build in support for Unix-style authentication.
+
+#endif
\ No newline at end of file
diff --git a/fs/nxffs/Kconfig b/fs/nxffs/Kconfig
index f6aede4a21a..b233e85ea0f 100644
--- a/fs/nxffs/Kconfig
+++ b/fs/nxffs/Kconfig
@@ -3,9 +3,6 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menu "NXFFS file system configuration"
-comment "NXFFS file system configuration"
-
 config FS_NXFFS
 	bool "NXFFS file system"
 	default n
@@ -52,4 +49,3 @@ config NXFFS_TAILTHRESHOLD
 		Default: 8192.
 
 endif
-endmenu
diff --git a/fs/romfs/Kconfig b/fs/romfs/Kconfig
index 22274681ade..6a91011abf0 100644
--- a/fs/romfs/Kconfig
+++ b/fs/romfs/Kconfig
@@ -3,4 +3,12 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-comment "ROMFS file system"
+config FS_ROMFS
+	bool "ROMFS file system"
+	default n
+	depends on !DISABLE_MOUNTPOINT
+	---help---
+		Enable ROMFS filesystem support
+
+if FS_ROMFS
+endif
diff --git a/net/Kconfig b/net/Kconfig
index b1c35dc60d5..dc16150ba6d 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -133,6 +133,12 @@ config NET_UDP_CONNS
 	---help---
 		The maximum amount of open concurrent UDP sockets
 
+config NET_BROADCAST
+	bool "UDP broadcast Rx support"
+	default n
+	---help---
+		Incoming UDP broadcast support
+
 endif
 
 config NET_ICMP
@@ -202,18 +208,6 @@ config NET_ARP_IPIN
 		Harvest IP/MAC address mappings from the ARP table
 		from incoming IP packets.
 
-endif
-if NET_UDP
-
-config NET_BROADCAST
-	bool "UDP broadcast Rx support"
-	default n
-	---help---
-		Incoming UDP broadcast support
-
-endif
-if NET
-
 config NET_MULTICAST
 	bool "Multi-cast Tx support"
 	default n