diff --git a/docs/CHANGES b/docs/CHANGES
index e94963def..a5db2d23a 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -42,8 +42,13 @@ CHANGES BETWEEN 2.4.12 and 2.5
     - The  property API  (`FT_Property_Get' and  `FT_Property_Set') is
       now declared as stable.
 
-    - `ftview' has been updated to support color embedded bitmaps; it
-      can be toggled on and off with key `c'.
+      The  exception,   however,  are  the   experimental  auto-hinter
+      properties `glyph-to-script-map' and `fallback-script' which are
+      subject to change in a forthcoming release.
+
+    - `ftview' has been updated to  support color embedded bitmaps; it
+      can be toggled on and off  with key `c'.  The small cache toggle
+      is now key `K'.
 
     - It  is now  possible  to  control the  version  of the  TrueType
       hinting engine  using the new `interpreter-version'  property of
@@ -56,12 +61,18 @@ CHANGES BETWEEN 2.4.12 and 2.5
       program, command line option `-H'  has been extended to activate
       the non-default interpreter version.
 
+    - The `ttdebug' program has been further improved.  In particular,
+      it accepts a new command line  option `-H' to select the hinting
+      engine.
+
     - Another round of TrueType subpixel hinting fixes.
 
     - The `apinames' tool can now create an import file for NetWare.
 
     - 64bit compilation of the new CFF engine was buggy.
 
+    - Some fixes to improve robustness in memory-tight situations.
+
 
 ======================================================================
 
diff --git a/include/freetype/ftautoh.h b/include/freetype/ftautoh.h
index 62ce96d43..5e1153a1c 100644
--- a/include/freetype/ftautoh.h
+++ b/include/freetype/ftautoh.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for controlling the auto-hinter (specification only).   */
 /*                                                                         */
-/*  Copyright 2012 by                                                      */
+/*  Copyright 2012, 2013 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -61,6 +61,8 @@ FT_BEGIN_HEADER
    *   glyph-to-script-map
    *
    * @description:
+   *   *Experimental* *only*
+   *
    *   The auto-hinter provides various script modules to hint glyphs.
    *   Examples of supported scripts are Latin or CJK.  Before a glyph is
    *   auto-hinted, the Unicode character map of the font gets examined, and
@@ -113,6 +115,8 @@ FT_BEGIN_HEADER
    *   FT_AUTOHINTER_SCRIPT_XXX
    *
    * @description:
+   *   *Experimental* *only*
+   *
    *   A list of constants used for the @glyph-to-script-map property to
    *   specify the script submodule the auto-hinter should use for hinting a
    *   particular glyph.
@@ -236,6 +240,8 @@ FT_BEGIN_HEADER
    *   FT_Prop_GlyphToScriptMap
    *
    * @description:
+   *   *Experimental* *only*
+   *
    *   The data exchange structure for the @glyph-to-script-map property.
    *
    */
@@ -253,6 +259,8 @@ FT_BEGIN_HEADER
    *   fallback-script
    *
    * @description:
+   *   *Experimental* *only*
+   *
    *   If no auto-hinter script module can be assigned to a glyph, a
    *   fallback script gets assigned to it (see also the
    *   @glyph-to-script-map property).  By default, this is