diff --git a/ArduPlane/system.pde b/ArduPlane/system.pde
index 021031a96f..7ed56e479d 100644
--- a/ArduPlane/system.pde
+++ b/ArduPlane/system.pde
@@ -120,7 +120,7 @@ static void init_ardupilot()
     battery.init();
 
     // init the GCS
-    gcs[0].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_Console);
+    gcs[0].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_Console, 0);
 
     // we start by assuming USB connected, as we initialed the serial
     // port with SERIAL0_BAUD. check_usb_mux() fixes this if need be.    
@@ -128,11 +128,11 @@ static void init_ardupilot()
     check_usb_mux();
 
     // setup serial port for telem1
-    gcs[1].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink1);
+    gcs[1].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 0);
 
 #if MAVLINK_COMM_NUM_BUFFERS > 2
     // setup serial port for telem2
-    gcs[2].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink2);
+    gcs[2].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 1);
 #endif
 
     // setup frsky
@@ -586,7 +586,7 @@ static void check_usb_mux(void)
     if (usb_connected) {
         serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_Console);
     } else {
-        serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_MAVLink1);
+        serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_MAVLink, 0);
     }
 #endif
 }