diff --git a/ChangeLog b/ChangeLog
index eddc663a3c..99ebecdde2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-07  Sven Neumann  <sven@gimp.org>
+
+	* etc/controllerrc: changed default mouse-wheel bindings to act on
+	the active tool instead of controlling the context.
+
 2008-03-07  Sven Neumann  <sven@gimp.org>
 
 	* app/display/gimpdisplayshell-preview.c: minor optimization.
diff --git a/etc/controllerrc b/etc/controllerrc
index 0cd51670ce..93e71985f3 100644
--- a/etc/controllerrc
+++ b/etc/controllerrc
@@ -5,8 +5,8 @@
     (debug-events no)
     (controller "GimpControllerWheel")
     (mapping
-        (map "scroll-up-alt"                 "context-opacity-increase-skip")
-        (map "scroll-down-alt"               "context-opacity-decrease-skip")
+        (map "scroll-up-alt"                 "tools-value-1-increase-skip")
+        (map "scroll-down-alt"               "tools-value-1-decrease-skip")
         (map "scroll-up-control-alt"         "context-gradient-select-next")
         (map "scroll-down-control-alt"       "context-gradient-select-previous")
         (map "scroll-up-shift-alt"           "context-pattern-select-next")
@@ -44,8 +44,8 @@
 #    (controller "ControllerLinuxInput"
 #        (device "/dev/input/event2"))
 #    (mapping
-#        (map "wheel-turn-left"  "context-brush-radius-decrease")
-#        (map "wheel-turn-right" "context-brush-radius-increase")))
+#        (map "wheel-turn-left"  "tools-value-2-decrease")
+#        (map "wheel-turn-right" "tools-value-2-increase")))
 
 # (GimpControllerInfo "Midi Example"
 #    (enabled yes)