diff --git a/Images/mavstation.prototype b/Images/mavstation.prototype
new file mode 100644
index 000000000000..1834d5950827
--- /dev/null
+++ b/Images/mavstation.prototype
@@ -0,0 +1,12 @@
+{
+    "board_id": 20, 
+    "magic": "MAVSTATION", 
+    "description": "Firmware for the Mavstation board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "MAVSTATION",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}
diff --git a/makefiles/upload.mk b/makefiles/upload.mk
index 7619fb786c8a..6929cfd2cfc1 100644
--- a/makefiles/upload.mk
+++ b/makefiles/upload.mk
@@ -30,7 +30,7 @@ upload-serial-px4fmu-v1:	$(BUNDLE) $(UPLOADER)
 upload-serial-px4fmu-v2:	$(BUNDLE) $(UPLOADER)
 	$(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
 
-upload-serial-mavstation_default:    $(BUNDLE) $(UPLOADER)
+upload-serial-mavstation:    $(BUNDLE) $(UPLOADER)
 	$(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
 
 #
diff --git a/nuttx-configs/mavstation/nsh/appconfig b/nuttx-configs/mavstation/nsh/appconfig
index 979597d03844..420032d50548 100644
--- a/nuttx-configs/mavstation/nsh/appconfig
+++ b/nuttx-configs/mavstation/nsh/appconfig
@@ -35,7 +35,7 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/nsh
+#CONFIGURED_APPS += examples/nsh
 #CONFIGURED_APPS += examples/mavstation
 #CONFIGURED_APPS += examples/hello
 
diff --git a/nuttx-configs/mavstation/nsh/defconfig b/nuttx-configs/mavstation/nsh/defconfig
index 2b32b906575a..64ed0ceb97c9 100644
--- a/nuttx-configs/mavstation/nsh/defconfig
+++ b/nuttx-configs/mavstation/nsh/defconfig
@@ -73,7 +73,7 @@ CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP=stm32
-CONFIG_ARCH_CHIP_STM32F100C8=y
+CONFIG_ARCH_CHIP_STM32F102CB=y
 CONFIG_ARCH_BOARD=mavstation
 CONFIG_ARCH_BOARD_MAVSTATION=y
 CONFIG_BOARD_LOOPSPERMSEC=24000
@@ -111,7 +111,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n
 # Individual subsystems can be enabled:
 # AHB: 
 CONFIG_STM32_DMA1=y
-CONFIG_STM32_DMA2=y
+CONFIG_STM32_DMA2=n
 CONFIG_STM32_CRC=n
 # APB1:
 # Timers 2,3 and 4 are owned by the PWM driver
@@ -187,6 +187,8 @@ CONFIG_USART1_2STOP=0
 CONFIG_USART2_2STOP=0
 CONFIG_USART3_2STOP=0
 
+CONFIG_USART1_RXDMA=y
+SERIAL_HAVE_CONSOLE_DMA=y
 #
 # PX4IO specific driver settings
 #
diff --git a/src/modules/mavstation_firmware/mavstation.c b/src/modules/mavstation_firmware/mavstation.c
index bb6fc3fdfb64..d338b372e347 100644
--- a/src/modules/mavstation_firmware/mavstation.c
+++ b/src/modules/mavstation_firmware/mavstation.c
@@ -37,6 +37,7 @@
  */
 
 #include <nuttx/config.h>
+#include <nuttx/arch.h>
 
 #include <stdio.h>	// required for task_create
 #include <stdbool.h>