diff --git a/ChangeLog b/ChangeLog
index 0a4bdbd219..85e9f3ff74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkapplaunchcontext-x11.c: Support GEmblemedIcon.
+
 2008-08-03  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 546128 – Weirz string
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index a7ee433980..106fcf5563 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -107,6 +107,14 @@ gicon_to_string (GIcon *icon)
       if (names)
 	return g_strdup (names[0]);
     }
+  else if (G_IS_EMBLEMED_ICON (icon))
+    {
+      GIcon *base;
+
+      base = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
+
+      return gicon_to_string (base);
+    }
 
   return NULL;
 }