diff --git a/gio/ChangeLog b/gio/ChangeLog
index cd14c55ba..5588f364d 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-03  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	Bug 546079 – leak in xdgmime
+	
+	* xdgmime/xdgmime.c (xdg_mime_shutdown): Fix memory leak.
+	
 2008-08-03  Tor Lillqvist  <tml@novell.com>
 
 	* win32/gwin32directorymonitor.h
diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c
index 0fe00a433..2be0f5f9d 100644
--- a/gio/xdgmime/xdgmime.c
+++ b/gio/xdgmime/xdgmime.c
@@ -627,6 +627,18 @@ xdg_mime_shutdown (void)
       _xdg_mime_parent_list_free (parent_list);
       parent_list = NULL;
     }
+
+  if (icon_list)
+    {
+      _xdg_mime_icon_list_free (icon_list);
+      icon_list = NULL;
+    }
+
+  if (generic_icon_list)
+    {
+      _xdg_mime_icon_list_free (generic_icon_list);
+      generic_icon_list = NULL;
+    }
   
   if (_caches)
     {