diff --git a/ChangeLog b/ChangeLog
index a3934f6eb6..b213c9f346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-26  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/display/gimpdisplayshell-autoscroll.c
+	(gimp_display_shell_autoscroll_timeout): Pass the scroll amount in
+	variables that we can modify as we please before they actually
+	reach gimp_display_shell_scroll().
+
 2008-08-26  Michael Natterer  <mitch@gimp.org>
 
 	* app/tools/gimppaintoptions-gui.c (gimp_paint_options_gui): don't
diff --git a/app/display/gimpdisplayshell-autoscroll.c b/app/display/gimpdisplayshell-autoscroll.c
index 9b7f348839..4cd252619b 100644
--- a/app/display/gimpdisplayshell-autoscroll.c
+++ b/app/display/gimpdisplayshell-autoscroll.c
@@ -130,14 +130,16 @@ gimp_display_shell_autoscroll_timeout (gpointer data)
 
   if (dx || dy)
     {
-      GimpDisplay *display     = shell->display;
-      GimpTool    *active_tool = tool_manager_get_active (display->gimp);
+      GimpDisplay *display         = shell->display;
+      GimpTool    *active_tool     = tool_manager_get_active (display->gimp);
+      gint         scroll_amount_x = AUTOSCROLL_DX * dx;
+      gint         scroll_amount_y = AUTOSCROLL_DX * dy;
 
       info->time += AUTOSCROLL_DT;
 
       gimp_display_shell_scroll (shell,
-                                 AUTOSCROLL_DX * (gdouble) dx,
-                                 AUTOSCROLL_DX * (gdouble) dy);
+                                 scroll_amount_x,
+                                 scroll_amount_y);
 
       gimp_display_shell_untransform_coordinate (shell,
                                                  &device_coords,