diff --git a/gio/ChangeLog b/gio/ChangeLog
index 78087725b..73f8ba2c1 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,4 +1,13 @@
-2008-06-30 Matthias Clasen  <mclasen@redhat.com>
+2008-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	Backported from trunk:
+
+	Bug 537392 – Additional colon in xattr name
+
+	* glocalfileinfo.c (set_xattr): Skip the second colon of the prefix,
+	too. Reported by  Alessandro Morandi
+
+2008-06-30  Matthias Clasen  <mclasen@redhat.com>
 
 	Backported from trunk:
 
@@ -8,7 +17,7 @@
 	* glocalfile.c (get_fs_type): Add afs and autofs.
 	Patch by Danny Baumann.
 
-2008-06-30 Matthias Clasen  <mclasen@redhat.com>
+2008-06-30  Matthias Clasen  <mclasen@redhat.com>
 
 	Backported from trunk:
 
@@ -17,13 +26,13 @@
 	* gdummyfile.c (g_dummy_file_get_parent): Return NULL if there
 	is no parent.  (Owen Taylor, patch by Christian Neumair)
 
-2008-06-30 Matthias Clasen  <mclasen@redhat.com>
+2008-06-30  Matthias Clasen  <mclasen@redhat.com>
 
 	Backported from trunk:
 
 	* gfile.c (g_file_replace_contents): do not leak the output stream.
 
-2008-06-30 Matthias Clasen  <mclasen@redhat.com>
+2008-06-30  Matthias Clasen  <mclasen@redhat.com>
 
 	Backported from trunk:
 
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 23ae2bf46..01ea7f013 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -726,13 +726,13 @@ set_xattr (char                       *filename,
 
   if (g_str_has_prefix (escaped_attribute, "xattr::"))
     {
-      escaped_attribute += 6;
+      escaped_attribute += strlen ("xattr::");
       is_user = TRUE;
     }
   else
     {
       g_warn_if_fail (g_str_has_prefix (escaped_attribute, "xattr-sys::"));
-      escaped_attribute += 10;
+      escaped_attribute += strlen ("xattr-sys::");
       is_user = FALSE;
     }