diff --git a/ChangeLog b/ChangeLog
index 9028eae9b..854823ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-17  Werner Lemberg  <wl@gnu.org>
+
+	* src/sfnt/sfobjs.c (sfnt_init_face): Don't set
+	FT_FACE_FLAG_GLYPH_NAMES if the font contains a version 3.0 `post'
+	table.
+
+	* docs/CHANGES: Updated.
+
 2003-12-17  Masatake YAMATO  <jet@gyve.org>
 
 	Add new function FT_Get_CMap_Language_ID to extract the language ID
diff --git a/docs/CHANGES b/docs/CHANGES
index e053afa69..ab9d913ab 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -14,6 +14,9 @@ LATEST CHANGES BETWEEN 2.1.8 and 2.1.7
       correctly  treated as a CID,  similar to  FreeType's CID  driver
       module.  Note that CID CMaps support is still missing.
 
+    - SFNT  based fonts  no longer  set  the FT_FACE_FLAGS_GLYPH_NAMES
+      flag if a version 3.0 `post' table is present.
+
 
   II. IMPORTANT CHANGES
 
@@ -21,6 +24,10 @@ LATEST CHANGES BETWEEN 2.1.8 and 2.1.7
       ADD_STYLE_NAME    properties.     Values    are   appended    to
       face->style_name; example: `Bold SemiCondensed'.
 
+    - A  new  API   function  `FT_Get_CMap_Language_ID'  (declared  in
+      `tttables.h')  is  available  to   get  the  language  ID  of  a
+      TrueType/SFNT cmap.
+
 
   III. MISCELLANEOUS
 
@@ -164,7 +171,7 @@ LATEST CHANGES BETWEEN 2.1.5 and 2.1.4
 
     - The algorithm for guessing the font style has been improved.
 
-    - For fonts in sfnt format, root->height is no longer increased if
+    - For fonts in SFNT format, root->height is no longer increased if
       the line gap  is zero.  There exist fonts  (containing e.g. form
       drawing  characters) which  intentionally have  a zero  line gap
       value.
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 1a98c1374..cb304fdc1 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -529,7 +529,8 @@
                FT_FACE_FLAG_HORIZONTAL;   /* horizontal data   */
 
 #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-      if ( psnames_error == SFNT_Err_Ok )
+      if ( psnames_error == SFNT_Err_Ok &&
+           face->postscript.FormatType != 0x00030000L )
         flags |= FT_FACE_FLAG_GLYPH_NAMES;
 #endif