diff --git a/conf/boards/opa_ap_1.0.makefile b/conf/boards/opa_ap_1.0.makefile
index 7648433c5b..131c587474 100644
--- a/conf/boards/opa_ap_1.0.makefile
+++ b/conf/boards/opa_ap_1.0.makefile
@@ -42,7 +42,7 @@ GPS_PORT ?= UART1
 GPS_BAUD ?= B57600
 
 INTERMCU_PORT ?= UART3
-INTERMCU_BAUD ?= B230400
+INTERMCU_BAUD ?= B460800
 
 #
 # default IMU configuration
diff --git a/conf/boards/opa_ftd_1.0.makefile b/conf/boards/opa_ftd_1.0.makefile
index e2b9abea6e..f396daff0c 100644
--- a/conf/boards/opa_ftd_1.0.makefile
+++ b/conf/boards/opa_ftd_1.0.makefile
@@ -40,7 +40,10 @@ MODEM_PORT ?= UART3
 MODEM_BAUD ?= B19200
 
 INTERMCU_PORT ?= UART2
-INTERMCU_BAUD ?= B230400
+INTERMCU_BAUD ?= B460800
+
+GPS_PORT ?= UART4
+GPS_BAUD ?= B57600
 
 #
 # default actuator configuration
diff --git a/sw/airborne/arch/stm32/mcu_periph/uart_arch.h b/sw/airborne/arch/stm32/mcu_periph/uart_arch.h
index eff41e7520..28ee449907 100644
--- a/sw/airborne/arch/stm32/mcu_periph/uart_arch.h
+++ b/sw/airborne/arch/stm32/mcu_periph/uart_arch.h
@@ -39,6 +39,7 @@
 #define B100000   100000
 #define B115200   115200
 #define B230400   230400
+#define B460800   460800
 #define B921600   921600
 #define B1500000 1500000
 #define B3000000 3000000