diff --git a/ChangeLog b/ChangeLog
index edfd7a35a..910b9b42c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-03  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES, include/freetype/freetype.h: Improve documentation
+	of FT_Set_Pixel_Sizes and FT_Set_Char_Size.
+
 2005-03-26  Detlef Würkner  <TetiSoft@apg.lahn.de>
 
 	* builds/amiga/src/base/ftsystem.c (ft_amiga_stream_io): Fix buffer
diff --git a/docs/CHANGES b/docs/CHANGES
index 0dd370f6f..6cf5d0c91 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -64,6 +64,15 @@ LATEST CHANGES BETWEEN 2.1.10 and 2.1.9
       an FT_Bitmap structure in 1bpp, 2bpp, 4bpp, or 8bpp format  into
       another 8bpp FT_Bitmap, probably using a different pitch.
 
+    - The method  how BDF and PCF  bitmap fonts  are accessed has been
+      refined.   Formerly,   FT_Set_Pixel_Sizes  and  FT_Set_Char_Size
+      were  synonyms in  FreeType's  BDF and PCF interface.  This  has
+      changed now.  FT_Set_Pixel_Sizes  should be  used to  select the
+      actual  font dimensions  (the `strike',  which is the sum of the
+      `FONT_ASCENT'    and    `FONT_DESCENT'    properties),     while
+      FT_Set_Char_Size  selects  the  `nominal' size  (the `PIXELSIZE'
+      property).  In both functions, the width parameter is ignored.
+
 
   III. MISCELLANEOUS
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 63eeda114..e26b3cbad 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2041,8 +2041,9 @@ FT_BEGIN_HEADER
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   /* <Note>                                                                */
-  /*    When dealing with fixed-size faces (i.e., non-scalable formats),   */
-  /*    @FT_Set_Pixel_Sizes provides a more convenient interface.          */
+  /*    For BDF and PCF formats, this function uses the `PIXEL_SIZE'       */
+  /*    property of the bitmap font; the `char_width' parameter is         */
+  /*    ignored.                                                           */
   /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Set_Char_Size( FT_Face     face,
@@ -2095,6 +2096,9 @@ FT_BEGIN_HEADER
   /*    which contain a single bitmap strike only (BDF, PCF, FNT) ignore   */
   /*    `pixel_width'.                                                     */
   /*                                                                       */
+  /*    For BDF and PCF formats, this function uses the sum of the         */
+  /*    `FONT_ASCENT' and `FONT_DESCENT' properties of the bitmap font.    */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Set_Pixel_Sizes( FT_Face  face,
                       FT_UInt  pixel_width,