diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8c7ba4cbd..694de0376 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1244,4 +1244,7 @@
 	  calls (2015-04-05).
 	* apps/modbus/tcp:  Fix some complile problems when TCP is enabled
 	  (2015-04-06).
+	* apps/system: Clean up Kconfig menus.  The way it worked before, it was
+	  difficult to see what was enabled and what was not.  menus replaced
+	  with menuconfig (2015-04-07).
 
diff --git a/system/Kconfig b/system/Kconfig
index 978cdbaae..505c180ea 100644
--- a/system/Kconfig
+++ b/system/Kconfig
@@ -3,106 +3,29 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menu "Custom Free Memory Command"
 source "$APPSDIR/system/free/Kconfig"
-endmenu
-
-menu "EMACS-like Command Line Editor"
 source "$APPSDIR/system/cle/Kconfig"
-endmenu
-
-menu "CU Minimal Terminal"
 source "$APPSDIR/system/cu/Kconfig"
-endmenu
-
-menu "FLASH Program Installation"
 source "$APPSDIR/system/install/Kconfig"
-endmenu
-
-menu "FLASH Erase-all Command"
 source "$APPSDIR/system/flash_eraseall/Kconfig"
-endmenu
-
-menu "Intel HEX to binary conversion"
 source "$APPSDIR/system/hex2bin/Kconfig"
-endmenu
-
-menu "I2C tool"
 source "$APPSDIR/system/i2c/Kconfig"
-endmenu
-
-menu "INI File Parser"
 source "$APPSDIR/system/inifile/Kconfig"
-endmenu
-
-menu "NxPlayer media player library / command Line"
 source "$APPSDIR/system/nxplayer/Kconfig"
-endmenu
-
-menu "RAM test"
 source "$APPSDIR/system/ramtest/Kconfig"
-endmenu
-
-menu "readline()"
 source "$APPSDIR/system/readline/Kconfig"
-endmenu
-
-menu "P-Code Support"
 source "$APPSDIR/system/prun/Kconfig"
-endmenu
-
-menu "PHY Tool"
 source "$APPSDIR/system/mdio/Kconfig"
-endmenu
-
-menu "Power Off"
 source "$APPSDIR/system/poweroff/Kconfig"
-endmenu
-
-menu "RAMTRON"
 source "$APPSDIR/system/ramtron/Kconfig"
-endmenu
-
-menu "SD Card"
 source "$APPSDIR/system/sdcard/Kconfig"
-endmenu
-
-menu "Sudoku"
 source "$APPSDIR/system/sudoku/Kconfig"
-endmenu
-
-menu "Sysinfo"
 source "$APPSDIR/system/sysinfo/Kconfig"
-endmenu
-
-menu "Temperature"
 source "$APPSDIR/system/lm75/Kconfig"
-endmenu
-
-menu "VI Work-Alike Editor"
 source "$APPSDIR/system/vi/Kconfig"
-endmenu
-
-menu "Stack Monitor"
 source "$APPSDIR/system/stackmonitor/Kconfig"
-endmenu
-
-menu "USB CDC/ACM Device Commands"
 source "$APPSDIR/system/cdcacm/Kconfig"
-endmenu
-
-menu "USB Composite Device Commands"
 source "$APPSDIR/system/composite/Kconfig"
-endmenu
-
-menu "USB Mass Storage Device Commands"
 source "$APPSDIR/system/usbmsc/Kconfig"
-endmenu
-
-menu "USB Monitor"
 source "$APPSDIR/system/usbmonitor/Kconfig"
-endmenu
-
-menu "Zmodem Commands"
 source "$APPSDIR/system/zmodem/Kconfig"
-endmenu
diff --git a/system/cdcacm/Kconfig b/system/cdcacm/Kconfig
index b85b15a9e..3c0a40bbe 100644
--- a/system/cdcacm/Kconfig
+++ b/system/cdcacm/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_CDCACM
-	bool "CDC/ACM class controls"
+menuconfig SYSTEM_CDCACM
+	bool "USB CDC/ACM Device Commands"
 	default n
 	depends on CDCACM && !KERNEL_BUILD
 	---help---
diff --git a/system/cle/Kconfig b/system/cle/Kconfig
index d846a0cf8..97528c889 100644
--- a/system/cle/Kconfig
+++ b/system/cle/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_CLE
-	bool "Tiny VI work-alike command line editor"
+menuconfig SYSTEM_CLE
+	bool "EMACS-like Command Line Editor"
 	default n
 	---help---
 		Enable support for NuttX tiny EMACS-like command line editor.
diff --git a/system/composite/Kconfig b/system/composite/Kconfig
index 6b8dfadf8..c39c0224e 100644
--- a/system/composite/Kconfig
+++ b/system/composite/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_COMPOSITE
-	bool "USB composite class controls"
+menuconfig SYSTEM_COMPOSITE
+	bool "USB Composite Device Commands"
 	default n
 	depends on USBDEV_COMPOSITE && !KERNEL_BUILD
 	---help---
diff --git a/system/cu/Kconfig b/system/cu/Kconfig
index 3c3007b59..4505d64bd 100644
--- a/system/cu/Kconfig
+++ b/system/cu/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_CUTERM
-	bool "CU serial terminal"
+menuconfig SYSTEM_CUTERM
+	bool "CU minimal serial terminal"
 	default n
 	---help---
 		Enable the CU serial terminal.  This is a minimalistic
diff --git a/system/flash_eraseall/Kconfig b/system/flash_eraseall/Kconfig
index 5ecc6eb26..a6bc645ed 100644
--- a/system/flash_eraseall/Kconfig
+++ b/system/flash_eraseall/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config SYSTEM_FLASH_ERASEALL
-	bool "FLASH eraseall tool"
+	bool "FLASH Erase-all Command"
 	default n
 	depends on MTD && NSH_BUILTIN_APPS && !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
diff --git a/system/free/Kconfig b/system/free/Kconfig
index 239559867..94dafe114 100644
--- a/system/free/Kconfig
+++ b/system/free/Kconfig
@@ -4,10 +4,10 @@
 #
 
 config SYSTEM_FREE
-	bool "NSH free command replacement"
+	bool "Custom Free Memory Command"
 	default n
 	---help---
-		Enable support for the NSH free replacement command.
+		Enable support for the NSH 'free' replacement command.
 
 if SYSTEM_FREE
 endif
diff --git a/system/hex2bin/Kconfig b/system/hex2bin/Kconfig
index 46c8cdf91..48e5e32fe 100644
--- a/system/hex2bin/Kconfig
+++ b/system/hex2bin/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_HEX2BIN
-	bool "Intel HEX Conversion"
+menuconfig SYSTEM_HEX2BIN
+	bool "Intel HEX to binary conversion"
 	default n
 	---help---
 		Enable support for a logic to convert Intel HEX format to binary.
diff --git a/system/i2c/Kconfig b/system/i2c/Kconfig
index bae3e108e..2f516d07f 100644
--- a/system/i2c/Kconfig
+++ b/system/i2c/Kconfig
@@ -4,7 +4,7 @@
 #
 
 
-config SYSTEM_I2CTOOL
+menuconfig SYSTEM_I2CTOOL
 	bool "I2C tool"
 	default n
 	depends on I2C
diff --git a/system/inifile/Kconfig b/system/inifile/Kconfig
index 012ac2b12..5e238f748 100644
--- a/system/inifile/Kconfig
+++ b/system/inifile/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_INIFILE
-	bool "INI file parser"
+menuconfig SYSTEM_INIFILE
+	bool "INI File Parser"
 	default n
 	---help---
 		Enable support for a simple INI file parser.
diff --git a/system/install/Kconfig b/system/install/Kconfig
index a48f67f20..7c50efbb6 100644
--- a/system/install/Kconfig
+++ b/system/install/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config SYSTEM_INSTALL
-	bool "FLASH installation tool"
+	bool "FLASH Program Installation"
 	default n
 	---help---
 		Enable support for the FLASH installation tool.
diff --git a/system/lm75/Kconfig b/system/lm75/Kconfig
index 2a186dab4..5eaaafadd 100644
--- a/system/lm75/Kconfig
+++ b/system/lm75/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_LM75
+menuconfig SYSTEM_LM75
 	bool "Temperature"
 	default n
 	depends on I2C_LM75
diff --git a/system/mdio/Kconfig b/system/mdio/Kconfig
index 878ac4adc..75597d906 100644
--- a/system/mdio/Kconfig
+++ b/system/mdio/Kconfig
@@ -4,11 +4,11 @@
 #
 
 config SYSTEM_MDIO
-	bool "MDIO tool"
+	bool "PHY Tool"
 	default n
 	depends on NETDEV_PHY_IOCTL
 	---help---
-		Enable the MDIO tool
+		Enable the PHY MDIO tool
 
 if SYSTEM_MDIO
 endif
diff --git a/system/nxplayer/Kconfig b/system/nxplayer/Kconfig
index a2c2da068..43433bf81 100644
--- a/system/nxplayer/Kconfig
+++ b/system/nxplayer/Kconfig
@@ -4,11 +4,12 @@
 #
 
 config SYSTEM_NXPLAYER
-	bool "NxPlayer library / command line support"
+	bool "NxPlayer Media Player"
 	default n
 	depends on AUDIO
 	---help---
-		Enable support for the command line media player
+		Enable support for the NxPlayer media player library and optional
+		command line interface.
 
 if SYSTEM_NXPLAYER
 
diff --git a/system/poweroff/Kconfig b/system/poweroff/Kconfig
index ae8eac450..c55575bfe 100644
--- a/system/poweroff/Kconfig
+++ b/system/poweroff/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config SYSTEM_POWEROFF
-	bool "Power-Off command"
+	bool "Power-Off"
 	default n
 	---help---
 		Enable support for the NSH poweroff command.  NOTE: This option
diff --git a/system/prun/Kconfig b/system/prun/Kconfig
index 61ce1bcd9..fda82cfe0 100644
--- a/system/prun/Kconfig
+++ b/system/prun/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_PRUN
+menuconfig SYSTEM_PRUN
 	bool "Pascal P-Code interpreter"
 	default n
 	depends on INTERPRETERS_PCODE
diff --git a/system/ramtron/Kconfig b/system/ramtron/Kconfig
index 53d547e5f..2fae072d9 100644
--- a/system/ramtron/Kconfig
+++ b/system/ramtron/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config SYSTEM_RAMTRON
-	bool "RAMTRON command"
+	bool "RAMTRON"
 	default n
 	---help---
 		Enable support for the NSH RAMTRON command.
diff --git a/system/readline/Kconfig b/system/readline/Kconfig
index 6482b1204..61d902f64 100644
--- a/system/readline/Kconfig
+++ b/system/readline/Kconfig
@@ -3,13 +3,14 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_READLINE
-	bool "readline() support"
+menuconfig SYSTEM_READLINE
+	bool "readline() Support"
 	default n
 	---help---
 		Enable support for the readline() function.
 
 if SYSTEM_READLINE
+
 config READLINE_ECHO
 	bool "Echo character input"
 	default y
diff --git a/system/sdcard/Kconfig b/system/sdcard/Kconfig
index a1a8a1f32..d1c27c2ec 100644
--- a/system/sdcard/Kconfig
+++ b/system/sdcard/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config SYSTEM_SDCARD
-	bool "NSH sdcard command"
+	bool "SD Card"
 	default n
 	---help---
 		Enable support for the NSH sdcard command.
diff --git a/system/stackmonitor/Kconfig b/system/stackmonitor/Kconfig
index ca69e5161..81e2cd0f6 100644
--- a/system/stackmonitor/Kconfig
+++ b/system/stackmonitor/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_STACKMONITOR
-	bool "Stack monitor"
+menuconfig SYSTEM_STACKMONITOR
+	bool "Stack Monitor"
 	default n
 	depends on STACK_COLORATION && !KERNEL_BUILD
 	---help---
diff --git a/system/sudoku/Kconfig b/system/sudoku/Kconfig
index cdb28f4f3..74d8c3a30 100644
--- a/system/sudoku/Kconfig
+++ b/system/sudoku/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_SUDOKU
+menuconfig SYSTEM_SUDOKU
 	bool "Sudoku"
 	default n
 	select SYSTEM_READLINE
diff --git a/system/sysinfo/Kconfig b/system/sysinfo/Kconfig
index 633211e32..d8c27f36e 100644
--- a/system/sysinfo/Kconfig
+++ b/system/sysinfo/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_SYSINFO
-	bool "NSH sysinfo command"
+menuconfig SYSTEM_SYSINFO
+	bool "Sysinfo"
 	default n
 	---help---
 		Enable support for the NSH sysinfo command.
diff --git a/system/usbmonitor/Kconfig b/system/usbmonitor/Kconfig
index 6b298309e..6511342f6 100644
--- a/system/usbmonitor/Kconfig
+++ b/system/usbmonitor/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_USBMONITOR
+menuconfig SYSTEM_USBMONITOR
 	bool "USB Monitor"
 	default n
 	depends on (USBDEV && USBDEV_TRACE) || (USBHOST && USBHOST_TRACE)
diff --git a/system/usbmsc/Kconfig b/system/usbmsc/Kconfig
index 75dcda981..7f509cd47 100644
--- a/system/usbmsc/Kconfig
+++ b/system/usbmsc/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_USBMSC
-	bool "USB mass storage class controls"
+menuconfig SYSTEM_USBMSC
+	bool "USB Mass Storage Device Commands"
 	default n
 	depends on USBMSC && !KERNEL_BUILD
 	---help---
diff --git a/system/vi/Kconfig b/system/vi/Kconfig
index f909d9bb0..31eefec1a 100644
--- a/system/vi/Kconfig
+++ b/system/vi/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_VI
-	bool "Tiny VI work-alike text editor"
+menuconfig SYSTEM_VI
+	bool "VI Work-Alike Text Editor"
 	default n
 	---help---
 		Enable support for NuttX tiny VI work-alike editor.
diff --git a/system/zmodem/Kconfig b/system/zmodem/Kconfig
index 7ec838efc..1bb8e83aa 100644
--- a/system/zmodem/Kconfig
+++ b/system/zmodem/Kconfig
@@ -3,8 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config SYSTEM_ZMODEM
-	bool "Zmodem commands"
+menuconfig SYSTEM_ZMODEM
+	bool "Zmodem Commands"
 	default n
 	---help---
 		This selection enables the 'sz' and 'rz' NSH commands.