diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c
index 8166de513d6..fe6f513867c 100644
--- a/arch/arm/src/stm32/stm32_lowputc.c
+++ b/arch/arm/src/stm32/stm32_lowputc.c
@@ -291,7 +291,7 @@ void stm32_lowsetup(void)
    */
 
 #ifdef CONFIG_STM32_USART2_REMAP
-  mapr |= ~AFIO_MAPR_USART2_REMAP;
+  mapr |= AFIO_MAPR_USART2_REMAP;
 #else
   mapr &= ~AFIO_MAPR_USART2_REMAP;
 #endif
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index 9e5de150a62..a529285f451 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/stm32/stm32_serial.c
  *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -659,7 +659,7 @@ static int up_interrupt(int irq, void *context)
 
       /* Get the masked USART status and clear the pending interrupts. */
 
-      priv->sr = up_serialin(priv,  STM32_USART_SR_OFFSET);
+      priv->sr = up_serialin(priv, STM32_USART_SR_OFFSET);
 
       /* USART interrupts:
        *