diff --git a/arch/Kconfig b/arch/Kconfig
index 92890be96ae..13335441e50 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -14,23 +14,27 @@ config ARCH_8051
 
 config ARCH_ARM
 	bool "ARM"
+	select ARCH_HAVE_INTERRUPTSTACK
 	---help---
 		The ARM architectures
 
 config ARCH_AVR
 	bool "AVR"
 	select ARCH_NOINTC
+	select ARCH_HAVE_INTERRUPTSTACK
 	---help---
 		Atmel 8-bit bit AVR and 32-bit AVR32 architectures
 
 config ARCH_HC
 	bool "Freescale HC"
 	select ARCH_NOINTC
+	select ARCH_HAVE_INTERRUPTSTACK
 	---help---
 		Freescale HC architectures (M9S12)
 
 config ARCH_MIPS
 	bool "MIPS"
+	select ARCH_HAVE_INTERRUPTSTACK
 	---help---
 		MIPS architectures (PIC32)
 
@@ -43,6 +47,7 @@ config ARCH_RGMP
 config ARCH_SH
 	bool "Renesas"
 	select ARCH_NOINTC
+	select ARCH_HAVE_INTERRUPTSTACK
 	---help---
 		Renesas architectures (SH and M16C).
 
@@ -140,6 +145,18 @@ config DRAM_SIZE
 		this may be SDRAM or SRAM or any other RAM technology that support
 		program execution.
 
+config ARCH_HAVE_INTERRUPTSTACK
+	bool
+
+config ARCH_INTERRUPTSTACK
+	bool "Use interrupt stack"
+	depends on ARCH_HAVE_INTERRUPTSTACK
+	default y
+	---help---
+		This architecture supports an interrupt stack. If defined, this symbol
+		is the size of the interrupt stack in bytes.  If not defined, the user
+		task stacks will be used during interrupt handling.
+
 comment "Boot options"
 
 choice
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6550950e73e..3bd53123268 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -216,14 +216,6 @@ config PAGING
 		If set =y in your configation file, this setting will enable the on-demand
 		paging feature as described in http://www.nuttx.org/NuttXDemandPaging.html.
 
-config ARCH_INTERRUPTSTACK
-	bool "Use interrupt stack"
-	default y
-	---help---
-		This architecture supports an interrupt stack. If defined, this symbol
-		is the size of the interrupt stack in bytes.  If not defined, the user
-		task stacks will be used during interrupt handling.
-
 config ARCH_IRQPRIO
 	bool "Interrupt priority"
 	default y		if ARCH_CORTEXM3 || ARCH_CORTEXM4
diff --git a/arch/arm/src/c5471/Kconfig b/arch/arm/src/c5471/Kconfig
index ae2bf31307d..06363ad7df5 100644
--- a/arch/arm/src/c5471/Kconfig
+++ b/arch/arm/src/c5471/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "C5471 Configuration Options"
diff --git a/arch/arm/src/calypso/Kconfig b/arch/arm/src/calypso/Kconfig
index ae2bf31307d..65726a6096e 100644
--- a/arch/arm/src/calypso/Kconfig
+++ b/arch/arm/src/calypso/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "Calypso Configuration Options"
diff --git a/arch/arm/src/dm320/Kconfig b/arch/arm/src/dm320/Kconfig
index ae2bf31307d..0255c5ff1be 100644
--- a/arch/arm/src/dm320/Kconfig
+++ b/arch/arm/src/dm320/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "DM320 Configuration Options"
diff --git a/arch/arm/src/imx/Kconfig b/arch/arm/src/imx/Kconfig
index ae2bf31307d..879f50ef7d3 100644
--- a/arch/arm/src/imx/Kconfig
+++ b/arch/arm/src/imx/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "i.MX Configuration Options"
diff --git a/arch/arm/src/kinetis/Kconfig b/arch/arm/src/kinetis/Kconfig
index ae2bf31307d..210683f59fc 100644
--- a/arch/arm/src/kinetis/Kconfig
+++ b/arch/arm/src/kinetis/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "Kinetis Configuration Options"
diff --git a/arch/arm/src/lm3s/Kconfig b/arch/arm/src/lm3s/Kconfig
index 1fd203f4fce..03da5c458a1 100644
--- a/arch/arm/src/lm3s/Kconfig
+++ b/arch/arm/src/lm3s/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LM3S Configuration Options"
+
 choice
 	prompt "LM3S Chip Selection"
 	default ARCH_CHIP_LM3S6965
diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig
index dc28f8c1007..2769fc231f9 100644
--- a/arch/arm/src/lpc17xx/Kconfig
+++ b/arch/arm/src/lpc17xx/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LPC17xx Configuration Options"
+
 choice
 	prompt "NXP LPC17XX Chip Selection"
 	default ARCH_CHIP_LPC1768
diff --git a/arch/arm/src/lpc214x/Kconfig b/arch/arm/src/lpc214x/Kconfig
index ae2bf31307d..a26483ed9ec 100644
--- a/arch/arm/src/lpc214x/Kconfig
+++ b/arch/arm/src/lpc214x/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "LPC214x Configuration Options"
diff --git a/arch/arm/src/lpc2378/Kconfig b/arch/arm/src/lpc2378/Kconfig
index ae2bf31307d..89a515d6ac9 100644
--- a/arch/arm/src/lpc2378/Kconfig
+++ b/arch/arm/src/lpc2378/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "LPC2378 Configuration Options"
diff --git a/arch/arm/src/lpc31xx/Kconfig b/arch/arm/src/lpc31xx/Kconfig
index 17daf94b75e..39b19b95d55 100644
--- a/arch/arm/src/lpc31xx/Kconfig
+++ b/arch/arm/src/lpc31xx/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LPC31xx Configuration Options"
+
 choice
 	prompt "LPC31 Chip Selection"
 	default ARCH_CHIP_LPC3131
diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index 0ae9f8ffef3..4653b2ee359 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LPC43xx Configuration Options"
+
 choice
 	prompt "LPC43XX Chip Selection"
 	default ARCH_CHIP_LPC4330FET100
diff --git a/arch/arm/src/sam3u/Kconfig b/arch/arm/src/sam3u/Kconfig
index ae2bf31307d..b845655474b 100644
--- a/arch/arm/src/sam3u/Kconfig
+++ b/arch/arm/src/sam3u/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "AT91SAM3U Configuration Options"
diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index ef1ca63cec3..80610f271e5 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "STM32 Configuration Options"
+
 choice
 	prompt "STM32 Chip Selection"
 	default ARCH_CHIP_STM32F103ZET6
@@ -414,6 +416,8 @@ config STM32_CAN
 	bool
 	default y if STM32_CAN1 || STM32_CAN2
 
+menu "Alternate Pin Mapping"
+
 choice
 	prompt "TIM1 Alternate Pin Mappings"
 	depends on STM32_STM32F10XX && STM32_TIM1
@@ -537,6 +541,8 @@ config STM32_ETH_REMAP
 	default n
 	depends on STM32_CONNECTIVITYLINE && STM32_ETHMAC
 
+endmenu
+
 choice
 	prompt "JTAG Configuration"
 	default STM32_JTAG_DISABLE
diff --git a/arch/arm/src/str71x/Kconfig b/arch/arm/src/str71x/Kconfig
index ae2bf31307d..0e9c87d54ee 100644
--- a/arch/arm/src/str71x/Kconfig
+++ b/arch/arm/src/str71x/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "STR71x Configuration Options"
diff --git a/arch/avr/src/at32uc3/Kconfig b/arch/avr/src/at32uc3/Kconfig
index 4c3bd28c660..fcb9f8405ed 100644
--- a/arch/avr/src/at32uc3/Kconfig
+++ b/arch/avr/src/at32uc3/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_AT32UC3
+comment "AT32U3 Configuration Options"
+
 endif
diff --git a/arch/avr/src/at90usb/Kconfig b/arch/avr/src/at90usb/Kconfig
index 78cd6d059be..8f9978a5292 100644
--- a/arch/avr/src/at90usb/Kconfig
+++ b/arch/avr/src/at90usb/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_AT90USB
+comment "AT90USB Configuration Options"
+
 endif
diff --git a/arch/avr/src/atmega/Kconfig b/arch/avr/src/atmega/Kconfig
index f0004d7fecf..145b525df67 100644
--- a/arch/avr/src/atmega/Kconfig
+++ b/arch/avr/src/atmega/Kconfig
@@ -4,5 +4,7 @@
 #
 
 if ARCH_ATMEGA
+comment "ATMega Configuration Options"
+
 endif
 
diff --git a/arch/avr/src/avr/Kconfig b/arch/avr/src/avr/Kconfig
index 1b21ce810c1..99228aa2c17 100644
--- a/arch/avr/src/avr/Kconfig
+++ b/arch/avr/src/avr/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_FAMILY_AVR
+comment "AVR Configuration Options"
+
 endif
diff --git a/arch/avr/src/avr32/Kconfig b/arch/avr/src/avr32/Kconfig
index ca1fcd2bf7e..12cc033cbca 100644
--- a/arch/avr/src/avr32/Kconfig
+++ b/arch/avr/src/avr32/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_FAMILY_AVR32
+comment "AVR32 Configuration Options"
+
 endif
diff --git a/arch/hc/src/m9s12/Kconfig b/arch/hc/src/m9s12/Kconfig
index 41c4b9c1721..e4addf43f51 100644
--- a/arch/hc/src/m9s12/Kconfig
+++ b/arch/hc/src/m9s12/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_HSC12
+comment "M9S12 Configuration Options"
+
 endif
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cfa3d589d4d..c642f7152dc 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -27,14 +27,6 @@ config ARCH_CHIP
 	string
 	default "pic32mx"	if ARCH_CHIP_PIC32MX
 
-config ARCH_INTERRUPTSTACK
-	bool "Use interrupt stack"
-	default y
-	---help---
-		This architecture supports an interrupt stack. If defined, this symbol
-		is the size of the interrupt stack in bytes.  If not defined, the user
-		task stacks will be used during interrupt handling.
-
 config ARCH_IRQPRIO
 	bool "Interrupt priority"
 	default y		if ARCH_CHIP_PIC32MX
diff --git a/arch/mips/src/mips32/Kconfig b/arch/mips/src/mips32/Kconfig
index e02b0258b93..1b44995687a 100644
--- a/arch/mips/src/mips32/Kconfig
+++ b/arch/mips/src/mips32/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_MIPS32
+comment "MIPS32 Configuration Options"
+
 endif
diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig
index 222c7e4de97..ba77cf5d8fd 100644
--- a/arch/mips/src/pic32mx/Kconfig
+++ b/arch/mips/src/pic32mx/Kconfig
@@ -4,6 +4,7 @@
 #
 
 if ARCH_CHIP_PIC32MX
+comment "PIC32MX Configuration Options"
 
 choice
 	prompt "PIC32MX chip selection"
diff --git a/arch/rgmp/Kconfig b/arch/rgmp/Kconfig
index 7cc5fcc97c2..24a9c320510 100644
--- a/arch/rgmp/Kconfig
+++ b/arch/rgmp/Kconfig
@@ -4,6 +4,8 @@
 #
 
 if ARCH_RGMP
+comment "RGMP Configuration Options"
+
 choice
 	prompt "RGMP Architecture"
 	default RGMP_SUBARCH_X86
diff --git a/arch/sh/src/m16c/Kconfig b/arch/sh/src/m16c/Kconfig
index 9d510e03712..56db601be2a 100644
--- a/arch/sh/src/m16c/Kconfig
+++ b/arch/sh/src/m16c/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_M16C
+comment "M16C Configuration Options"
+
 endif
diff --git a/arch/sh/src/sh1/Kconfig b/arch/sh/src/sh1/Kconfig
index b0405f2f528..3fe3ebb7d98 100644
--- a/arch/sh/src/sh1/Kconfig
+++ b/arch/sh/src/sh1/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_SH1
+comment "SH-1 Configuration Options"
+
 endif
diff --git a/arch/sim/Kconfig b/arch/sim/Kconfig
index 33f25f6a61f..331f61c79e2 100644
--- a/arch/sim/Kconfig
+++ b/arch/sim/Kconfig
@@ -4,6 +4,8 @@
 #
 
 if ARCH_SIM
+comment "Simulation Configuration Options"
+
 config SIM_M32
 	bool "Build 32-bit simulation on 64-bit machine"
 	default n
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c988c92a4ad..10c081fab41 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -4,6 +4,8 @@
 #
 
 if ARCH_X86
+comment "x86 Configuration Options"
+
 choice
 	prompt "x86 chip selection"
 	default ARCH_I486
diff --git a/arch/x86/src/common/Kconfig b/arch/x86/src/common/Kconfig
index fff9d7f1226..9595e6e8ad4 100644
--- a/arch/x86/src/common/Kconfig
+++ b/arch/x86/src/common/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_X86
+comment "Common Configuration Options"
+
 endif
diff --git a/arch/x86/src/i486/Kconfig b/arch/x86/src/i486/Kconfig
index be9fa2cd0ba..1847a4dd4e0 100644
--- a/arch/x86/src/i486/Kconfig
+++ b/arch/x86/src/i486/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_I486
+comment "i486 Configuration Options"
+
 endif
diff --git a/arch/x86/src/qemu/Kconfig b/arch/x86/src/qemu/Kconfig
index ac2e2a5e924..5623ab063f7 100644
--- a/arch/x86/src/qemu/Kconfig
+++ b/arch/x86/src/qemu/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_CHIP_QEMU
+comment "QEMU Configuration Options"
+
 endif
diff --git a/arch/z16/Kconfig b/arch/z16/Kconfig
index acf58bcf341..a806e6ed11b 100644
--- a/arch/z16/Kconfig
+++ b/arch/z16/Kconfig
@@ -4,6 +4,7 @@
 #
 
 if ARCH_Z16
+comment "Z16 Configuration Options"
 
 choice
 	prompt "ZNEO chip selection"
diff --git a/arch/z16/src/common/Kconfig b/arch/z16/src/common/Kconfig
index 0f94fb19af2..d01f3df2dbe 100644
--- a/arch/z16/src/common/Kconfig
+++ b/arch/z16/src/common/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_Z16
+comment "Common Configuration Options"
+
 endif
diff --git a/arch/z16/src/z16f/Kconfig b/arch/z16/src/z16f/Kconfig
index f410f51c4ca..826720ee7a0 100644
--- a/arch/z16/src/z16f/Kconfig
+++ b/arch/z16/src/z16f/Kconfig
@@ -4,4 +4,6 @@
 #
 
 if ARCH_CHIP_Z16F
+comment "Z16F Configuration Options"
+
 endif