diff --git a/builds/unix/.cvsignore b/builds/unix/.cvsignore
index 808b60059..3785a9c13 100644
--- a/builds/unix/.cvsignore
+++ b/builds/unix/.cvsignore
@@ -1,9 +1,15 @@
-unix-def.mk
-unix-cc.mk
-config.status
+aclocal.m4
+autom4te.cache
 config.cache
+config.guess
 config.log
-libtool
-ftconfig.h
-freetype-config
+config.status
+config.sub
+configure
 freetype2.pc
+freetype-config
+ftconfig.h
+libtool
+ltmain.sh
+unix-cc.mk
+unix-def.mk
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 27c04d2a8..7b2a96c38 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2370,8 +2370,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    A function used to set the transformation that is applied to glyph */
-  /*    images just before they are converted to bitmaps in a glyph slot   */
-  /*    when @FT_Render_Glyph is called.                                   */
+  /*    images when they are loaded into a glyph slot through              */
+  /*    @FT_Load_Glyph.                                                    */
   /*                                                                       */
   /* <InOut>                                                               */
   /*    face   :: A handle to the source face object.                      */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 0f74d3f7f..1bf813a48 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -288,11 +288,11 @@
     FT_ZERO( &slot->metrics );
     FT_ZERO( &slot->outline );
 
-    slot->bitmap.width = 0;
-    slot->bitmap.rows  = 0;
-    slot->bitmap.pitch = 0;
+    slot->bitmap.width      = 0;
+    slot->bitmap.rows       = 0;
+    slot->bitmap.pitch      = 0;
     slot->bitmap.pixel_mode = 0;
-    /* don't touch 'slot->bitmap.buffer'! */
+    /* `slot->bitmap.buffer' has been handled by ft_glyphslot_free_bitmap */
 
     slot->bitmap_left   = 0;
     slot->bitmap_top    = 0;