diff --git a/ChangeLog b/ChangeLog
index b5ede0409c..0a12670ce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-16  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkevents-quartz.c (create_scroll_event): Add state
+	to the scroll event (bug #516757, Paul Davis).
+
 2008-02-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index aded4d4d07..e8418878dd 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -1439,6 +1439,7 @@ create_scroll_event (GdkWindow          *window,
   point = [nsevent locationInWindow];
   event->scroll.x = point.x;
   event->scroll.y = point.y;
+  event->scroll.state = get_keyboard_modifiers_from_ns_event (nsevent);
   convert_window_coordinates_to_root (window, event->scroll.x, event->scroll.y, 
 				      &event->scroll.x_root,
 				      &event->scroll.y_root);