diff --git a/gio/ChangeLog b/gio/ChangeLog
index 0ceb81a77..744cd41ac 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-10  Alexander Larsson  <alexl@redhat.com>
+
+	* gfileattribute.c (escape_byte_string):
+	Upper half of byte is >> 4, not >> 8.
+	Found by Kjartan Maraas via sparse
+
 2008-10-10  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 555711 – Wrong fallback order of mimetype icons
diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c
index 76bdf6119..338f8093d 100644
--- a/gio/gfileattribute.c
+++ b/gio/gfileattribute.c
@@ -384,7 +384,7 @@ escape_byte_string (const char *str)
 	    {
 	      *p++ = '\\';
 	      *p++ = 'x';
-	      *p++ = hex_digits[(c >> 8) & 0xf];
+	      *p++ = hex_digits[(c >> 4) & 0xf];
 	      *p++ = hex_digits[c & 0xf];
 	    }
 	}