diff --git a/ChangeLog b/ChangeLog
index 10c288aad3..c8f4e853ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/updateiconcache.c (foreach_remove_func): Fix
+	a use-after-free bug.  (#316256, Alexander Nedotsukov)
+
 2005-09-13  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/*.c: Various cleanups.  (#315360, Kjartan Maraas)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 10c288aad3..c8f4e853ed 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-09-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/updateiconcache.c (foreach_remove_func): Fix
+	a use-after-free bug.  (#316256, Alexander Nedotsukov)
+
 2005-09-13  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/*.c: Various cleanups.  (#315360, Kjartan Maraas)
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 468f31a759..f3385b0547 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -144,9 +144,9 @@ foreach_remove_func (gpointer key, gpointer value, gpointer user_data)
   if (image->flags == HAS_ICON_FILE)
     {
       g_free (key);
-      g_free (image);
       g_free (image->attach_points);
       g_strfreev (image->display_names);
+      g_free (image);
 
       return TRUE;
     }