diff --git a/ChangeLog b/ChangeLog
index 58ff26514e..07150f39ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-10  Morten Welinder  <terra@gnome.org>
+
+	* tests/testfilechooser.c (main): Add support for --multiple.
+
 Wed Mar 10 02:41:05 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkpathbar.c: (gtk_path_bar_init), (gtk_path_bar_class_init),
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 58ff26514e..07150f39ad 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2004-03-10  Morten Welinder  <terra@gnome.org>
+
+	* tests/testfilechooser.c (main): Add support for --multiple.
+
 Wed Mar 10 02:41:05 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkpathbar.c: (gtk_path_bar_init), (gtk_path_bar_class_init),
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 58ff26514e..07150f39ad 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2004-03-10  Morten Welinder  <terra@gnome.org>
+
+	* tests/testfilechooser.c (main): Add support for --multiple.
+
 Wed Mar 10 02:41:05 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkpathbar.c: (gtk_path_bar_init), (gtk_path_bar_class_init),
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 58ff26514e..07150f39ad 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2004-03-10  Morten Welinder  <terra@gnome.org>
+
+	* tests/testfilechooser.c (main): Add support for --multiple.
+
 Wed Mar 10 02:41:05 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkpathbar.c: (gtk_path_bar_init), (gtk_path_bar_class_init),
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 58ff26514e..07150f39ad 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2004-03-10  Morten Welinder  <terra@gnome.org>
+
+	* tests/testfilechooser.c (main): Add support for --multiple.
+
 Wed Mar 10 02:41:05 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkpathbar.c: (gtk_path_bar_init), (gtk_path_bar_class_init),
diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 6b7318dcf4..dbb573d28a 100644
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -380,6 +380,7 @@ main (int argc, char **argv)
   GtkFileFilter *filter;
   GtkWidget *preview_vbox;
   int i;
+  gboolean multiple = FALSE;
   
   gtk_init (&argc, &argv);
 
@@ -396,11 +397,14 @@ main (int argc, char **argv)
 	action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
       else if (! strcmp ("--action=create_folder", argv[i]))
 	action = GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER;
+      else if (! strcmp ("--multiple", argv[i]))
+	multiple = TRUE;
     }
 
   dialog = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG,
 			 "action", action,
 			 "file-system-backend", "gnome-vfs",
+			 "select-multiple", multiple,
 			 NULL);
   switch (action)
     {
@@ -493,6 +497,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (control_window), vbbox);
 
   button = gtk_button_new_with_mnemonic ("_Select all");
+  gtk_widget_set_sensitive (button, multiple);
   gtk_container_add (GTK_CONTAINER (vbbox), button);
   g_signal_connect_swapped (button, "clicked",
 			    G_CALLBACK (gtk_file_chooser_select_all), dialog);