diff --git a/ChangeLog b/ChangeLog
index 6fef98e9b6..903cc74830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-16  Mathias Hasselmann  <mathias@openismus.com>
+
+	Prevent assertion failure in gtk_paned_find_neighbours. (#503824,
+	Sébastien Granjoux)
+
+	* gtk/gtkpaned.c: Call gtk_container_forall instead of
+	gtk_container_foreach in get_child_panes.
+
 2007-12-15  Xan Lopez  <xan.lopez@nokia.com>
 
 	Merged from trunk:
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 1752de0cea..0bf8cabe0d 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1600,7 +1600,7 @@ get_child_panes (GtkWidget  *widget,
     }
   else if (GTK_IS_CONTAINER (widget))
     {
-      gtk_container_foreach (GTK_CONTAINER (widget),
+      gtk_container_forall (GTK_CONTAINER (widget),
 			     (GtkCallback)get_child_panes, panes);
     }
 }