diff --git a/ChangeLog b/ChangeLog
index e4320ca20..f43832dd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,19 +3,19 @@
 	* src/autofit/afcjk.c (af_cjk_metrics_init): Fix a stupid bug...
 
 	* src/autofit/aflatin.c (af_latin_metrics_init_widths): Use
-	AF_LatinMetricsRec as the dummy metrics because we cast the metrics to
-	it later in `af_latin_hints_link_segments'.
+	AF_LatinMetricsRec as the dummy metrics because we cast the metrics
+	to it later in `af_latin_hints_link_segments'.
 
 2006-02-11  Chia-I Wu  <b90201047@ntu.edu.tw>
 
 	* include/freetype/config/ftoption.h (AF_CONFIG_OPTION_CJK): #define
-	to enable autofit CJK script support. (#define'd by default)
+	to enable autofit CJK script support.  (#define'd by default.)
 
 	* src/autofit/aflatin.h (AF_LATIN_CONSTANT): New macro.
 
-	* src/autofit/aflatin.c (af_latin_metrics_init_widths): Make sure that
-	`edge_distance_threshold' is always set.
-	(af_latin_hints_link_segments): Potential divide by 0 bug.
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths): Make sure
+	that `edge_distance_threshold' is always set.
+	(af_latin_hints_link_segments): Potential divide-by-zero bug.
 	Use latin constant in the scoring formula.
 
 	* src/autofit/afcjk.c: Minor updates due to the above three changes.
diff --git a/docs/CHANGES b/docs/CHANGES
index f857684e2..1ea069103 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -132,8 +132,9 @@ LATEST CHANGES BETWEEN 2.2.0 and 2.1.10
 
     - Better AFM support.  This includes track kerning support.
 
-    - The  auto hinter now employs  a new algorithm, based  on akito's
-      patch, for the CJK script.
+    - The  auto hinter  now employs  a new  algorithm,  based on Akito
+      Hirai's patch, for the CJK script.
+
 
 ======================================================================
 
diff --git a/docs/TODO b/docs/TODO
index 3c462ee4c..7a3225979 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -33,7 +33,7 @@ Other bugs have been registered at the savannah bugzilla of FreeType.
 
 ------------------------------------------------------------------------
 
-Copyright 2001, 2002, 2003, 2004, 2005 by
+Copyright 2001, 2002, 2003, 2004, 2005, 2006 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/aflatin.h b/src/autofit/aflatin.h
index aa1415010..e73c44ad1 100644
--- a/src/autofit/aflatin.h
+++ b/src/autofit/aflatin.h
@@ -33,7 +33,8 @@ FT_BEGIN_HEADER
 
 /* constants are given with units_per_em == 2048 in mind */
 #define AF_LATIN_CONSTANT( metrics, c ) \
-  ( ( ( c ) * (FT_Long)( (AF_LatinMetrics)metrics )->units_per_em ) / 2048 )
+  ( ( (c) * (FT_Long)( (AF_LatinMetrics)(metrics) )->units_per_em ) / 2048 )
+
 
   /*************************************************************************/
   /*************************************************************************/