diff --git a/ChangeLog b/ChangeLog
index adffe1e21..8007bf394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
 
 2005-05-28  David Turner  <david@freetype.org>
 
+    * docs/CHANGES: updating file for upcoming release (2.1.1)
+
+    * src/bdf/bdflib.c: removing compiler warnings
+
 	* include/freetype/ftxf86.h, src/base/ftxf86.c: New files.
 	They provad a new API (FT_Get_X11_Font_Format) an X11-compatible
 	string describing the font format of a given face.  This was put in
diff --git a/docs/CHANGES b/docs/CHANGES
index 2b1904155..9da962bab 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,3 +1,57 @@
+LATEST CHANGES BETWEEN 2.1.1 and 2.1.0
+
+  I. IMPORTANT BUG FIXES
+
+    - the 'version_info' returned by "freetype-config" in 2.1.0 returned an
+      invalid value. It now returns 9:1:3 (2.0.9 returned 9:0:3)
+
+    - 2.1.0 couldn't be linked against applications on Win32 and Amiga
+      systems, due to a new debug function that wasn't properly propagated
+      to the system-specific directory in 'builds'.
+
+    - various MacOS and Mac OS X specific fixes
+
+    - fixed a bug in the TrueType charmap validation routines that made
+      2.1.0 over-restrictive over the fonts it could accept.
+
+    - surprisingly, there was still a very small difference between the
+      monochrome glyph bitmaps produced by FT 1.x and FT 2.x with the
+      bytecode interpreter enabled. This was caused by an invalid flag
+      setting in the TrueType glyph loader that caused the rasterizer to
+      change its drop-out control mode. This is now fixed, and results
+      should _really_ be 100% identical
+
+    - the TrueType name table loader has been improved to support many
+      popular though buggy Asian fonts. It now ignores empty name entries,
+      invalid pointer offsets and a few other sad things. Moreover, name
+      strings are now loaded on demand, which reduces the memory load of
+      many faces (e.g. the ARIAL.TTF font file contains a 10Kb name table
+      containing 70 names)
+
+    - fixed a bug in the Postscript hinter that prevented family blues
+      substitution to happen correctly.
+
+
+  II. NEW FEATURES
+
+    - Three new font drivers in this release !!
+
+        * a BDF font driver, contributed by Franco Narda Zapelli, and
+          heavily modified by Werner Lemberg, it also supports anti-aliased
+          bitmaps
+
+        * a Type42 font driver, contributed by ..... This one is still
+          experimental but seems to work relatively well but lacks some
+          charmap support for now
+
+        * a PFR font driver, contributed by David Turner himself. It doesn't
+          support PFR hinting Beware that BitStream has at least two patents
+          on this format !!
+
+
+
+========================================================================
+
 LATEST CHANGES BETWEEN 2.1.0 and 2.0.9
 
   I. IMPORTANT BUG FIXES
@@ -12,7 +66,7 @@ LATEST CHANGES BETWEEN 2.1.0 and 2.0.9
       been optimized and placed within the "ttinterp.c" file.
 
     - Fixed the parsing of accelerator tables in the PCF font driver.
-    
+
     - Fixed the Type1 glyph loader routine used to compute the font's
       maximum advance width.
 
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 2baa498b6..a9ee1db15 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -725,7 +725,7 @@
 
           /* Restore the character at the end of the line. */
           *hp = (char)hold;
-        }     
+        }
       }
     }
 
@@ -1301,11 +1301,11 @@
       case BDF_CARDINAL:
         fp->value.card32 = _bdf_atoul( value, 0, 10 );
         break;
-      
+
       default:
         ;
       }
-      
+
       goto Exit;
     }
 
@@ -1740,6 +1740,10 @@
         /* the scalable width from the device width.                      */
         FT_TRACE2(( "_bdf_parse_glyphs: " ACMSG9, lineno ));
 
+        ps = (double)font->point_size;
+        rx = (double)font->resolution_x;
+        dw = (double)glyph->dwidth;
+
         glyph->swidth = (unsigned short)FT_MulDiv(
                           glyph->dwidth, 72000L,
                           (FT_Long)( font->point_size *
@@ -1966,8 +1970,8 @@
     bdf_font_t*        font;
     char               *s;
 
-    FT_Memory          memory;
-    FT_Error           error = BDF_Err_Ok;
+    FT_Memory          memory = NULL;
+    FT_Error           error  = BDF_Err_Ok;
 
     FT_UNUSED( lineno );            /* only used in debug mode */
 
@@ -2090,7 +2094,7 @@
       p->font->bbx.x_offset = _bdf_atos( p->list.field[3], 0, 10 );
       p->font->bbx.y_offset = _bdf_atos( p->list.field[4], 0, 10 );
 
-      p->font->bbx.ascent  = (short)( p->font->bbx.height + 
+      p->font->bbx.ascent  = (short)( p->font->bbx.height +
                                       p->font->bbx.y_offset );
 
       p->font->bbx.descent = (short)( -p->font->bbx.y_offset );
@@ -2193,8 +2197,8 @@
     unsigned long  lineno;
     _bdf_parse_t   p;
 
-    FT_Memory      memory;
-    FT_Error       error = BDF_Err_Ok;
+    FT_Memory      memory = NULL;
+    FT_Error       error  = BDF_Err_Ok;
 
 
     FT_MEM_SET( &p, 0, sizeof ( _bdf_parse_t ) );