diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde
index c1e32f1e6501f9f77177ad7da42a88abde1bcd54..38a40e4c71ac8494572ea29498a40be26bb062fa 100644
--- a/ArduCopter/ArduCopter.pde
+++ b/ArduCopter/ArduCopter.pde
@@ -1339,7 +1339,7 @@ static void slow_loop()
         read_control_switch();
 
 #if MOUNT == ENABLED
-        update_aux_servo_function(&g.rc_9, &g.rc_10, &g.rc_11);
+        update_aux_servo_function(&g.rc_5, &g.rc_6, &g.rc_7, &g.rc_8, &g.rc_10, &g.rc_11);
 #endif
         enable_aux_servos();
 
diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h
index 793f7145eaf4e51ea1394e0e3fd9a6372ffd099b..0c811dda6debe4f24950d58785c922c3f1c146c4 100644
--- a/ArduCopter/Parameters.h
+++ b/ArduCopter/Parameters.h
@@ -17,7 +17,7 @@ public:
     // The increment will prevent old parameters from being used incorrectly
     // by newer code.
     //
-    static const uint16_t        k_format_version = 118;
+    static const uint16_t        k_format_version = 119;
 
     // The parameter software_type is set up solely for ground station use
     // and identifies the software type (eg ArduPilotMega versus
@@ -147,8 +147,8 @@ public:
         k_param_rc_6,
         k_param_rc_7,
         k_param_rc_8,
-        k_param_rc_9,
         k_param_rc_10,
+        k_param_rc_11,
         k_param_throttle_min,
         k_param_throttle_max,
         k_param_throttle_fs_enabled,
@@ -160,7 +160,6 @@ public:
         k_param_radio_tuning_high,
         k_param_radio_tuning_low,
         k_param_rc_speed = 192,
-        k_param_rc_11 = 193,
 
         //
         // 200: flight modes
@@ -317,13 +316,12 @@ public:
     RC_Channel              rc_2;
     RC_Channel              rc_3;
     RC_Channel              rc_4;
-    RC_Channel              rc_5;
-    RC_Channel              rc_6;
-    RC_Channel              rc_7;
-    RC_Channel              rc_8;
+    RC_Channel_aux          rc_5;
+    RC_Channel_aux          rc_6;
+    RC_Channel_aux          rc_7;
+    RC_Channel_aux          rc_8;
 
 #if MOUNT == ENABLED
-    RC_Channel_aux          rc_9;
     RC_Channel_aux          rc_10;
     RC_Channel_aux          rc_11;
 #endif
@@ -375,7 +373,6 @@ public:
         rc_7                                        (CH_7),
         rc_8                                        (CH_8),
 #if MOUNT == ENABLED
-        rc_9                                        (CH_9),
         rc_10                                       (CH_10),
         rc_11                                       (CH_11),
 #endif
diff --git a/ArduCopter/Parameters.pde b/ArduCopter/Parameters.pde
index 6b5bc6fd0522f6e56c9b45644448934b9c21aef9..686947113e7e3cc6240a6563fe10bcfe3113aa3b 100644
--- a/ArduCopter/Parameters.pde
+++ b/ArduCopter/Parameters.pde
@@ -224,23 +224,19 @@ const AP_Param::Info var_info[] PROGMEM = {
     // @Path: ../libraries/RC_Channel/RC_Channel.cpp
     GGROUP(rc_4,    "RC4_", RC_Channel),
     // @Group: RC5_
-    // @Path: ../libraries/RC_Channel/RC_Channel.cpp
-    GGROUP(rc_5,    "RC5_", RC_Channel),
+    // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
+    GGROUP(rc_5,    "RC5_", RC_Channel_aux),
     // @Group: RC6_
-    // @Path: ../libraries/RC_Channel/RC_Channel.cpp
-    GGROUP(rc_6,    "RC6_", RC_Channel),
+    // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
+    GGROUP(rc_6,    "RC6_", RC_Channel_aux),
     // @Group: RC7_
-    // @Path: ../libraries/RC_Channel/RC_Channel.cpp
-    GGROUP(rc_7,    "RC7_", RC_Channel),
+    // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
+    GGROUP(rc_7,    "RC7_", RC_Channel_aux),
     // @Group: RC8_
-    // @Path: ../libraries/RC_Channel/RC_Channel.cpp
-    GGROUP(rc_8,    "RC8_", RC_Channel),
-
-#if MOUNT == ENABLED
-    // @Group: RC9_
     // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
-    GGROUP(rc_9,                    "RC9_", RC_Channel_aux),
+    GGROUP(rc_8,    "RC8_", RC_Channel_aux),
 
+#if MOUNT == ENABLED
     // @Group: RC10_
     // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
     GGROUP(rc_10,                    "RC10_", RC_Channel_aux),
diff --git a/ArduCopter/radio.pde b/ArduCopter/radio.pde
index e2fd14e66e572f289b99cadb54fc67cb3c273cf3..2c78c68e6ccfaf2efda3da6bc1a76b04c0133960 100644
--- a/ArduCopter/radio.pde
+++ b/ArduCopter/radio.pde
@@ -56,7 +56,7 @@ static void init_rc_in()
     g.rc_8.set_range(0,1000);
 
 #if MOUNT == ENABLED
-    update_aux_servo_function(&g.rc_9, &g.rc_10, &g.rc_11);
+    update_aux_servo_function(&g.rc_5, &g.rc_6, &g.rc_7, &g.rc_8, &g.rc_10, &g.rc_11);
 #endif
 }