diff --git a/ChangeLog b/ChangeLog
index 793b5b209..4eb8ae383 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-02  David Turner  <david@freetype.org>
+
+	* src/sfnt/sfobjs.c: adding documentation comment
+
 2006-12-31  Masatake YAMATO  <jet@gyve.org>
 
 	* src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate): New function.
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 32a5848b7..97b6ed3a2 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -225,7 +225,15 @@
         /* all Unicode strings are encoded using UTF-16BE */
       case TT_MS_ID_UNICODE_CS:
       case TT_MS_ID_SYMBOL_CS:
+        convert = tt_name_entry_ascii_from_utf16;
+        break;
+
       case TT_MS_ID_UCS_4:
+       /* apparently, when this value is found in a name table entry,
+        * it is documented as "Full Unicode repertoire". Experience
+        * with the MsGothic shipped with Windows Vista shows that this is
+        * really UTF-16 names  (the real UCS-4 is only used for charmaps)
+        */
         convert = tt_name_entry_ascii_from_utf16;
         break;