diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index db0655326f..b1869386b3 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -660,7 +660,7 @@ then
 
 			if ver hwcmp AEROFC_V1
 			then
-				set MAVLINK_F "-r 1200 -d /dev/ttyS4"
+				set MAVLINK_F "-r 1200 -d /dev/ttyS3"
 			fi
 		fi
 
diff --git a/nuttx-configs/aerofc-v1/include/board.h b/nuttx-configs/aerofc-v1/include/board.h
index 3ce4cfe7d2..f895535d47 100644
--- a/nuttx-configs/aerofc-v1/include/board.h
+++ b/nuttx-configs/aerofc-v1/include/board.h
@@ -229,10 +229,10 @@
 #define GPIO_USART2_RTS	0 // unused
 
 // GPS
-#define GPIO_USART3_TX	GPIO_USART3_TX_1
-#define GPIO_USART3_RX	GPIO_USART3_RX_1
-#define GPIO_USART3_CTS	0 // unused
-#define GPIO_USART3_RTS	0 // unused
+#define GPIO_UART7_TX	GPIO_UART7_TX_1
+#define GPIO_UART7_RX	GPIO_UART7_RX_1
+#define GPIO_UART7_CTS	0 // unused
+#define GPIO_UART7_RTS	0 // unused
 
 // RC
 #define GPIO_UART4_TX	GPIO_UART4_TX_1
diff --git a/nuttx-configs/aerofc-v1/nsh/defconfig b/nuttx-configs/aerofc-v1/nsh/defconfig
index f65d1f738c..7634826ff4 100644
--- a/nuttx-configs/aerofc-v1/nsh/defconfig
+++ b/nuttx-configs/aerofc-v1/nsh/defconfig
@@ -421,11 +421,11 @@ CONFIG_STM32_TIM11=y
 # CONFIG_STM32_TIM14 is not set
 CONFIG_STM32_USART1=y
 CONFIG_STM32_USART2=y
-CONFIG_STM32_USART3=y
+# CONFIG_STM32_USART3 is not set
 CONFIG_STM32_UART4=y
 CONFIG_STM32_UART5=y
 CONFIG_STM32_USART6=y
-# CONFIG_STM32_UART7 is not set
+CONFIG_STM32_UART7=y
 # CONFIG_STM32_UART8 is not set
 # CONFIG_STM32_IWDG is not set
 CONFIG_STM32_WWDG=y
@@ -487,10 +487,10 @@ CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 CONFIG_USART2_RXDMA=y
-CONFIG_STM32_USART3_SERIALDRIVER=y
+# CONFIG_STM32_USART3_SERIALDRIVER is not set
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
-CONFIG_USART3_RXDMA=y
+# CONFIG_USART3_RXDMA is not set
 CONFIG_STM32_UART4_SERIALDRIVER=y
 # CONFIG_STM32_UART4_1WIREDRIVER is not set
 # CONFIG_UART4_RS485 is not set
@@ -503,6 +503,10 @@ CONFIG_STM32_USART6_SERIALDRIVER=y
 # CONFIG_STM32_USART6_1WIREDRIVER is not set
 # CONFIG_USART6_RS485 is not set
 CONFIG_USART6_RXDMA=y
+CONFIG_STM32_UART7_SERIALDRIVER=y
+# CONFIG_STM32_UART7_1WIREDRIVER is not set
+# CONFIG_UART7_RS485 is not set
+CONFIG_UART7_RXDMA=y
 
 #
 # Serial Driver Configuration
@@ -891,14 +895,14 @@ CONFIG_SERIAL_CONSOLE=y
 CONFIG_UART4_SERIALDRIVER=y
 CONFIG_UART5_SERIALDRIVER=y
 # CONFIG_UART6_SERIALDRIVER is not set
-# CONFIG_UART7_SERIALDRIVER is not set
+CONFIG_UART7_SERIALDRIVER=y
 # CONFIG_UART8_SERIALDRIVER is not set
 # CONFIG_SCI0_SERIALDRIVER is not set
 # CONFIG_SCI1_SERIALDRIVER is not set
 # CONFIG_USART0_SERIALDRIVER is not set
 CONFIG_USART1_SERIALDRIVER=y
 CONFIG_USART2_SERIALDRIVER=y
-CONFIG_USART3_SERIALDRIVER=y
+# CONFIG_USART3_SERIALDRIVER is not set
 # CONFIG_USART4_SERIALDRIVER is not set
 # CONFIG_USART5_SERIALDRIVER is not set
 CONFIG_USART6_SERIALDRIVER=y
@@ -918,6 +922,7 @@ CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 # CONFIG_UART4_SERIAL_CONSOLE is not set
 # CONFIG_UART5_SERIAL_CONSOLE is not set
 CONFIG_USART6_SERIAL_CONSOLE=y
+# CONFIG_UART7_SERIAL_CONSOLE is not set
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
@@ -947,19 +952,6 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USART2_OFLOWCONTROL is not set
 # CONFIG_USART2_DMA is not set
 
-#
-# USART3 Configuration
-#
-CONFIG_USART3_RXBUFSIZE=300
-CONFIG_USART3_TXBUFSIZE=300
-CONFIG_USART3_BAUD=57600
-CONFIG_USART3_BITS=8
-CONFIG_USART3_PARITY=0
-CONFIG_USART3_2STOP=0
-# CONFIG_USART3_IFLOWCONTROL is not set
-# CONFIG_USART3_OFLOWCONTROL is not set
-# CONFIG_USART3_DMA is not set
-
 #
 # UART4 Configuration
 #
@@ -1007,6 +999,19 @@ CONFIG_USART6_2STOP=0
 # CONFIG_DRIVERS_WIRELESS is not set
 # CONFIG_DRIVERS_CONTACTLESS is not set
 
+#
+# UART7 Configuration
+#
+CONFIG_UART7_RXBUFSIZE=300
+CONFIG_UART7_TXBUFSIZE=300
+CONFIG_UART7_BAUD=57600
+CONFIG_UART7_BITS=8
+CONFIG_UART7_PARITY=0
+CONFIG_UART7_2STOP=0
+# CONFIG_UART7_IFLOWCONTROL is not set
+# CONFIG_UART7_OFLOWCONTROL is not set
+# CONFIG_UART7_DMA is not set
+
 #
 # System Logging
 #
diff --git a/src/drivers/boards/aerofc-v1/board_config.h b/src/drivers/boards/aerofc-v1/board_config.h
index aa657f7567..416b79ea92 100644
--- a/src/drivers/boards/aerofc-v1/board_config.h
+++ b/src/drivers/boards/aerofc-v1/board_config.h
@@ -118,12 +118,12 @@
 /*
  * GPS
  */
-#define GPS_DEFAULT_UART_PORT	"/dev/ttyS2"
+#define GPS_DEFAULT_UART_PORT	"/dev/ttyS5"
 
 /*
  * RC Serial port
  */
-#define RC_SERIAL_PORT		"/dev/ttyS3"
+#define RC_SERIAL_PORT		"/dev/ttyS2"
 /* No invert support */
 #define INVERT_RC_INPUT(_invert_true)		while(0)