diff --git a/ChangeLog b/ChangeLog
index 56ea48518..3c16866cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
 2007-04-02  David Turner  <david@freetype.org>
 
-	* src/autofit/aflatin.h, src/autofit/aflatin.c: add special code to
-	detect "extra-light" fonts and do not snap their stem widths too much
-	to avoid bizarre hinting effects.
+	Add special code to detect `extra-light' fonts and do not snap their
+	stem widths too much to avoid bizarre hinting effects.
+
+	* src/autofit/aflatin.h (AF_LatinAxisRec): Add `standard_width' and
+	`extra_light' members.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths): Initialize
+	them.
+	(af_latin_metrics_scale_dim): Set `extra_light'.
+	(af_latin_compute_stem_width): Use `extra_light'.
 
 2007-03-28  David Turner  <david@freetype.org>
 
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 59aaa8dcf..4cec6cb4b 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -525,10 +525,9 @@
       width->fit = width->cur;
     }
 
-   /* an extra-light axis corresponds to a standard width that is smaller
-    * than 0.75 pixels
-   */
-    axis->extra_light = (FT_MulFix(axis->standard_width, scale) < 32+8);
+    /* an extra-light axis corresponds to a standard width that is */
+    /* smaller than 0.75 pixels                                    */
+    axis->extra_light = FT_MulFix( axis->standard_width, scale ) < 32 + 8;
 
     if ( dim == AF_DIMENSION_VERT )
     {
@@ -1539,7 +1538,7 @@
 
 
     if ( !AF_LATIN_HINTS_DO_STEM_ADJUST( hints ) ||
-          axis->extra_light )
+          axis->extra_light                      )
       return width;
 
     if ( dist < 0 )
diff --git a/src/autofit/aflatin.h b/src/autofit/aflatin.h
index 756e7789a..3251d3783 100644
--- a/src/autofit/aflatin.h
+++ b/src/autofit/aflatin.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for latin script (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,       */