diff --git a/ChangeLog b/ChangeLog
index 91b7b97c2d..d5a67e8b61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (create_file_info): Treat backup
+	files the same way as hidden files, to be closer to what
+	Nautilus does.  (#136196, Sean Middleditch)
+
 2005-06-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 91b7b97c2d..d5a67e8b61 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-06-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (create_file_info): Treat backup
+	files the same way as hidden files, to be closer to what
+	Nautilus does.  (#136196, Sean Middleditch)
+
 2005-06-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 91b7b97c2d..d5a67e8b61 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-06-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (create_file_info): Treat backup
+	files the same way as hidden files, to be closer to what
+	Nautilus does.  (#136196, Sean Middleditch)
+
 2005-06-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 82355e1cf3..a225b4b34f 100644
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -1936,7 +1936,10 @@ create_file_info (const char     *filename,
     }
 
   if (types & GTK_FILE_INFO_IS_HIDDEN)
-    gtk_file_info_set_is_hidden (info, basename[0] == '.');
+    {
+      if (basename[0] == '.' || basename[strlen (basename) - 1] == '~')
+	gtk_file_info_set_is_hidden (info, TRUE);
+    }
 
   if (types & GTK_FILE_INFO_IS_FOLDER)
     gtk_file_info_set_is_folder (info, S_ISDIR (statbuf->st_mode));