diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde
index 7bd96c274151105c233b3d4f29b3ff7fb6f556b2..b27814302fd9209ef22f99481677029d3b2a2957 100644
--- a/ArduCopter/ArduCopter.pde
+++ b/ArduCopter/ArduCopter.pde
@@ -209,9 +209,9 @@ AP_Baro_BMP085 barometer;
   #elif CONFIG_BARO == AP_BARO_PX4
 AP_Baro_PX4 barometer;
   #elif CONFIG_BARO == AP_BARO_MS5611
-   #if CONFIG_MS5611_SERIAL == SPI
+   #if CONFIG_MS5611_SERIAL == AP_BARO_MS5611_SPI
 AP_Baro_MS5611 barometer(&AP_Baro_MS5611::spi);
-   #elif CONFIG_MS5611_SERIAL == I2C
+   #elif CONFIG_MS5611_SERIAL == AP_BARO_MS5611_I2C
 AP_Baro_MS5611 barometer(&AP_Baro_MS5611::i2c);
    #else
     #error Unrecognized CONFIG_MS5611_SERIAL setting.
diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index 315068498877583387c5cc7e57ce64cdde3bb2f1..5df69c49735e672474e3b8c3fa9e49ce5bf3a741 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -63,7 +63,7 @@
   #  define CONFIG_BARO     AP_BARO_BMP085
  # else // APM2 Production Hardware (default)
   #  define CONFIG_BARO          AP_BARO_MS5611
-  #  define CONFIG_MS5611_SERIAL SPI
+  #  define CONFIG_MS5611_SERIAL AP_BARO_MS5611_SPI
  # endif
 #elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
  # define CONFIG_IMU_TYPE   CONFIG_IMU_SITL
diff --git a/ArduCopter/defines.h b/ArduCopter/defines.h
index ffc95a666e983a1125e7724cf660dc1262287e1d..52a401b2f7e41922d8a1c2a9aa06ff35a32dad6a 100644
--- a/ArduCopter/defines.h
+++ b/ArduCopter/defines.h
@@ -424,6 +424,9 @@ enum gcs_severity {
 #define AP_BARO_MS5611    2
 #define AP_BARO_PX4       3
 
+#define AP_BARO_MS5611_SPI 1
+#define AP_BARO_MS5611_I2C 2
+
 // Error message sub systems and error codes
 #define ERROR_SUBSYSTEM_MAIN                1
 #define ERROR_SUBSYSTEM_RADIO               2
diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index 33e82d6dd77d8fca0ab08532c2c1722275aac3dd..9ad9c9317ba763ab415914860e37929088b6b684 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -155,9 +155,9 @@ static AP_Baro_BMP085 barometer;
   #elif CONFIG_BARO == AP_BARO_PX4
 static AP_Baro_PX4 barometer;
   #elif CONFIG_BARO == AP_BARO_MS5611
-   #if CONFIG_MS5611_SERIAL == SPI
+   #if CONFIG_MS5611_SERIAL == AP_BARO_MS5611_SPI
 static AP_Baro_MS5611 barometer(&AP_Baro_MS5611::spi);
-   #elif CONFIG_MS5611_SERIAL == I2C
+   #elif CONFIG_MS5611_SERIAL == AP_BARO_MS5611_I2C
 static AP_Baro_MS5611 barometer(&AP_Baro_MS5611::i2c);
    #else
     #error Unrecognized CONFIG_MS5611_SERIAL setting.
diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index 0b10d81ebb56ef19dc38f227cd8bbb2579ecb6de..ea3ad9d44cd6fad12100671e6d4aabca0d4e4ebf 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -121,7 +121,7 @@
  #  define CONFIG_BARO     AP_BARO_BMP085
  # else // APM2 Production Hardware (default)
  #  define CONFIG_BARO          AP_BARO_MS5611
- #  define CONFIG_MS5611_SERIAL SPI
+ #  define CONFIG_MS5611_SERIAL AP_BARO_MS5611_SPI
  # endif
 #elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
  # define A_LED_PIN        27
diff --git a/Tools/VARTest/config.h b/Tools/VARTest/config.h
index 5e30d213cef4cda9f076eca91f63c98257441245..3ffa73ac25845fbbce842b31d2ab169ef6443a03 100644
--- a/Tools/VARTest/config.h
+++ b/Tools/VARTest/config.h
@@ -54,7 +54,7 @@
 # define CONFIG_PITOT_SOURCE PITOT_SOURCE_ANALOG_PIN
 # define MAGNETOMETER ENABLED
 # define CONFIG_BARO     AP_BARO_MS5611
-# define CONFIG_MS5611_SERIAL SPI
+# define CONFIG_MS5611_SERIAL AP_BARO_MS5611_SPI
 
 # define A_LED_PIN        27
 # define B_LED_PIN        26