diff --git a/ChangeLog b/ChangeLog
index e73a74656..0828da8fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-26  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Fix error code.
+
+	* src/cff/cffload.c (cff_font_load): Do it.
+
 2011-11-26  Werner Lemberg  <wl@gnu.org>
 
 	Add new error code FT_Err_Missing_Module.
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 8bbf4743e..d1dacbfbc 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1576,7 +1576,7 @@
     if ( dict->charstrings_offset == 0 )
     {
       FT_ERROR(( "cff_font_load: no charstrings offset\n" ));
-      error = CFF_Err_Unknown_File_Format;
+      error = CFF_Err_Invalid_File_Format;
       goto Exit;
     }