diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index 865e1e017c..ac4e692f13 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -52,6 +52,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
 
 
@@ -133,6 +134,14 @@
 # define CONFIG_RELAY ENABLED
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
+// Barometer
+//
+
+#ifndef CONFIG_BARO
+# define CONFIG_BARO AP_BARO_BMP085
+#endif
+
 //////////////////////////////////////////////////////////////////////////////
 // Sonar
 //
diff --git a/ArduCopter/defines.h b/ArduCopter/defines.h
index 67662503c4..41d7cda3c7 100644
--- a/ArduCopter/defines.h
+++ b/ArduCopter/defines.h
@@ -354,4 +354,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