diff --git a/ChangeLog b/ChangeLog
index e23700325..fd8e89a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-31  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+	gxvalid: Guarantee `trak' table size upto 32-bit.
+
+	* src/gxvalid/gxvtrak.c (gxv_trak_validate):
+	The type of `offset' is changed from FT_UInt to
+	FT_Offset, for 16-bit platforms.
+
 2009-07-31  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
 	type1: Fix a data type mismatching with its source.
diff --git a/src/gxvalid/gxvtrak.c b/src/gxvalid/gxvtrak.c
index 432ee4e27..df3fd15c0 100644
--- a/src/gxvalid/gxvtrak.c
+++ b/src/gxvalid/gxvtrak.c
@@ -198,7 +198,7 @@
   {
     FT_Bytes          p = table;
     FT_Bytes          limit = 0;
-    FT_UInt           table_size;
+    FT_Offset         table_size;
 
     GXV_ValidatorRec  validrec;
     GXV_Validator     valid = &validrec;