diff --git a/ChangeLog b/ChangeLog
index 06db2b9682..cc2740b736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtk.symbols
+	* gtk/gtkfilesystem.[ch]: rename _gtk_file_system_create to
+	gtk_file_system_create to make it public and bring trunk back
+	in sync with gtk-2-10.
+
+	* gtk/gtkfilechooserdefault.c (set_file_system_backend): updated.
+
 2007-06-13  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtklabel.c (gtk_label_set_label): added calls to
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 10aee0609d..8b69a9efcb 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1449,6 +1449,7 @@ gtk_file_paths_copy
 gtk_file_paths_free
 gtk_file_paths_sort
 gtk_file_system_cancel_operation
+gtk_file_system_create
 gtk_file_system_create_folder
 gtk_file_system_error_quark
 gtk_file_system_filename_to_path
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index e3791f9def..b93d2ae03b 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5352,7 +5352,7 @@ set_file_system_backend (GtkFileChooserDefault *impl,
 
   impl->file_system = NULL;
   if (backend)
-    impl->file_system = _gtk_file_system_create (backend);
+    impl->file_system = gtk_file_system_create (backend);
   else
     {
       GtkSettings *settings = gtk_settings_get_default ();
@@ -5361,7 +5361,7 @@ set_file_system_backend (GtkFileChooserDefault *impl,
       g_object_get (settings, "gtk-file-chooser-backend", &default_backend, NULL);
       if (default_backend)
 	{
-	  impl->file_system = _gtk_file_system_create (default_backend);
+	  impl->file_system = gtk_file_system_create (default_backend);
 	  g_free (default_backend);
 	}
     }
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index c4bbbdefb8..04de8a682e 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1357,7 +1357,7 @@ _gtk_file_system_module_create (GtkFileSystemModule *fs_module)
 
 
 GtkFileSystem *
-_gtk_file_system_create (const char *file_system_name)
+gtk_file_system_create (const char *file_system_name)
 {
   GSList *l;
   char *module_path;
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index 57c458a028..18aa584855 100644
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -441,7 +441,7 @@ void    gtk_file_paths_free (GSList *paths);
 
 /* GtkFileSystem modules support */
 
-GtkFileSystem  *_gtk_file_system_create (const char *file_system_name);
+GtkFileSystem  *gtk_file_system_create (const char *file_system_name);
 
 G_END_DECLS