diff --git a/ChangeLog b/ChangeLog
index 43b071c44b5f6bd454f37bbe310b378f5db423c7..a39a94688d08407c9b8d1a7b759879f87109e3bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-15  Christian Dywan  <christian@imendio.com>
+
+        Bug 547775 – Documentation of gtk-button-images is not correct
+
+	* gtk/gtkbutton.c (gtk_button_class_init): Improve documentation
+        of "gtk-button-images" setting
+
 2008-08-13  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 547673 – Accessors for GtkFileSelection.font_entry and
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index e68c5297ffb9b83200d596909979184e69394f20..234f0367ec26141eab47f7527b9590c84794cf46 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -481,15 +481,15 @@ gtk_button_class_init (GtkButtonClass *klass)
 							     GTK_PARAM_READABLE));
 
   /**
-   * GtkButton::gtk-button-images:
-   * 
-   * If stock icon in buttons should be shown at all.
-   * 
+   * GtkSettings::gtk-button-images:
+   *
+   * Whether images should be shown on buttons
+   *
    * Since: 2.4
    */
   gtk_settings_install_property (g_param_spec_boolean ("gtk-button-images",
 						       P_("Show button images"),
-						       P_("Whether stock icons should be shown in buttons"),
+						       P_("Whether images should be shown on buttons"),
 						       TRUE,
 						       GTK_PARAM_READWRITE));