diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index 6ae6c3912e..0d7a197062 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -150,7 +150,7 @@
 #endif
 
 #ifndef RANGEFINDER_TILT_CORRECTION         // by disable tilt correction for use of range finder data by EKF
- # define RANGEFINDER_TILT_CORRECTION DISABLED
+ # define RANGEFINDER_TILT_CORRECTION ENABLED
 #endif
 
 
diff --git a/ArduCopter/sensors.cpp b/ArduCopter/sensors.cpp
index 4bff7ff16a..a69075866b 100644
--- a/ArduCopter/sensors.cpp
+++ b/ArduCopter/sensors.cpp
@@ -49,11 +49,9 @@ void Copter::read_rangefinder(void)
 
     int16_t temp_alt = rangefinder.distance_cm();
 
- #if RANGEFINDER_TILT_CORRECTION == 1
+ #if RANGEFINDER_TILT_CORRECTION == ENABLED
     // correct alt for angle of the rangefinder
-    float temp = ahrs.cos_pitch() * ahrs.cos_roll();
-    temp = MAX(temp, 0.707f);
-    temp_alt = (float)temp_alt * temp;
+    temp_alt = (float)temp_alt * MAX(0.707f, ahrs.get_rotation_body_to_ned().c.z);
  #endif
 
     rangefinder_alt = temp_alt;