diff --git a/ChangeLog b/ChangeLog
index 4360a6f7d..89d66a63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
 2007-01-25  David Turner  <david@freetype.org>
 
-	* src/autofit/afhints.h, src/autofit/afhints.c, src/autofit/aftypes.h,
-	src/autofit/afwarp.c: light auto-hinting, improve glyph advance widths
-	and ressurect normal/full hinting to its normal quality
+	For light auto-hinting, improve glyph advance widths and resurrect
+	normal/full hinting to its normal quality.
+
+	* src/autofit/afhints.h (AF_GlyphHintsRec): New members `xmin_delta'
+	and `xmax_delta'.
+	* src/autofit/afhints.c (af_glyph_hints_reload): Reset `xmin_delta'
+	and `xmax_delta'.
+
+	* src/autofit/afloader.c (af_loader_load_g) <AF_USE_WARPER>: Replace
+	preprocessor conditional with if-clause, handling both light and
+	normal mode.
+
+	* src/autofit/afwarp.c (AF_WarpScore): Fine-tune again.
+	(af_warper_compute): Handle `xmin_delta' and `xmax_delta'.
 
 2007-01-25  Werner Lemberg  <wl@gnu.org>
 
diff --git a/src/autofit/afhints.h b/src/autofit/afhints.h
index fd43620d2..a983855b3 100644
--- a/src/autofit/afhints.h
+++ b/src/autofit/afhints.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines (specification).                        */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2005, 2006 by                                    */
+/*  Copyright 2003, 2004, 2005, 2006, 2007 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index 769aebf31..3265d79b9 100644
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter glyph loading routines (body).                           */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2005, 2006 by                                    */
+/*  Copyright 2003, 2004, 2005, 2006, 2007 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
diff --git a/src/autofit/afwarp.c b/src/autofit/afwarp.c
index 7af840c19..f5bb9b18a 100644
--- a/src/autofit/afwarp.c
+++ b/src/autofit/afwarp.c
@@ -318,8 +318,11 @@
       FT_Fixed  best_scale = warper->best_scale;
       FT_Pos    best_delta = warper->best_delta;
      
-      hints->xmin_delta = FT_MulFix( X1, best_scale-org_scale ) + best_delta;
-      hints->xmax_delta = FT_MulFix( X2, best_scale-org_scale ) + best_delta;
+
+      hints->xmin_delta = FT_MulFix( X1, best_scale - org_scale )
+                          + best_delta;
+      hints->xmax_delta = FT_MulFix( X2, best_scale - org_scale )
+                          + best_delta;
 
       *a_scale = best_scale;
       *a_delta = best_delta;