diff --git a/ChangeLog b/ChangeLog
index c025dc75423bdecde7ad0bd9bc9e28b20be72655..c54bc90dde468a6e6e3e2ecd57725b03ca803008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -929,3 +929,6 @@
 	  that these typose don't make any difference as long as you use only one
 	  serial port and all uarts are configured the same.  But the typos are bugs
 	  waiting to happen in any other configuration.
+	* arch/arm/src/stm32/ - You have to configure CTS/RTS function pins for USART
+	  2 and USART 3 even if you are not using flow control.
+
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 5e2fbbdaadce7d89664cac2d1d347061956bc69e..20c28ed3bc0aeb9f7f27af15bac3d2e3b9b9f792 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -1581,6 +1581,8 @@ nuttx-0.4.13 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
 	  that these typose don't make any difference as long as you use only one
 	  serial port and all uarts are configured the same.  But the typos are bugs
 	  waiting to happen in any other configuration.
+	* arch/arm/src/stm32/ - You have to configure CTS/RTS function pins for USART
+	  2 and USART 3 even if you are not using flow control.
 
 pascal-0.1.3 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
 
diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c
index e2ead3772ce877c4c3cf74b9ab6210d75222b833..2ba0f65a9708cd8cd71142734a8207f6859d2e23 100644
--- a/arch/arm/src/stm32/stm32_lowputc.c
+++ b/arch/arm/src/stm32/stm32_lowputc.c
@@ -298,6 +298,8 @@ void stm32_lowsetup(void)
 
   stm32_configgpio(GPIO_USART2_TX);
   stm32_configgpio(GPIO_USART2_RX);
+  stm32_configgpio(GPIO_USART2_CTS);
+  stm32_configgpio(GPIO_USART2_RTS);
 #endif /* CONFIG_STM32_USART2 */
 
 #ifdef CONFIG_STM32_USART3
@@ -323,6 +325,8 @@ void stm32_lowsetup(void)
 
   stm32_configgpio(GPIO_USART3_TX);
   stm32_configgpio(GPIO_USART3_RX);
+  stm32_configgpio(GPIO_USART3_CTS);
+  stm32_configgpio(GPIO_USART3_RTS);
 #endif /* CONFIG_STM32_USART3 */
 
   /* Enable and configure the selected console device */