diff --git a/ChangeLog b/ChangeLog
index aad1dd9ff..519f7fe84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-28  Werner Lemberg  <wl@gnu.org>
+
+	* docs/TODO: Updated.
+
 2005-04-24  Werner Lemberg  <wl@gnu.org>
 
 	* src/otvalid/otvcommn.c
diff --git a/docs/TODO b/docs/TODO
index 25a293c77..1f7b8329b 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,5 +1,5 @@
-Here is a list of items that need to be addressed in FreeType 2; they are
-not exactly bugs, but should be considered though:
+Here is a list of items that need to be addressed in FreeType 2
+---------------------------------------------------------------
 
 * Implement stem3/counter hints properly in the Postscript hinter.
 
@@ -18,4 +18,19 @@ not exactly bugs, but should be considered though:
 * Add kerning (AFM file) support to the CID driver.
 
 
+Here is a list of bugs which should be handled
+----------------------------------------------
+
+Other bugs have been registered at the savannah bugzilla of FreeType.
+
+* CID driver:
+    Handle the case where a CID font has a top-level font matrix also
+    (see PLRM, 5.11.3, Type 0 CIDFonts).  Since CID_FaceInfoRec lacks
+    a font_matrix entry we have to directly apply it to all subfont
+    matrices.
+
+* CID driver:
+    Use top-level font matrix entry for setting the upem value, not the
+    entries in the FDarray.  If absent, use 1000.
+
 --- end of TODO ---