diff --git a/ChangeLog b/ChangeLog
index d58a1d4f19..4ee00add1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-04  Björn Lindqvist  <bjourne@gmail.com>
+
+	Bug 534979 – GtkImageMenuItem is a bin but has two children.
+
+	* gtk/gtkimagemenuitem.c (gtk_image_menu_item_forall): Do not
+	include the image widget when iterating over non-internal
+	children. Patch by rainwoodman.
+
 2008-08-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 369375a0a4..6c8e4ed547 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -352,7 +352,7 @@ gtk_image_menu_item_forall (GtkContainer   *container,
 								      callback,
 								      callback_data);
 
-  if (image_menu_item->image)
+  if (include_internals && image_menu_item->image)
     (* callback) (image_menu_item->image, callback_data);
 }