diff --git a/ChangeLog b/ChangeLog
index 18bf6a6cb..df55c836d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-25  David Turner    <david@freetype.org>
+
+        * src/autofit/afhints.c: add stubs to link the "ftgrid" test program
+        when debugging is disabled in the auto-hinter
+
 2006-11-23  David Turner    <david@freetype.org>
 
 	* src/autofit/afhints.c, src/autofit/afhints.h, src/autofit/aflatin.c,
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 7335a0076..9a3ea3d46 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -264,6 +264,28 @@
     }
   }
 
+#else
+ /* these empty stubs are only used to link the "ftgrid" test program
+  * when debugging is disabled
+  */
+  void
+  af_glyph_hints_dump_points( AF_GlyphHints  hints )
+  {
+    FT_UNUSED(hints);
+  }
+
+  void
+  af_glyph_hints_dump_segments( AF_GlyphHints  hints )
+  {
+    FT_UNUSED(hints);
+  }
+
+  void
+  af_glyph_hints_dump_edges( AF_GlyphHints  hints )
+  {
+    FT_UNUSED(hints);
+  }
+
 #endif /* AF_DEBUG */