diff --git a/ChangeLog b/ChangeLog
index d49e88a45..0de61b536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-04-21  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] By default, enable warping code but switch off warping.
+
+	Suggested by Behdad.
+
+	* include/config/ftoption.h: Define AF_CONFIG_OPTION_USE_WARPER.
+
+	* src/autofit/afmodule.c (af_autofitter_init): Initialize `warping'
+	with `false'.
+
 2015-04-21  Werner Lemberg  <wl@gnu.org>
 
 	* docs/CHANGES: Updated.
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 805fe3de4..ed63aa0cf 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -823,7 +823,7 @@ FT_BEGIN_HEADER
   /* This experimental option is active only if the rendering mode is      */
   /* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the      */
   /* `warping' property of the auto-hinter (see file `ftautoh.h' for more  */
-  /* information).                                                         */
+  /* information; by default it is switched off).                          */
   /*                                                                       */
 #define AF_CONFIG_OPTION_USE_WARPER
 
diff --git a/docs/CHANGES b/docs/CHANGES
index 67b703729..dc851da39 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -34,7 +34,9 @@ CHANGES BETWEEN 2.5.5 and 2.6
 
     - A new auto-hinter  property `warping' can switch on  and off the
       warping code  if this  experimental feature  is compiled  in (by
-      defining the AF_CONFIG_OPTION_USE_WARPER configuration option).
+      defining the  AF_CONFIG_OPTION_USE_WARPER  configuration option;
+      by default  this option is  now enabled but  warping is switched
+      off).
 
       The AF_CONFIG_OPTION_USE_WARPER option itself is an old feature,
       available   since  2006.    Warping   only   works  in   `light'
diff --git a/include/config/ftoption.h b/include/config/ftoption.h
index 2243fcc82..1536c7236 100644
--- a/include/config/ftoption.h
+++ b/include/config/ftoption.h
@@ -823,9 +823,9 @@ FT_BEGIN_HEADER
   /* This experimental option is active only if the rendering mode is      */
   /* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the      */
   /* `warping' property of the auto-hinter (see file `ftautoh.h' for more  */
-  /* information).                                                         */
+  /* information; by default it is switched off).                          */
   /*                                                                       */
-/* #define AF_CONFIG_OPTION_USE_WARPER */
+#define AF_CONFIG_OPTION_USE_WARPER
 
   /* */
 
diff --git a/include/ftautoh.h b/include/ftautoh.h
index 3f0ff9dec..cf7b76f49 100644
--- a/include/ftautoh.h
+++ b/include/ftautoh.h
@@ -411,12 +411,12 @@ FT_BEGIN_HEADER
    *   glyph's optimal scaling and shifting value, various parameter
    *   combinations are tried and scored.
    *
-   *   By default, warping is on.  The example below shows how to switch off
+   *   By default, warping is off.  The example below shows how to switch on
    *   warping (omitting the error handling).
    *
    *   {
    *     FT_Library  library;
-   *     FT_Bool     warping = 0;
+   *     FT_Bool     warping = 1;
    *
    *
    *     FT_Init_FreeType( &library );
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c
index 57f97e921..e0cf99440 100644
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -281,7 +281,7 @@
     module->fallback_style = AF_STYLE_FALLBACK;
     module->default_script = AF_SCRIPT_DEFAULT;
 #ifdef AF_CONFIG_OPTION_USE_WARPER
-    module->warping        = 1;
+    module->warping        = 0;
 #endif
 
     return FT_Err_Ok;