diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index fbdf68ccfa..9a234adff6 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -27,6 +27,7 @@ Contents
   - NuttX OABI "buildroot" Toolchain
   - NXFLAT Toolchain
   - LEDs
+  - RGB LED Driver
   - PWM
   - UARTs
   - Timer Inputs/Outputs
@@ -300,6 +301,32 @@ events as follows:
     on a small proportion of the time.
 *** LED2 may also flicker normally if signals are processed.
 
+RGB LED Driver
+==============
+
+The RGB LED driver that uses PWM to control the red, green, and blue color
+components can be enabled with the following configuratin settings:
+
+  +CONFIG_RGBLED=y
+
+  +CONFIG_PWM
+
+  +CONFIG_STM32_TIM1
+  +CONFIG_STM32_TIM2
+  +CONFIG_STM32_TIM3
+  +CONFIG_STM32_TIM1_PWM=y
+  +CONFIG_STM32_TIM1_MODE=0
+  +CONFIG_STM32_TIM1_CHANNEL=1
+  +CONFIG_STM32_TIM1_CHMODE=0
+  +CONFIG_STM32_TIM2_PWM=y
+  +CONFIG_STM32_TIM2_MODE=0
+  +CONFIG_STM32_TIM2_CHANNEL=2
+  +CONFIG_STM32_TIM2_CHMODE=0
+  +CONFIG_STM32_TIM3_PWM=y
+  +CONFIG_STM32_TIM3_MODE=0
+  +CONFIG_STM32_TIM3_CHANNEL=3
+  +CONFIG_STM32_TIM3_CHMODE=0
+
 PWM
 ===
 
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 379e20308d..ebde63bed7 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -701,6 +701,7 @@ CONFIG_SPI_EXCHANGE=y
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
@@ -969,6 +970,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile
index 5df2c4f662..7e3b47a826 100644
--- a/configs/stm32f4discovery/src/Makefile
+++ b/configs/stm32f4discovery/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm32f4discovery/src/Makefile
 #
-#   Copyright (C) 2011-2013, 2015 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2013, 2015-2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without