diff --git a/ChangeLog b/ChangeLog
index 8108dbe71..497516a7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-24  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cfftypes.h (CFF_MAX_CID_FONTS): Increase to 256.
+	This limit is given on p. 37 of Adobe Tech Note #5014.
+
 2011-03-23  Werner Lemberg  <wl@gnu.org>
 
 	* src/truetype/ttpload.c(tt_face_load_loca): Fix mismatch warning.
diff --git a/src/cff/cfftypes.h b/src/cff/cfftypes.h
index e5a4806d2..665ab6f68 100644
--- a/src/cff/cfftypes.h
+++ b/src/cff/cfftypes.h
@@ -5,7 +5,7 @@
 /*    Basic OpenType/CFF type definitions and interface (specification     */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2006, 2007, 2008, 2010 by             */
+/*  Copyright 1996-2003, 2006-2008, 2010-2011 by                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -212,9 +212,7 @@ FT_BEGIN_HEADER
   } CFF_SubFontRec, *CFF_SubFont;
 
 
-  /* maximum number of sub-fonts in a CID-keyed file -- */
-  /* the current record holder contains 53 sub-fonts    */
-#define CFF_MAX_CID_FONTS  64
+#define CFF_MAX_CID_FONTS  256
 
 
   typedef struct  CFF_FontRec_