diff --git a/ChangeLog b/ChangeLog
index eca001fd9..63a8bf2ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-14  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix `make multi'.
+
+	* include/freetype/internal/fttrace.h: Add `afmodule'.
+	* src/autofit/afmodule.c: Include FT_INTERNAL_DEBUG_H.
+	(FT_COMPONENT): Define.
+
 2012-09-14  Werner Lemberg  <wl@gnu.org>
 
 	* src/autofit/afmodule.c: s/FT_Autofitter/AF_Module/.
diff --git a/include/freetype/internal/fttrace.h b/include/freetype/internal/fttrace.h
index cc2e7d11e..e807a617a 100644
--- a/include/freetype/internal/fttrace.h
+++ b/include/freetype/internal/fttrace.h
@@ -136,6 +136,7 @@ FT_TRACE_DEF( gxvprop )
 FT_TRACE_DEF( gxvlcar )
 
   /* autofit components */
+FT_TRACE_DEF( afmodule )
 FT_TRACE_DEF( afhints )
 FT_TRACE_DEF( afcjk )
 FT_TRACE_DEF( aflatin )
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c
index 79752e738..fd44f391b 100644
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -28,10 +28,21 @@
 #endif
 
 #include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
 #include FT_AUTOHINTER_H
 #include FT_SERVICE_PROPERTIES_H
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
+  /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log  */
+  /* messages during execution.                                            */
+  /*                                                                       */
+#undef  FT_COMPONENT
+#define FT_COMPONENT  trace_afmodule
+
+
   FT_Error
   af_property_set( FT_Library   library,
                    const char*  property_name,