diff --git a/ChangeLog b/ChangeLog
index ac9f83d132..3d9981a521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-12  Michael Natterer  <mitch@gimp.org>
+
+	* modules/controller_midi.c: applied patch from S. Fielding which
+	passes the right MIDI channel from the ALSA event to midi_event().
+	Fixes bug #537960.
+
 2008-06-12  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/help-browser/dialog.c: use GTK_STOCK_HOME for the
@@ -167,7 +173,7 @@
 	* app/gegl/gimpoperationdesaturate.h
 	* app/tools/gimprectangletool.c
 	* app/widgets/gimpradioaction.h
-	* app/widgets/gimptoggleaction.h: various fixes tpo make gtk-doc
+	* app/widgets/gimptoggleaction.h: various fixes to make gtk-doc
 	happy.
 
 2008-06-04  Sven Neumann  <sven@gimp.org>
diff --git a/modules/controller_midi.c b/modules/controller_midi.c
index c89db5067d..1f449c1b75 100644
--- a/modules/controller_midi.c
+++ b/modules/controller_midi.c
@@ -841,17 +841,20 @@ midi_alsa_dispatch (GSource     *source,
       switch (event->type)
         {
         case SND_SEQ_EVENT_NOTEON:
-          midi_event (midi, midi->channel, event->data.note.note,
+          midi_event (midi, event->data.note.channel,
+                      event->data.note.note,
                       (gdouble) event->data.note.velocity / 127.0);
           break;
 
         case SND_SEQ_EVENT_NOTEOFF:
-          midi_event (midi, midi->channel, event->data.note.note + 128,
+          midi_event (midi, event->data.note.channel,
+                      event->data.note.note + 128,
                       (gdouble) event->data.note.velocity / 127.0);
           break;
 
         case SND_SEQ_EVENT_CONTROLLER:
-          midi_event (midi, midi->channel, event->data.control.param + 256,
+          midi_event (midi, event->data.control.channel,
+                      event->data.control.param + 256,
                       (gdouble) event->data.control.value / 127.0);
           break;