diff --git a/ChangeLog b/ChangeLog
index bb5929c52..9cd04144a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-06  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	Bug #955 - ClutterLabel is missing fallback resolution handling
+
+	* clutter/clutter-label.c (clutter_label_init): Handle
+	clutter_backend_get_resolution() return value -1 similar to
+	ClutterEntry (falling back to 96.0). (#955, Tommi Komulainen)
+
 2008-06-06  Neil Roberts  <neil@o-hand.com>
 
 	* clutter/eglnative/clutter-stage-egl.c
diff --git a/clutter/clutter-label.c b/clutter/clutter-label.c
index a55d292cd..09e559517 100644
--- a/clutter/clutter-label.c
+++ b/clutter/clutter-label.c
@@ -647,6 +647,8 @@ clutter_label_init (ClutterLabel *self)
       _context = pango_clutter_font_map_create_context (font_map);
 
       resolution = clutter_backend_get_resolution (backend);
+      if (resolution < 0)
+        resolution = 96.0;
       pango_cairo_context_set_resolution (_context, resolution);
 
       font_options = clutter_backend_get_font_options (backend);