diff --git a/ChangeLog b/ChangeLog
index 4979348e8..5a07f8f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-26  Werner Lemberg  <wl@gnu.org>
+
+	* src/cid/cidload.c (cid_face_open): Improve handling of `SDBytes'.
+
 2016-08-26  Werner Lemberg  <wl@gnu.org>
 
 	[cid] Fix commit from 2016-05-16.
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index d4f1ad1a7..21397c2c0 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -777,7 +777,8 @@
       CID_FaceDict  dict = cid->font_dicts + n;
 
 
-      if ( dict->sd_bytes < 0 )
+      if ( dict->sd_bytes < 0                        ||
+           ( dict->num_subrs && dict->sd_bytes < 1 ) )
       {
         FT_ERROR(( "cid_parse_dict: Invalid `SDBytes' value\n" ));
         error = FT_THROW( Invalid_File_Format );