diff --git a/ChangeLog b/ChangeLog
index c265126488..42a1c15d0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-04-05  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_make_path): Look
+	for G_DIR_SEPARATOR in the display_name, and err out if it is
+	present; use the same error message as Nautilus.  Fixes #136467.
+
 	* gtk/gtkfilechooserdefault.c (file_pane_create): Make the
 	new-folder button say "Create Fo_lder" rather than "Create
 	_Folder", so that the mnemonic doesn't conflict with the "Save in
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c265126488..42a1c15d0c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-04-05  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_make_path): Look
+	for G_DIR_SEPARATOR in the display_name, and err out if it is
+	present; use the same error message as Nautilus.  Fixes #136467.
+
 	* gtk/gtkfilechooserdefault.c (file_pane_create): Make the
 	new-folder button say "Create Fo_lder" rather than "Create
 	_Folder", so that the mnemonic doesn't conflict with the "Save in
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c265126488..42a1c15d0c 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,9 @@
 2004-04-05  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_make_path): Look
+	for G_DIR_SEPARATOR in the display_name, and err out if it is
+	present; use the same error message as Nautilus.  Fixes #136467.
+
 	* gtk/gtkfilechooserdefault.c (file_pane_create): Make the
 	new-folder button say "Create Fo_lder" rather than "Create
 	_Folder", so that the mnemonic doesn't conflict with the "Save in
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c265126488..42a1c15d0c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-04-05  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_make_path): Look
+	for G_DIR_SEPARATOR in the display_name, and err out if it is
+	present; use the same error message as Nautilus.  Fixes #136467.
+
 	* gtk/gtkfilechooserdefault.c (file_pane_create): Make the
 	new-folder button say "Create Fo_lder" rather than "Create
 	_Folder", so that the mnemonic doesn't conflict with the "Save in
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c265126488..42a1c15d0c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-04-05  Federico Mena Quintero  <federico@ximian.com>
 
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_make_path): Look
+	for G_DIR_SEPARATOR in the display_name, and err out if it is
+	present; use the same error message as Nautilus.  Fixes #136467.
+
 	* gtk/gtkfilechooserdefault.c (file_pane_create): Make the
 	new-folder button say "Create Fo_lder" rather than "Create
 	_Folder", so that the mnemonic doesn't conflict with the "Save in
diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index c71a643e00..9d4f63eb88 100644
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -769,6 +769,18 @@ gtk_file_system_unix_make_path (GtkFileSystem    *file_system,
   g_return_val_if_fail (base_filename != NULL, NULL);
   g_return_val_if_fail (g_path_is_absolute (base_filename), NULL);
 
+  if (strchr (display_name, G_DIR_SEPARATOR))
+    {
+      g_set_error (error,
+		   GTK_FILE_SYSTEM_ERROR,
+		   GTK_FILE_SYSTEM_ERROR_BAD_FILENAME,
+		   _("The name \"%s\" is not valid because it contains the character \"%s\". "
+		     "Please use a different name."),
+		   display_name,
+		   G_DIR_SEPARATOR_S);
+      return NULL;
+    }
+
   filename = g_filename_from_utf8 (display_name, -1, NULL, NULL, &tmp_error);
   if (!filename)
     {