diff --git a/ChangeLog.txt b/ChangeLog.txt
index 397ccdac4..bf2a85a9b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -362,3 +362,5 @@
 	  of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
 	* Kconfig:  Fleshed out apps/examples/adc/Kconfig and apps/examples/wget/Kconfig.
 	  There are still a LOT of empty, stub Kconfig files.
+	* Kconfig:  Fleshed out apps/examples/buttons/Kconfig. There are still a LOT
+	  of empty, stub Kconfig files.
diff --git a/examples/README.txt b/examples/README.txt
index 7ef51025f..763427e32 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -60,11 +60,11 @@ examples/buttons
   This is a simple configuration that may be used to test the board-
   specific button interfaces.  Configuration options:
 
-  CONFIG_ARCH_BUTTONS                - Must be defined for button support
+  CONFIG_ARCH_BUTTONS                 - Must be defined for button support
   CONFIG_EXAMPLES_BUTTONS_MIN         - Lowest button number (MIN=0)
   CONFIG_EXAMPLES_BUTTONS_MAX         - Highest button number (MAX=7)
 
-  CONFIG_ARCH_IRQBUTTONS             - Must be defined for interrupting button support
+  CONFIG_ARCH_IRQBUTTONS              - Must be defined for interrupting button support
   CONFIG_EXAMPLES_IRQBUTTONS_MIN      - Lowest interrupting button number (MIN=0)
   CONFIG_EXAMPLES_IRQBUTTONS_MAX      - Highest interrupting button number (MAX=7)
 
diff --git a/examples/buttons/Kconfig b/examples/buttons/Kconfig
index 9c34b37bc..d145867fc 100644
--- a/examples/buttons/Kconfig
+++ b/examples/buttons/Kconfig
@@ -7,7 +7,57 @@ config EXAMPLES_BUTTONS
 	bool "Buttons example"
 	default n
 	---help---
-		Enable the buttons example
+		Enable the buttons example.  May require ARCH_BUTTONS on some boards.
 
 if EXAMPLES_BUTTONS
+config EXAMPLES_BUTTONS_MIN
+int "Lowest Button Number"
+default 0
+
+config EXAMPLES_BUTTONS_MAX
+int "Highest Button Number"
+default 7
+
+if ARCH_IRQBUTTONS 
+config EXAMPLES_IRQBUTTONS_MIN
+int "Lowest Interrupting Button Number"
+default 0
+
+config EXAMPLES_IRQBUTTONS_MAX
+int "Highest Interrupting Button Number"
+default 7
+
+config EXAMPLES_BUTTONS_NAME0
+string "Button 0 Name"
+default "Button 0"
+
+config EXAMPLES_BUTTONS_NAME1
+string "Button 1 Name"
+default "Button 1"
+
+config EXAMPLES_BUTTONS_NAME2
+string "Button 2 Name"
+default "Button 2"
+
+config EXAMPLES_BUTTONS_NAME3
+string "Button 3 Name"
+default "Button 3"
+
+config EXAMPLES_BUTTONS_NAME4
+string "Button 4 Name"
+default "Button 4"
+
+config EXAMPLES_BUTTONS_NAME5
+string "Button 5 Name"
+default "Button 5"
+
+config EXAMPLES_BUTTONS_NAME6
+string "Button 6 Name"
+default "Button 6"
+
+config EXAMPLES_BUTTONS_NAME7
+string "Button 7 Name"
+default "Button 7"
+
+endif
 endif