diff --git a/ChangeLog b/ChangeLog
index efd0478d76..394d6a0a4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c: Correct docs for program-name property.
+	(#496689, Thomas Wood)
+
 2007-11-17  Paolo Borelli  <pborelli@katamail.com>
 
 	* gtk/gtktextbuffer.c:
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index f9c800c201..395448bcaf 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-19  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkaboutdialog.sgml: Add some hints about
+	program-name vs name.  (#496689, Thomas Wood)
+
 2007-11-19  Matthias Clasen <mclasen@redhat.com>
 
 	* gtk/tmpl/gtkbuilder.sgml: Small correction to the
diff --git a/docs/reference/gtk/tmpl/gtkaboutdialog.sgml b/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
index afb471e4ef..4cb3fb7fc5 100644
--- a/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
@@ -37,11 +37,16 @@ a #GtkAboutDialog, as shown in the following example:
 </para>
 <informalexample><programlisting>
 gtk_show_about_dialog (NULL, 
-                       "name", "ExampleCode",
+                       "program-name", "ExampleCode",
                        "logo", example_logo,
                        "title" _("About ExampleCode"),
                        NULL);
 </programlisting></informalexample>
+<para>
+Note that prior to GTK+ 2.12, the #GtkAboutDialog:program-name property
+was called "name". This was changed to avoid the conflict with the
+#GtkWidget:name property.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index cd63f5b74a..13c7fa8e16 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -184,12 +184,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
 
 
   /**
-   * GtkAboutDialog:name:
+   * GtkAboutDialog:program-name:
    *
    * The name of the program. 
    * If this is not set, it defaults to g_get_application_name().
    *
-   * Since: 2.6
+   * Since: 2.12
    */  
   g_object_class_install_property (object_class,
 				   PROP_NAME,