diff --git a/ChangeLog b/ChangeLog
index ea4ba0a720..6a1563869b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkbutton.c (gtk_button_construct_child): Don't leave
+	priv->image dangling when use-stock is set to FALSE.
+	(#437281, Jochen Baier)
+
 2007-06-29  Matthias Clasen  <mclasen@redhat.com>
 
 	Merge from trunk:
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index c45ac8eea4..11a0672d04 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -733,10 +733,10 @@ gtk_button_construct_child (GtkButton *button)
       image = g_object_ref (priv->image);
       if (image->parent)
 	gtk_container_remove (GTK_CONTAINER (image->parent), image);
-
-      priv->image = NULL;
     }
   
+  priv->image = NULL;
+
   if (GTK_BIN (button)->child)
     gtk_container_remove (GTK_CONTAINER (button),
 			  GTK_BIN (button)->child);