diff --git a/ChangeLog b/ChangeLog
index 52ad263dc..720af98fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-04  Mathias Hasselmann  <mathias@openismus.com>
+
+	Resolve 64 bit-shift bug in g_markup_collect_attributes.
+	Spotted by Lieven van der Heide.
+
+	* glib/gmarkup.c: Use G_GUINT64_CONSTANT in bit-shift.
+
 2008-01-02  Alvaro Lopez Ortega  <alvaro@sun.com>
 
 	* gio/gunixmount.c (g_unix_mount_unmount, g_unix_mount_eject):
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 1467e17b3..e1e9aa579 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -2602,7 +2602,7 @@ g_markup_collect_attributes (const gchar         *element_name,
 
   /* ensure we collected all the arguments */
   for (i = 0; attribute_names[i]; i++)
-    if ((collected & (1 << i)) == 0)
+    if ((collected & (G_GUINT64_CONSTANT(1) << i)) == 0)
       {
         /* attribute not collected:  could be caused by two things.
          *