diff --git a/ChangeLog b/ChangeLog
index 597ecb693..874e6e501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-16  Werner Lemberg  <wl@gnu.org>
+
+	Fix compiler warnings.
+	Reported by Kevin Blenkinsopp <arqon@promode.org>.
+
+	* src/sfnt/ttload.c (check_table_dir): Use proper data type.
+
 2009-11-15  Werner Lemberg  <wl@gnu.org>
 
 	Really fix FreeDesktop bug #21197.
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index f08f64039..3ad33bd6d 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -168,10 +168,10 @@
   check_table_dir( SFNT_Header  sfnt,
                    FT_Stream    stream )
   {
-    FT_Error  error;
-    FT_UInt   nn, valid_entries = 0;
-    FT_UInt   has_head = 0, has_sing = 0, has_meta = 0;
-    FT_ULong  offset = sfnt->offset + 12;
+    FT_Error   error;
+    FT_UShort  nn, valid_entries = 0;
+    FT_UInt    has_head = 0, has_sing = 0, has_meta = 0;
+    FT_ULong   offset = sfnt->offset + 12;
 
     static const FT_Frame_Field  table_dir_entry_fields[] =
     {