diff --git a/ChangeLog b/ChangeLog
index 96a20aed5..5929c89cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-08  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftobjs.c (ft_glyphslot_clear): Reset `lsb_delta' and
+	`rsb_delta'.
+
 2004-12-05  Werner Lemberg  <wl@gnu.org>
 
 	* builds/unix/install.mk (install): Use $(OBJ_BUILD) for ftconfig.h.
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 865d29925..697f8e70d 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2581,9 +2581,9 @@ FT_BEGIN_HEADER
   /*                   kerning vector.                                     */
   /*                                                                       */
   /* <Output>                                                              */
-  /*    akerning    :: The kerning vector.  This is in font units for      */
-  /*                   scalable formats, and in pixels for fixed-sizes     */
-  /*                   formats.                                            */
+  /*    akerning    :: The kerning vector.  This is either in font units   */
+  /*                   or in pixels (26.6 format) for scalable formats,    */
+  /*                   and in pixels for fixed-sizes formats.              */
   /*                                                                       */
   /* <Return>                                                              */
   /*    FreeType error code.  0 means success.                             */
diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c
index 8e8afeac4..013b951b8 100644
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -1539,7 +1539,7 @@
       ah_outline_save( outline, gloader );
 
       /* we now need to hint the metrics according to the change in */
-      /* width/positioning that occured during the hinting process  */
+      /* width/positioning that occurred during the hinting process */
       if ( outline->num_vedges > 0 )
       {
         FT_Pos   old_advance, old_rsb, old_lsb, new_lsb, pp1x_uh, pp2x_uh;
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index aa2584449..4180508fc 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -305,6 +305,8 @@
 
     slot->linearHoriAdvance = 0;
     slot->linearVertAdvance = 0;
+    slot->lsb_delta         = 0;
+    slot->rsb_delta         = 0;
   }