diff --git a/ChangeLog b/ChangeLog
index ac09bc2e7..25a2a6eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-07  Matthew Allum  <mallum@openedhand.com>
+
+	* clutter/pango/pangoclutter-render.c:
+        Warn if requested glyph is too big for underlying texture cache.
+        (see #666)
+
 2008-02-07  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/clutter-texture.c: (texture_upload_data):
diff --git a/clutter/pango/pangoclutter-render.c b/clutter/pango/pangoclutter-render.c
index 73abb434f..0f9262111 100644
--- a/clutter/pango/pangoclutter-render.c
+++ b/clutter/pango/pangoclutter-render.c
@@ -78,8 +78,6 @@ tc_clear ()
       first_texture = next;
     }
 
-  printf("freeing textures\n");
-
   ++tc_generation;
 }
 
@@ -358,6 +356,12 @@ draw_glyph (PangoRenderer *renderer_,
           return;
         }
 
+      if (bm.height > TC_HEIGHT)
+        {
+          g_warning ("%s: Glyph too large for cache, increase TC_HEIGHT",
+                     G_STRLOC);
+        }
+
       if (g)
         g->generation = tc_generation;
       else