diff --git a/ArduCopter/APM_Config.h b/ArduCopter/APM_Config.h
index 2c0e9a9f11..98bf53b732 100644
--- a/ArduCopter/APM_Config.h
+++ b/ArduCopter/APM_Config.h
@@ -22,6 +22,7 @@
 //#define LOGGING_ENABLED       DISABLED            // disable dataflash logging to save 11K of flash space
 //#define MOUNT                 DISABLED            // disable the camera gimbal to save 8K of flash space
 //#define CLI_ENABLED           DISABLED            // disable the CLI (command-line-interface) to save 21K of flash space
+#define AUTOTUNE              DISABLED            // disable the auto tune functionality to save 7k of flash
 
 //#define HIL_MODE              HIL_MODE_SENSORS    // build for hardware-in-the-loop simulation
 
diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index bc6674757b..b8ad3822c1 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -450,7 +450,7 @@
 //////////////////////////////////////////////////////////////////////////////
 //  Auto Tuning
 #ifndef AUTOTUNE
- # define AUTOTUNE  DISABLED
+ # define AUTOTUNE  ENABLED
 #endif
 
 //////////////////////////////////////////////////////////////////////////////