diff --git a/ChangeLog.20 b/ChangeLog.20
index fc6346f..122c796 100644
--- a/ChangeLog.20
+++ b/ChangeLog.20
@@ -2207,7 +2207,7 @@
 	* src/autohint/ahhint.c (ah_hinter_load, ah_hinter_load_glyph):
 	Changed so that fonts with a non-standard FontMatrix render
 	correctly.  Previously, the first glyph rendered from such a
-	font did not have the tranformation matrix applied.
+	font did not have the transformation matrix applied.
 
 2000-12-17  Werner Lemberg  <wl@gnu.org>
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 6728705..bc9223c 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1725,6 +1725,10 @@
   /*    If the `FT_OPEN_PARAMS' bit is set, the parameters given by        */
   /*    `num_params' and `params' is used.  They are ignored otherwise.    */
   /*                                                                       */
+  /*    Ideally, both the `pathname' and `params' fields should be tagged  */
+  /*    as `const'; this is missing for API backwards compatibility.  With */
+  /*    other words, applications should treat them as read-only.          */
+  /*                                                                       */
   typedef struct  FT_Open_Args_
   {
     FT_UInt         flags;
@@ -2311,7 +2315,7 @@
    *     This flag implies @FT_LOAD_NO_SCALE and @FT_LOAD_IGNORE_TRANSFORM.
    *
    *   FT_LOAD_IGNORE_TRANSFORM ::
-   *     Indicates that the tranform matrix set by @FT_Set_Transform should
+   *     Indicates that the transform matrix set by @FT_Set_Transform should
    *     be ignored.
    *
    *   FT_LOAD_MONOCHROME ::
diff --git a/include/freetype/ftincrem.h b/include/freetype/ftincrem.h
index 9e1915f..46bc8bd 100644
--- a/include/freetype/ftincrem.h
+++ b/include/freetype/ftincrem.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType incremental loading (specification).                        */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2006 by                                          */
+/*  Copyright 2002, 2003, 2006, 2007 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -149,7 +149,7 @@
   *   FreeType error code.  0 means success.
   *
   * @note:
-  *   If this function returns succesfully the method
+  *   If this function returns successfully the method
   *   @FT_Incremental_FreeGlyphDataFunc will be called later to release
   *   the data bytes.
   *
diff --git a/include/freetype/fttrigon.h b/include/freetype/fttrigon.h
index 92cf6d9..6b77d2e 100644
--- a/include/freetype/fttrigon.h
+++ b/include/freetype/fttrigon.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType trigonometric functions (specification).                    */
 /*                                                                         */
-/*  Copyright 2001, 2003, 2005 by                                          */
+/*  Copyright 2001, 2003, 2005, 2007 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -210,7 +210,7 @@
    *     Second angle.
    *
    * @return:
-   *   Contrainted value of `value2-value1'.
+   *   Constrained value of `value2-value1'.
    *
    */
   FT_EXPORT( FT_Angle )
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index a4c1a70..6bfeb9e 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType memory management macros (specification).               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2004, 2005, 2006 by                         */
+/*  Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -209,7 +209,7 @@
 
 
   /*
-   *  Return the maximum number of adressable elements in an array.
+   *  Return the maximum number of addressable elements in an array.
    *  We limit ourselves to INT_MAX, rather than UINT_MAX, to avoid
    *  any problems.
    */
diff --git a/include/freetype/internal/pshints.h b/include/freetype/internal/pshints.h
index 9598663..48452c0 100644
--- a/include/freetype/internal/pshints.h
+++ b/include/freetype/internal/pshints.h
@@ -6,7 +6,7 @@
 /*    recorders (specification only).  These are used to support native    */
 /*    T1/T2 hints in the `type1', `cid', and `cff' font drivers.           */
 /*                                                                         */
-/*  Copyright 2001, 2002, 2003, 2005, 2006 by                              */
+/*  Copyright 2001, 2002, 2003, 2005, 2006, 2007 by                        */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -452,9 +452,9 @@
    *   Use vertical coordinates (y) for horizontal stems (dim=0).  Use
    *   horizontal coordinates (x) for vertical stems (dim=1).
    *
-   *   There are `2*count' elements in the `coords' aray.  Each even element
-   *   is an absolute position in font units, each odd element is a length
-   *   in font units.
+   *   There are `2*count' elements in the `coords' array.  Each even
+   *   element is an absolute position in font units, each odd element is a
+   *   length in font units.
    *
    *   A length can be negative, in which case it must be either -20 or
    *   -21.  It is interpreted as a `ghost' stem, according to the Type 1
diff --git a/include/freetype/internal/services/svpostnm.h b/include/freetype/internal/services/svpostnm.h
index 7f1700a..282da68 100644
--- a/include/freetype/internal/services/svpostnm.h
+++ b/include/freetype/internal/services/svpostnm.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType PostScript name services (specification).               */
 /*                                                                         */
-/*  Copyright 2003 by                                                      */
+/*  Copyright 2003, 2007 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -28,7 +28,7 @@
    *  A trivial service used to retrieve the PostScript name of a given
    *  font when available.  The `get_name' field should never be NULL.
    *
-   *  The correponding function can return NULL to indicate that the
+   *  The corresponding function can return NULL to indicate that the
    *  PostScript name is not available.
    *
    *  The name is owned by the face and will be destroyed with it.
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 99e4997..dfbb6a1 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -864,7 +864,7 @@
    *
    *   USHORT   version      `BDF ' table version number, should be 0x0001.
    *   USHORT   strikeCount  Number of strikes (bitmap sizes) in this table.
-   *   ULONG    stringTable  Offset (froms start of BDF table) to string
+   *   ULONG    stringTable  Offset (from start of BDF table) to string
    *                         table.
    *
    * This is followed by an array of `strikeCount' descriptors, having the
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 62669ea..ccb3b19 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter routines to compute global hinting values (body).        */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2005, 2006 by                                    */
+/*  Copyright 2003, 2004, 2005, 2006, 2007 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -131,7 +131,7 @@
   Exit:
     /*
      *  By default, all uncovered glyphs are set to the latin script.
-     *  XXX: Shouldnt' we disable hinting or do something similar?
+     *  XXX: Shouldn't we disable hinting or do something similar?
      */
     {
       FT_UInt  nn;
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index a78585d..617274d 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -22,7 +22,7 @@
    *  Its main feature is the ability to differentiate between different
    *  scripts in order to apply language-specific rules.
    *
-   *  The code has also been compartimentized into several entities that
+   *  The code has also been compartmentized into several entities that
    *  should make algorithmic experimentation easier than with the old
    *  code.
    *