diff --git a/ChangeLog b/ChangeLog
index b83f2c8eb9d9e5802257deccd7e4028d0ecc8356..f369fab0cd554cdfb98ff9b3e0c22750d6b7a8a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-25	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-dialogs.c(thunar_dialogs_show_about): Add support
+	  for new GTK+ 2.11 API.
+	* docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml: Add new
+	  signal "ask-replace" to the reference manual.
+
 2007-05-23	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-io-jobs.c, thunar-vfs/thunar-vfs-job.{c,h},
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
index 18b6063ef7804d3cd514565b7c499094199d9c60..26328911c854ec58adcd07b1f0b163d56f34f006 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
@@ -27,6 +27,7 @@ ThunarVfsJob
 @THUNAR_VFS_JOB_RESPONSE_NO: 
 @THUNAR_VFS_JOB_RESPONSE_CANCEL: 
 @THUNAR_VFS_JOB_RESPONSE_NO_ALL: 
+@THUNAR_VFS_JOB_RESPONSE_RETRY: 
 
 <!-- ##### STRUCT ThunarVfsJob ##### -->
 <para>
@@ -44,6 +45,16 @@ ThunarVfsJob
 @arg2: 
 @Returns: 
 
+<!-- ##### SIGNAL ThunarVfsJob::ask-replace ##### -->
+<para>
+
+</para>
+
+@thunarvfsjob: the object which received the signal.
+@arg1: 
+@arg2: 
+@Returns: 
+
 <!-- ##### SIGNAL ThunarVfsJob::error ##### -->
 <para>
 
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 1b5a15cc00deb0f46f11724643626bee256a957b..2098a5ec2d6c7ec046c779d797c2abeb809577d4 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -100,7 +100,11 @@ thunar_dialogs_show_about (GtkWindow   *parent,
                          "documenters", documenters,
                          "license", XFCE_LICENSE_GPL,
                          "logo", logo,
+#if GTK_CHECK_VERSION(2,11,0)
+                         "program-name", title,
+#else
                          "name", title,
+#endif
                          "translator-credits", _("translator-credits"),
                          "version", PACKAGE_VERSION,
                          "website", "http://thunar.xfce.org/",