diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index a5d883f5f..e3448b2cc 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -413,8 +413,8 @@ FT_BEGIN_HEADER
    *   Do not #undef these macros here since the build system might define
    *   them for certain configurations only.
    */
-/* #define FT_DEBUG_LEVEL_ERROR */
-/* #define FT_DEBUG_LEVEL_TRACE */
+#define FT_DEBUG_LEVEL_ERROR
+#define FT_DEBUG_LEVEL_TRACE
 
 
   /**************************************************************************
diff --git a/include/freetype/internal/fttrace.h b/include/freetype/internal/fttrace.h
index 78b731cab..f59a06ed8 100644
--- a/include/freetype/internal/fttrace.h
+++ b/include/freetype/internal/fttrace.h
@@ -116,6 +116,9 @@ FT_TRACE_DEF( pcfread )
 FT_TRACE_DEF( bdfdriver )
 FT_TRACE_DEF( bdflib )
 
+  /* GF font components */
+FT_TRACE_DEF( gfdriver )
+
   /* PFR font component */
 FT_TRACE_DEF( pfr )
 
diff --git a/src/gf/module.mk b/src/gf/module.mk
index 8c2a3d8d3..1eb534671 100644
--- a/src/gf/module.mk
+++ b/src/gf/module.mk
@@ -16,7 +16,7 @@ FTMODULE_H_COMMANDS += GF_DRIVER
 
 define GF_DRIVER
 $(OPEN_DRIVER) FT_Driver_ClassRec, gf_driver_class $(CLOSE_DRIVER)
-$(ECHO_DRIVER)gf        $(ECHO_DRIVER_DESC)gf TeX's bitmap fonts$(ECHO_DRIVER_DONE)
+$(ECHO_DRIVER)gf        $(ECHO_DRIVER_DESC)METAFONT bitmap fonts$(ECHO_DRIVER_DONE)
 endef
 
 # EOF