diff --git a/ChangeLog b/ChangeLog
index bbe3636349..27338b5161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkaction.c (gtk_action_sync_button_stock_id) 
+	(connect_proxy): Buttons use the label property for stock ids.  (#322565,
+	Milosz Derezynski)
+
 	* gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
 	handle the cell list and indices into it.  (#321856)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bbe3636349..27338b5161 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkaction.c (gtk_action_sync_button_stock_id) 
+	(connect_proxy): Buttons use the label property for stock ids.  (#322565,
+	Milosz Derezynski)
+
 	* gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
 	handle the cell list and indices into it.  (#321856)
 
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index fbb32a8918..fc0871ab66 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -745,7 +745,7 @@ gtk_action_sync_button_stock_id (GtkAction  *action,
 				 GtkWidget  *proxy)
 {
   g_object_set (G_OBJECT (proxy),
-                "stock-id",
+                "label",
                 action->private_data->stock_id,
                 NULL);
 }
@@ -949,7 +949,7 @@ connect_proxy (GtkAction     *action,
 	{
 	  /* synchronise stock-id */
 	  g_object_set (proxy,
-			"stock-id", action->private_data->stock_id,
+			"label", action->private_data->stock_id,
 			NULL);
 	  g_signal_connect_object (action, "notify::stock-id",
 				   G_CALLBACK (gtk_action_sync_button_stock_id),