diff --git a/ChangeLog b/ChangeLog
index 04dbb3a..1127157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-09  Lucas Rocha  <lucasr@gnome.org>
+
+	* src/fileselection.c (zenity_fileselection): correctly handle
+	--filename option on file selection mode (Fixes bug #564552).
+	Patch from Gilles Detillieux.
+
 2009-01-08  Lucas Rocha  <lucasr@gnome.org>
 
 	* data/zenity.1: document --timeout (Fixes bug #565133).
diff --git a/src/fileselection.c b/src/fileselection.c
index 46d1941..4cfa051 100644
--- a/src/fileselection.c
+++ b/src/fileselection.c
@@ -76,7 +76,10 @@ void zenity_fileselection (ZenityData *data, ZenityFileData *file_data)
 
     if (file_data->uri[strlen (file_data->uri) - 1] != '/') {
       basename = g_path_get_basename (file_data->uri);
-      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename);
+      if (file_data->save)
+        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename);
+      else
+        (void) gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), file_data->uri);
       g_free (basename);
     }
     g_free (dir);