diff --git a/ChangeLog b/ChangeLog
index eb96f6df2..cf35e8252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-31  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/FileChooserDialog.custom : move backend to first param to
+	avoid conflicts with button names in overloaded ctor.
+
 2005-01-31  Mike Kestner  <mkestner@novell.com>
 
 	* generator/SymbolTable.cs : handle unsigned-*.
diff --git a/doc/en/Gtk/FileChooserDialog.xml b/doc/en/Gtk/FileChooserDialog.xml
index 2afa027c5..4d9efd04d 100644
--- a/doc/en/Gtk/FileChooserDialog.xml
+++ b/doc/en/Gtk/FileChooserDialog.xml
@@ -925,7 +925,7 @@
       <Docs>
         <summary>Creates a file chooser dialog.</summary>
         <param name="title">a title <see cref="T:System.String" /></param>
-        <param name="parent">a parent <see cref="T:Gtk.Window" /> for the dialog, or <see langword="null"/>.</param>
+        <param name="parent">a parent <see cref="T:Gtk.Window" /> for the dialog, or <see langword="null" />.</param>
         <param name="action">an action, for example save or open.</param>
         <param name="button_data">a list of button text/response pairs for buttons to be added to the dialog, if desired.</param>
         <returns>a <see cref="T:Gtk.FileChooserDialog" /></returns>
@@ -933,23 +933,24 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileChooserDialog (string title, Gtk.Window parent, Gtk.FileChooserAction action, string backend, object [] button_data);" />
+      <MemberSignature Language="C#" Value="public FileChooserDialog (string backend, string title, Gtk.Window parent, Gtk.FileChooserAction action, object [] button_data);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
+        <Parameter Name="backend" Type="System.String" />
         <Parameter Name="title" Type="System.String" />
         <Parameter Name="parent" Type="Gtk.Window" />
         <Parameter Name="action" Type="Gtk.FileChooserAction" />
-        <Parameter Name="backend" Type="System.String" />
         <Parameter Name="button_data" Type="System.Object[]" />
       </Parameters>
       <Docs>
         <summary>Creates a file chooser dialog with a specific file chooser backend</summary>
-        <param name="title">a title <see cref="T:System.String" /></param>
-        <param name="parent">a parent <see cref="T:Gtk.Window" /> for the dialog, or <see langword="null"/>.</param>
-        <param name="action">an action, for example save or open.</param>
         <param name="backend">a <see cref="T:System.String" />, the backend name</param>
+        <param name="title">a title <see cref="T:System.String" /></param>
+        <param name="parent">a parent <see cref="T:Gtk.Window" /> for the dialog, or <see langword="null" />.</param>
+        <param name="action">an action, for example save or open.</param>
         <param name="button_data">a list of button text/response pairs for buttons to be added to the dialog, if desired.</param>
+        <returns>a <see cref="T:Gtk.FileChooserDialog" /></returns>
         <remarks>
 	  This is especially useful if you use <see cref="P:Gtk.FileChooser.LocalOnly" /> to allow
 	  non-local files and you use a more expressive vfs, such as gnome-vfs, to load files.
diff --git a/gtk/FileChooserDialog.custom b/gtk/FileChooserDialog.custom
index 170faabaf..bcc2b4d71 100644
--- a/gtk/FileChooserDialog.custom
+++ b/gtk/FileChooserDialog.custom
@@ -41,7 +41,7 @@
 		[DllImport("libgtk-win32-2.0-0.dll")]
 		static extern IntPtr gtk_file_chooser_dialog_new_with_backend(string title, IntPtr parent, int action, string backend, IntPtr nil);
 		
-		public FileChooserDialog (string title, Window parent, FileChooserAction action, string backend, params object[] button_data) : base (IntPtr.Zero)
+		public FileChooserDialog (string backend, string title, Window parent, FileChooserAction action, params object[] button_data) : base (IntPtr.Zero)
 		{
 			if (GetType () != typeof (FileChooserDialog)) {
 				CreateNativeObject (new string[] { "file-system-backend" }, new GLib.Value[] { new GLib.Value (backend) } );