diff --git a/ChangeLog b/ChangeLog
index ccd0ac8b90..4a52f98f52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-25  Xan Lopez  <xan@gnome.org>
+
+	* gtk/gtkaction.c: (gtk_action_set_short_label):
+	Use private->data->short_label to update the proxies.
+
 2007-05-25  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz/gdkimage-quartz.c: (_gdk_quartz_image_copy_to_image):
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index a006691158..eb8173ef8b 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -1344,7 +1344,7 @@ gtk_action_set_short_label (GtkAction	*action,
 
       if (GTK_IS_TOOL_BUTTON (proxy))
 	gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy), 
-				   action->private_data->label);
+				   action->private_data->short_label);
       else if (GTK_IS_BUTTON (proxy) &&
 	       !gtk_button_get_use_stock (GTK_BUTTON (proxy)))
 	{
@@ -1352,7 +1352,7 @@ gtk_action_set_short_label (GtkAction	*action,
 	  
 	  if (child == NULL || GTK_IS_LABEL (child))
 	    gtk_button_set_label (GTK_BUTTON (proxy), 
-				  action->private_data->label);
+				  action->private_data->short_label);
 	}
     }