diff --git a/ChangeLog b/ChangeLog
index cfc9bb0..8872cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-05-02  Alexei Podtelezhnikov  <address@hidden>
+
+	[ftdiff, ftgrid, ftview] Make warping NORMAL option.
+
+	* src/ftdiff.c (render_state_draw, event_help): Updated.
+	* src/ftgrid.c (event_help, event_warping_change): Updated.
+	* src/ftview.c (event_help, event_warping_change, write_header):
+	Updated.
+
 2017-05-02  Werner Lemberg  <address@hidden>
 
 	Remove `slight' auto-hinting mode.  Add sub-pixel `light' mode.
diff --git a/src/ftdiff.c b/src/ftdiff.c
index e320861..15a2228 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -832,7 +832,7 @@
           }
         }
       }
-      else if ( rmode == HINT_MODE_AUTOHINT_LIGHT )
+      else if ( rmode == HINT_MODE_AUTOHINT )
         extra = warping ? " (+warp)" : " (-warp)";
 
       sprintf( temp, "%s%s",
@@ -1138,7 +1138,7 @@
     grWriteln( "  d            toggle lsb/rsb deltas" );
     grWriteln( "  h            cycle hinting mode" );
     grWriteln( "  H            cycle hinting engine (if CFF or TTF)" );
-    grWriteln( "  w            toggle warping (if light auto-hinting" );
+    grWriteln( "  w            toggle warping (if normal auto-hinting" );
     grWriteln( "  k            toggle kerning (only from `kern' table)" );
     grWriteln( "  r            toggle rendering mode" );
     grWriteln( "  x            toggle layout mode" );
diff --git a/src/ftgrid.c b/src/ftgrid.c
index ce7a567..d642dc7 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -981,7 +981,7 @@
     grWriteln( "Up, Down    adjust size by 0.5pt        if not auto-hinting:                " );
     grWriteln( "                                          H         cycle through hinting   " );
     grWriteln( "Left, Right adjust index by 1                        engines (if available) " );
-    grWriteln( "F7, F8      adjust index by 10          if light auto-hinting:              " );
+    grWriteln( "F7, F8      adjust index by 10          if normal auto-hinting:             " );
     grWriteln( "F9, F10     adjust index by 100           w         toggle warping          " );
     grWriteln( "F11, F12    adjust index by 1000                      (if available)        " );
     grWriteln( "                                                                            " );
@@ -1072,7 +1072,7 @@
   static void
   event_warping_change( void )
   {
-    if ( handle->lcd_mode == LCD_MODE_LIGHT )
+    if ( handle->lcd_mode == LCD_MODE_AA && handle->autohint )
     {
       FT_Bool  new_warping_state = !status.warping;
 
@@ -1095,7 +1095,7 @@
                                      : "warping disabled";
     }
     else
-      status.header = "need light anti-aliasing mode to toggle warping";
+      status.header = "need normal anti-aliasing mode to toggle warping";
   }
 
 
diff --git a/src/ftview.c b/src/ftview.c
index 730855c..ea65d11 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -775,8 +775,8 @@
     grWriteln( "             engines (if available)                                         " );
     grWriteln( "f           toggle forced auto-         g, v        adjust gamma value      " );
     grWriteln( "             hinting (if hinting)                                           " );
-    grWriteln( "w           toggle warping (in light    Tab         cycle through charmaps  " );
-    grWriteln( "             AA mode, if available)                                         " );
+    grWriteln( "w           toggle warping              Tab         cycle through charmaps  " );
+    grWriteln( "             (if available)                                                 " );
     grWriteln( "                                                                            " );
     grWriteln( "                                        q, ESC      quit ftview             " );
     /*          |----------------------------------|    |----------------------------------| */
@@ -848,7 +848,7 @@
   static int
   event_warping_change( void )
   {
-    if ( handle->lcd_mode == LCD_MODE_LIGHT )
+    if ( handle->lcd_mode == LCD_MODE_AA && handle->autohint )
     {
       FT_Bool  new_warping_state = !status.warping;
 
@@ -1730,7 +1730,7 @@
       }
     }
 
-    if ( handle->lcd_mode == LCD_MODE_LIGHT )
+    if ( handle->lcd_mode == LCD_MODE_AA && handle->autohint )
     {
       sprintf( buf, "warping: %s",
                     status.warping ? "on" : "off" );