diff --git a/ChangeLog b/ChangeLog
index bb8d1b9b0..f1178a550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-10-16  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add description strings to script entries.
+
+	Currently, this is unused.
+
+	* src/autofit/afscript.h: Do it.
+	* src/autofit/afglobal.c, src/autofit/afpic.c,
+	src/autofit/aftypes.h: Updated.
+
 2013-10-16  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Improve tracing message for extra light flag.
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 6672ebf80..dc62bd7a1 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -44,7 +44,7 @@
 
 
 #undef  SCRIPT
-#define SCRIPT( s, S )                \
+#define SCRIPT( s, S, d )             \
           &af_ ## s ## _script_class,
 
   FT_LOCAL_ARRAY_DEF( AF_ScriptClass )
@@ -62,7 +62,7 @@
 #ifdef FT_DEBUG_LEVEL_TRACE
 
 #undef  SCRIPT
-#define SCRIPT( s, S )  #s,
+#define SCRIPT( s, S, d )  #s,
 
   FT_LOCAL_ARRAY_DEF( char* )
   af_script_names[] =
diff --git a/src/autofit/afpic.c b/src/autofit/afpic.c
index 56cb07738..92d696d29 100644
--- a/src/autofit/afpic.c
+++ b/src/autofit/afpic.c
@@ -116,7 +116,7 @@
 #include "afwrtsys.h"
 
 #undef  SCRIPT
-#define SCRIPT( s, S )                               \
+#define SCRIPT( s, S, d )                            \
         FT_Init_Class_af_ ## s ## _script_class(     \
           &container->af_script_classes_rec[ss++] );
 
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index e3b9434ae..be0169a83 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -22,15 +22,15 @@
 
   /* Add new scripts here. */
 
-  SCRIPT( cyrl, CYRL )
-  SCRIPT( deva, DEVA )
-  SCRIPT( dflt, DFLT )
-  SCRIPT( grek, GREK )
-  SCRIPT( hani, HANI )
-  SCRIPT( hebr, HEBR )
-  SCRIPT( latn, LATN )
+  SCRIPT( cyrl, CYRL, "Cyrillic" )
+  SCRIPT( deva, DEVA, "Indic scripts" )
+  SCRIPT( dflt, DFLT, "no script" )
+  SCRIPT( grek, GREK, "Greek" )
+  SCRIPT( hani, HANI, "CJKV ideographs" )
+  SCRIPT( hebr, HEBR, "Hebrew" )
+  SCRIPT( latn, LATN, "Latin" )
 #ifdef FT_OPTION_AUTOFIT2
-  SCRIPT( ltn2, LTN2 )
+  SCRIPT( ltn2, LTN2, "Latin 2" )
 #endif
 
 
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index 21423193f..cda1f8965 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -325,7 +325,7 @@ extern void*  _af_debug_hints;
    */
 
 #undef  SCRIPT
-#define SCRIPT(s, S ) \
+#define SCRIPT( s, S, d ) \
           AF_SCRIPT_ ## S,
 
   /* The list of known scripts. */