diff --git a/ChangeLog b/ChangeLog
index 83211cfb8..13755a095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-11  Werner Lemberg  <wl@gnu.org>
+
+	[cff]: Improve debugging output.
+
+	* src/cff/cffgload.c (cff_decoder_parse_charstrings)
+	<cff_op_hintmask>: Implement it.
+
 2010-06-10  Graham Asher  <graham.asher@btinternet.com>
 
 	ftgrays: Speed up rendering of small cubic splines.
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 58af3565c..67190182d 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -1357,12 +1357,12 @@
             FT_UInt maskbyte;
 
 
-            FT_TRACE4(( " (maskbytes: " ));
+            FT_TRACE4(( " (maskbytes:" ));
 
             for ( maskbyte = 0;
                   maskbyte < (FT_UInt)(( decoder->num_hints + 7 ) >> 3);
                   maskbyte++, ip++ )
-              FT_TRACE4(( "0x%02X", *ip ));
+              FT_TRACE4(( " 0x%02X", *ip ));
 
             FT_TRACE4(( ")\n" ));
           }