diff --git a/ChangeLog b/ChangeLog
index 66b64b28fd..6788ff9f50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 493008 – gdk_screen_get_window_stack is not 64-bit-compatible
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_get_window_stack): Fix
+	64-bit brokenness. Reported by Christian Hammond.
+
 2008-07-06  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 541645 – gtkfilechooserdefault segfaults when bookmark does not
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 9b06e7deae..624d1901e0 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -1205,14 +1205,14 @@ gdk_screen_get_window_stack (GdkScreen *screen)
       if ((type_return == XA_WINDOW) && (format_return == 32) &&
           (data) && (nitems_return > 0))
         {
-          GdkNativeWindow *stack = (GdkNativeWindow *) data;
+          gulong *stack = (gulong *) data;
           GdkWindow *win;
           int i;
 
           for (i = 0; i < nitems_return; i++)
             {
               win = gdk_window_foreign_new_for_display (screen_x11->display,
-                                                        stack[i]);
+                                                        (GdkNativeWindow)stack[i]);
 
               if (win != NULL)
                 ret = g_list_append (ret, win);