diff --git a/ChangeLog b/ChangeLog
index b726ec856..563ad960c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,8 @@
 2006-12-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* include/freetype/internal/services/svotval.h: Add `volatile' to 
-	sync with the modification by Jens Claudius on 2006-08-22.
-	http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/
-		/otvalid/otvmod.c?r1=1.4&r2=1.5
+	sync with the modification by Jens Claudius on 2006-08-22; cf.
+	  http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/otvmod.c?r1=1.4&r2=1.5
 
 2006-12-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
@@ -25,8 +24,9 @@
 
 2006-12-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
-	* src/base/ftobjs.c: Improvement of resource fork handler for POSIX,
-	http://lists.gnu.org/archive/html/freetype-devel/2006-10/msg00025.html
+	* src/base/ftobjs.c: Improvement of resource fork handler for
+	POSIX, cf.
+	  http://lists.gnu.org/archive/html/freetype-devel/2006-10/msg00025.html
 	(Mac_Read_sfnt_Resource): Count only `sfnt' resource of suitcase font
 	format or .dfont, to simulate the face index number counted by ftmac.c.
 	(IsMacResource): Return the number of scalable faces correctly.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 33d61c88c..f8cf60e54 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -441,8 +441,8 @@ case "$CFLAGS" in
   *HAVE_FSSPEC* | *HAVE_FSREF* | *HAVE_QUICKDRAW* | *HAVE_ATS* )
     AC_MSG_WARN([
 *** WARNING
-    FSSpec/FSRef/QuickDraw/ATS options are explicitly given.
-    use legacy builds/mac/ftmac.c instead of src/base/ftmac.c
+    FSSpec/FSRef/QuickDraw/ATS options are explicitly given,
+    thus using legacy builds/mac/ftmac.c instead of src/base/ftmac.c.
     ])
     CFLAGS="$CFLAGS "'-I$(TOP_DIR)/builds/mac/'
     ;;
diff --git a/include/freetype/internal/services/svotval.h b/include/freetype/internal/services/svotval.h
index fa95ca489..970bbd575 100644
--- a/include/freetype/internal/services/svotval.h
+++ b/include/freetype/internal/services/svotval.h
@@ -30,12 +30,12 @@ FT_BEGIN_HEADER
 
   typedef FT_Error
   (*otv_validate_func)( FT_Face volatile  face,
-                        FT_UInt    ot_flags,
-                        FT_Bytes  *base,
-                        FT_Bytes  *gdef,
-                        FT_Bytes  *gpos,
-                        FT_Bytes  *gsub,
-                        FT_Bytes  *jstf );
+                        FT_UInt           ot_flags,
+                        FT_Bytes         *base,
+                        FT_Bytes         *gdef,
+                        FT_Bytes         *gpos,
+                        FT_Bytes         *gsub,
+                        FT_Bytes         *jstf );
 
 
   FT_DEFINE_SERVICE( OTvalidate )
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index c1d60fd89..552ee83ad 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -3,8 +3,9 @@
 /*  ftmac.c                                                                */
 /*                                                                         */
 /*    Mac FOND support.  Written by just@letterror.com.                    */
-/*  Heavily Fixed by mpsuzuki, George Williams and Sean McBride            */
-/*  This file is for Mac OS X only, see builds/mac/ftoldmac.c for          */
+/*  Heavily modified by mpsuzuki, George Williams, and Sean McBride.       */
+/*                                                                         */
+/*  This file is for Mac OS X only; see builds/mac/ftoldmac.c for          */
 /*  classic platforms built by MPW.                                        */ 
 /*                                                                         */
 /*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by                   */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index e16a19f0f..7909ea411 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1445,7 +1445,7 @@
       error = Mac_Read_POST_Resource( library, stream, data_offsets, count,
                                       face_index, aface );
       FT_FREE( data_offsets );
-      /* POST exists in a LWFN providing single face */
+      /* POST exists in an LWFN providing a single face */
       (*aface)->num_faces = 1;
       return error;
     }
@@ -1456,7 +1456,7 @@
                                         &data_offsets, &count );
     if ( !error )
     {
-      FT_Long face_index_internal = face_index % count;
+      FT_Long  face_index_internal = face_index % count;
 
 
       error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count,