diff --git a/ChangeLog b/ChangeLog
index 25689f7d5..c58e74780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Report used script while hinting a glyph.
+
+	* src/autofit/afcjk.c (af_cjk_hint_edges), src/autofit/aflatin.c
+	(af_latin_hint_edges): Implement it.
+
 2013-08-26  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Add support for Hebrew script.
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 740a3840b..bcda652ba 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -1665,9 +1665,11 @@
 #endif
 
 
+    FT_TRACE5(( "cjk %s edge hinting (script %d)\n",
+                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical",
+                hints->metrics->script_class->script ));
+
     /* we begin by aligning all stems relative to the blue zone */
-    FT_TRACE5(( "cjk %s edge hinting\n",
-          dim == AF_DIMENSION_HORZ ? "vertical" : "horizontal" ));
 
     if ( AF_HINTS_DO_BLUES( hints ) )
     {
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 21439ce65..dd925e8d4 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -1897,8 +1897,9 @@
 #endif
 
 
-    FT_TRACE5(( "latin %s edge hinting\n",
-                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical" ));
+    FT_TRACE5(( "latin %s edge hinting (script %d)\n",
+                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical",
+                hints->metrics->script_class->script ));
 
     /* we begin by aligning all stems relative to the blue zone */
     /* if needed -- that's only for horizontal edges            */