diff --git a/ChangeLog b/ChangeLog
index 32dc863ae5..d30f1fe025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-23  Johan Dahlin  <johan@gnome.org>
+
+	* gtk/gtk-builder-convert:
+	Properly convert GtkImageMenuItems which use stock labels but don't
+	have any children.
+	(#523932, Brian Pepple)
+	
 2008-03-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_get_cells):
diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
index 088637f2e2..62dea26f7b 100755
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert
@@ -422,7 +422,7 @@ class GtkBuilderConverter(object):
 
         if get_property(node, 'use_stock') == 'True':
             if 'label' in properties:
-                properties['stock_id'] = child
+                properties['stock_id'] = properties['label']
                 del properties['label']
 
         properties['name'] = object_id