diff --git a/ChangeLog b/ChangeLog
index 3e8016b93..38a3eb042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-03  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Fix handling of face_index == -1 for pure CFF.
+
+	* src/cff/cffobjs.c (cff_face_init): Return correct number of faces.
+
 2016-01-30  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Minor tracing improvement.
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 67d1890a3..e22ae82bc 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -586,7 +586,10 @@
       /* if we are performing a simple font format check, exit immediately */
       /* (this is here for pure CFF)                                       */
       if ( face_index < 0 )
+      {
+        cffface->num_faces = (FT_Long)cff->num_faces;
         return FT_Err_Ok;
+      }
 
       cff->pshinter = pshinter;
       cff->psnames  = psnames;