diff --git a/ChangeLog b/ChangeLog
index 8e80e0dbd7..3ee24dc4ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-19  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkdnd-x11.c (get_client_window_at_coords_recurse): Free
+	children in all cases.  (#313862, Kjartan Maraas)
+
 	* gtk/gtkicontheme.c (theme_lookup_icon): Store GtkIconData structs 
 	in the per-directory hash, even if they come from the icon cache. 
 	We tried to avoid that before, but as a result leaked icon data
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8e80e0dbd7..3ee24dc4ca 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-08-19  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkdnd-x11.c (get_client_window_at_coords_recurse): Free
+	children in all cases.  (#313862, Kjartan Maraas)
+
 	* gtk/gtkicontheme.c (theme_lookup_icon): Store GtkIconData structs 
 	in the per-directory hash, even if they come from the icon cache. 
 	We tried to avoid that before, but as a result leaked icon data
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8e80e0dbd7..3ee24dc4ca 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-08-19  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkdnd-x11.c (get_client_window_at_coords_recurse): Free
+	children in all cases.  (#313862, Kjartan Maraas)
+
 	* gtk/gtkicontheme.c (theme_lookup_icon): Store GtkIconData structs 
 	in the per-directory hash, even if they come from the icon cache. 
 	We tried to avoid that before, but as a result leaked icon data
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index eb215d8589..9dbb54f29a 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -548,7 +548,11 @@ get_client_window_at_coords_recurse (GdkDisplay *display,
     return None;
 
   if (has_wm_state)
-    return win;
+    {
+      g_free (children);
+
+      return win;
+    }
 
   for (i = nchildren - 1; (i >= 0) && !found_child; i--)
     {