diff --git a/ChangeLog b/ChangeLog
index a596d301f..a50e73ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-10  Francesco Zappa Nardelli  <Francesco.Zappa.Nardelli@ens.fr>
+
+        * src/pcf/pcfdriver.c (PCF_Init_Face): allow Xft to use PCF fonts
+        by setting the "face->metrics.max_advance" correctly..
+
+
 2001-12-07  David Turner  <david@freetype.org>
 
 	* include/freetype/cache/ftccmap.h, src/cache/ftccmap.c: Added new
diff --git a/docs/CHANGES b/docs/CHANGES
index 5f542e7cc..a998c42ab 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,5 +1,11 @@
 LATEST CHANGES BETWEEN 2.0.6 and 2.0.5
 
+  - the caching sub-system has been completely re-designed and its API
+    has evolved (the old one is still supported for bacwards compatibility
+    though..)
+
+  - a new charmap cache is provided too
+
   - A new Postscript hinter module has been added to support native hints in
     the following formats: Postscript Type 1, Postscript CID and CFF/CEF.
 
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 7a57a6108..d16d57518 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -249,8 +249,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   Don't define any of these macros to compile in `release' mode!      */
   /*                                                                       */
-#define FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_TRACE
+#undef  FT_DEBUG_LEVEL_ERROR
+#undef  FT_DEBUG_LEVEL_TRACE
 
 
   /*************************************************************************/
@@ -265,7 +265,7 @@ FT_BEGIN_HEADER
   /*   Note that the memory debugger is only activated at runtime when     */
   /*   when the _environment_ variable "FT_DEBUG_MEMORY" is also defined!  */
   /*                                                                       */
-#define FT_DEBUG_MEMORY
+#undef  FT_DEBUG_MEMORY
 
 
   /*************************************************************************/
@@ -454,7 +454,7 @@ FT_BEGIN_HEADER
 #undef T1_CONFIG_OPTION_NO_MM_SUPPORT
 
  /* */
- 
+
 FT_END_HEADER
 
 
diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c
index 6c34524fe..34cc1c30b 100644
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -120,6 +120,8 @@ THE SOFTWARE.
       size->metrics.height    = size->metrics.ascender -
                                 size->metrics.descender;
 
+      size->metrics.max_advance = face->accel.maxbounds.characterWidth << 6;
+
       return PCF_Err_Ok;
     }
     else