diff --git a/ChangeLog b/ChangeLog
index af4fe38e22..4afb0d339b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
+	trigger warnings if there are extra references to the
+	hbox.  (#308677, Dan Winship)
+
 	* gtk/gtkfilesystemunix.c: Ignore everything after the
 	first space in lines from the .gtk-bookmarks file.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index af4fe38e22..4afb0d339b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
+	trigger warnings if there are extra references to the
+	hbox.  (#308677, Dan Winship)
+
 	* gtk/gtkfilesystemunix.c: Ignore everything after the
 	first space in lines from the .gtk-bookmarks file.
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index af4fe38e22..4afb0d339b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
+	trigger warnings if there are extra references to the
+	hbox.  (#308677, Dan Winship)
+
 	* gtk/gtkfilesystemunix.c: Ignore everything after the
 	first space in lines from the .gtk-bookmarks file.
 
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 955a24ca82..35fc06db3d 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -644,7 +644,11 @@ gtk_button_construct_child (GtkButton *button)
   if (GTK_BIN (button)->child)
     {
       if (priv->image && !priv->image_is_stock)
-	image = g_object_ref (priv->image);
+	{
+	  image = g_object_ref (priv->image);
+	  if (image->parent)
+	    gtk_container_remove (GTK_CONTAINER (image->parent), image);
+	}
 
       gtk_container_remove (GTK_CONTAINER (button),
   			    GTK_BIN (button)->child);