diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index defab3c1a0..a483e98a93 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -176,7 +176,7 @@
 # endif
 #elif CONFIG_SONAR_SOURCE == SONAR_SOURCE_ANALOG_PIN
 # ifndef CONFIG_SONAR_SOURCE_ANALOG_PIN
-#  define CONFIG_SONAR_SOURCE_ANALOG_PIN A1
+#  define CONFIG_SONAR_SOURCE_ANALOG_PIN A0
 # endif
 #else
 # warning Invalid value for CONFIG_SONAR_SOURCE, disabling sonar
diff --git a/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde b/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde
index 19ec2e7a45..b26d1aab44 100644
--- a/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde
+++ b/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde
@@ -30,7 +30,7 @@ ModeFilter mode_filter;
     AP_ADC_ADS7844 adc;
     AP_AnalogSource_ADC adc_source(&adc, AP_RANGEFINDER_PITOT_TYPE_ADC_CHANNEL, 0.25);    // use Pitot tube
 #else
-    AP_AnalogSource_Arduino adc_source(A1);   // use AN1 analog pin (APM1: on oilpan at back right near the CLI switch.  APM2: on left)
+    AP_AnalogSource_Arduino adc_source(A0);   // use AN0 analog pin for APM2 on left
 #endif
 
 // create the range finder object