diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index ee97b9065d..ec50f2d29c 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -60,6 +60,7 @@
 # define CONFIG_RELAY      DISABLED
 # define MAG_ORIENTATION   AP_COMPASS_APM2_SHIELD
 # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN
+#  define CONFIG_BARO     AP_BARO_MS5611
 #endif
 
 // LED and IO Pins
@@ -121,6 +122,14 @@
 # endif
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
+// Barometer
+//
+
+#ifndef CONFIG_BARO
+# define CONFIG_BARO AP_BARO_BMP085
+#endif
+
 //////////////////////////////////////////////////////////////////////////////
 // Pitot
 //
diff --git a/ArduPlane/defines.h b/ArduPlane/defines.h
index afc3b892a9..49c6243d96 100644
--- a/ArduPlane/defines.h
+++ b/ArduPlane/defines.h
@@ -228,4 +228,7 @@ enum gcs_severity {
 #define APM_HARDWARE_APM1  1
 #define APM_HARDWARE_APM2 2
 
+#define AP_BARO_BMP085   1
+#define AP_BARO_MS5611   2
+
 #endif // _DEFINES_H