diff --git a/toolchain/Config.in b/toolchain/Config.in
index df4ad84358aab6a8cd78e8f2d55111d1b5298676..cf08ae9caad33e6f76c5ff3d52feb180558204dd 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -42,14 +42,24 @@ menuconfig EXTRA_TARGET_ARCH
 		  both powerpc and powerpc64 binaries, you'll need to
 		  specify -m64 here.
 
+comment "Binary tools"
+	depends TOOLCHAINOPTS
+
 source "toolchain/binutils/Config.in"
+
+comment "Compiler"
+	depends TOOLCHAINOPTS
+
 source "toolchain/gcc/Config.in"
 
+comment "C Library"
+	depends TOOLCHAINOPTS
+
 choice
-	prompt "LIBC implementation" if TOOLCHAINOPTS
+	prompt "C Library implementation" if TOOLCHAINOPTS
 	default USE_UCLIBC
 	help
-	  Select the LIBC implementation.
+	  Select the C library implementation.
 
 	config USE_EGLIBC
 		bool "Use eglibc"
@@ -68,6 +78,9 @@ source "toolchain/eglibc/Config.in"
 source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 
+comment "Debuggers"
+	depends TOOLCHAINOPTS
+
 config GDB
 	bool
 	prompt "Build gdb" if TOOLCHAINOPTS
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index fd7ba4f5e0acb6899947c7fd7386aeaabab025b1..6b0791deb318dfaa15bd8c8f4f9fb3e8792c0cab 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -17,7 +17,7 @@ endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
 	string
-	prompt "Additional binutils options" if TOOLCHAINOPTS
+	prompt "Additional binutils configure options" if TOOLCHAINOPTS
 	default ""
 	help
 	    Any additional binutils options you may want to include....
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index ab41924026ef4001a13678ca123ddf40d8b39ce1..de0bbafbc8784ae190c97d644fb7b608ed7a6bb2 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -50,7 +50,7 @@ config EABI_SUPPORT
 
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
-	prompt "Additional gcc options" if TOOLCHAINOPTS
+	prompt "Additional gcc configure options" if TOOLCHAINOPTS
 	default ""
 	help
 	    Any additional gcc options you may want to include....