diff --git a/gio/ChangeLog b/gio/ChangeLog
index c792fb0ca..ebb1f8800 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-14  Alexander Larsson  <alexl@redhat.com>
+
+        * glocalfile.c:
+	Copy permissions with file on copy (#514084)
+	This is what cp does and makes sure e.g. the
+	exec permissions are kept.
+	Its kinda weird in that it keeps the permission bits
+	the same while the uid and gid are different. However
+	the new uid is the user so its not a security issue,
+	and I've heard no complaints about cp on this issue.
+
 2008-02-13  Ryan Lortie  <desrt@desrt.ca>
 
 	* gfileinfo.h: add G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index b29336378..66535b4e6 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -143,6 +143,7 @@ g_local_file_class_init (GLocalFileClass *klass)
   g_file_attribute_info_list_add (list,
 				  G_FILE_ATTRIBUTE_UNIX_MODE,
 				  G_FILE_ATTRIBUTE_TYPE_UINT32,
+				  G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE |
 				  G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED);
   
 #ifdef HAVE_CHOWN