diff --git a/ChangeLog b/ChangeLog
index 449a2bb76..4cba8e938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-31  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+	sfnt: Fix a data type mismatching with its source.
+
+	* src/sfnt/ttcmap.c (tt_cmap13_char_next): Fix the
+	type of `gindex' from FT_ULong to FT_UInt because
+	it is set by FT_UInt tt_cmap13_char_map_binary() or
+	TT_CMap13->cur_gindex.
+
 2009-07-31  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
 	sfnt: Extend a few local variables to load 32-bit values.
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 0aeae5003..54dceba09 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -2531,7 +2531,7 @@
                        FT_UInt32  *pchar_code )
   {
     TT_CMap13  cmap13 = (TT_CMap13)cmap;
-    FT_ULong   gindex;
+    FT_UInt    gindex;
 
 
     if ( cmap13->cur_charcode >= 0xFFFFFFFFUL )