diff --git a/ChangeLog b/ChangeLog
index caf62722d..63de9546c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-12  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Minor.
+
 2015-12-12  Werner Lemberg  <wl@gnu.org>
 
 	* src/autofit/afscript.h: Avoid potential crash.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index fa285f77d..9c9f37071 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -773,7 +773,13 @@
             /* with a vertical shift                                     */
             best_y += y_offset;
 
-            FT_TRACE5(( "  U+%04lX: best_y = %5ld", ch, best_y ));
+#ifdef FT_DEBUG_LEVEL_TRACE
+            if ( num_idx == 1 )
+              FT_TRACE5(( "  U+%04lX: best_y = %5ld", ch, best_y ));
+            else
+              FT_TRACE5(( "  component %d of cluster starting with U+%04lX:"
+                          " best_y = %5ld", i, ch, best_y ));
+#endif
 
             /* now set the `round' flag depending on the segment's kind: */
             /*                                                           */