diff --git a/ChangeLog b/ChangeLog
index 4efedbe4e..bd2599a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-15  Werner Lemberg  <wl@gnu.org>
+
+	Really fix FreeDesktop bug #21197.
+	This also fixes Savannah bug #28021.
+
+	* src/autofit/aflatin.c (af_latin_metrics_check_digits),
+	src/autofit/aflatin2.c (af_latin2_metrics_check_digits): Fix loop.
+
 2009-11-15  Werner Lemberg  <wl@gnu.org>
 
 	Add tracing messages for advance values.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 394fb9789..e6882d5e7 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -402,16 +402,16 @@
   af_latin_metrics_check_digits( AF_LatinMetrics  metrics,
                                  FT_Face          face )
   {
-    FT_UInt  i;
-    FT_Bool  started = 0, same_width = 1;
+    FT_UInt   i;
+    FT_Bool   started = 0, same_width = 1;
+    FT_Fixed  advance, old_advance = 0;
 
 
     /* check whether all ASCII digits have the same advance width; */
     /* digit `0' is 0x30 in all supported charmaps                 */
     for ( i = 0x30; i <= 0x39; i++ )
     {
-      FT_UInt   glyph_index;
-      FT_Fixed  advance, old_advance = 0;
+      FT_UInt  glyph_index;
 
 
       glyph_index = FT_Get_Char_Index( face, i );
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index 5e2ad48c4..5cbeb296b 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -407,16 +407,16 @@
   af_latin2_metrics_check_digits( AF_LatinMetrics  metrics,
                                   FT_Face          face )
   {
-    FT_UInt  i;
-    FT_Bool  started = 0, same_width = 1;
+    FT_UInt   i;
+    FT_Bool   started = 0, same_width = 1;
+    FT_Fixed  advance, old_advance = 0;
 
 
     /* check whether all ASCII digits have the same advance width; */
     /* digit `0' is 0x30 in all supported charmaps                 */
     for ( i = 0x30; i <= 0x39; i++ )
     {
-      FT_UInt   glyph_index;
-      FT_Fixed  advance, old_advance;
+      FT_UInt  glyph_index;
 
 
       glyph_index = FT_Get_Char_Index( face, i );