diff --git a/ChangeLog b/ChangeLog
index 83b032b2..d7848560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-03  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* src/base/ftobjs.c (ft_lookup_PS_in_sfnt): Set *is_sfnt_cid
+	to FALSE when neither `CID ' nor `TYP1' is found in the sfnt
+	container.
+
 2008-10-03  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* include/freetype/config/ftconfig.h: Define FT_MACINTOSH when
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 3ae5a850..b799a31c 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1365,6 +1365,7 @@
 
     *offset = 0;
     *length = 0;
+    *is_sfnt_cid = FALSE;
     return FT_Err_Invalid_Table;
   }