diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index 06b835b078..5ea25c0c8d 100755
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -358,8 +358,10 @@ Quadrature Encode Timer Inputs
 ------------------------------
 
 If enabled (by setting CONFIG_QENCODER=y), then quadrature encoder will
-user TIM2 (see nsh/defconfig) and input pins PA15, and PA1 for CH1 and
-CH2, respectively (see include board.h).
+use either TIM2 or TIM8 (see nsh/defconfig).  If TIM2 is selected, the input 
+pins PA15 and PA1 for CH1 and CH2, respectively).  If TIM8 is selected, then
+PC6 and PI5 will be used for CH1 and CH2  (see include board.h for pin
+definitions).
 
 FPU
 ===
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 051de38626..fead7980df 100755
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -327,11 +327,12 @@ CONFIG_STM32_TIM4_CHANNEL=2
 #
 # Quadrature Encoder configuration.
 #
-# Uses TIM2 (CONFIG_STM32_TIM2=y above)
+# Uses TIM2 or TIM8.  TIM2 also needs CONFIG_STM32_TIM2=y; TIM8 needs CONFIG_STM_TIM8 above.
 # 
 #
 CONFIG_QENCODER=n
-CONFIG_STM32_TIM2_QE=y
+CONFIG_STM32_TIM2_QE=n
+CONFIG_STM32_TIM8_QE=y
 
 #
 # General build options