diff --git a/ChangeLog b/ChangeLog
index 92ea030595..e79f65ab90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-15  Wim Taymans  <wim@fluendo.com>
+
+	Patch by: Darren Kenny <darren dot kenny at sun dot com>
+
+	* sys/sunaudio/gstsunaudiomixerctrl.c:
+	(gst_sunaudiomixer_ctrl_build_list):
+	Set the output track as the MASTER so that the gnome-settings-daemon
+	keybindings for changing the volume using the keyboard works.
+	Fixes #356142.
+
 2006-09-15  Wim Taymans  <wim@fluendo.com>
 
 	* gst/multipart/multipartdemux.c: (gst_multipart_demux_chain):
diff --git a/sys/sunaudio/gstsunaudiomixerctrl.c b/sys/sunaudio/gstsunaudiomixerctrl.c
index fe4b738a87..39df6ff5f3 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.c
+++ b/sys/sunaudio/gstsunaudiomixerctrl.c
@@ -74,9 +74,9 @@ gst_sunaudiomixer_ctrl_build_list (GstSunAudioMixerCtrl * mixer)
   if (mixer->tracklist == NULL) {
     g_return_if_fail (mixer->mixer_fd != -1);
 
-    /* Output */
+    /* Output & should be MASTER when it's the only one. */
     track = gst_sunaudiomixer_track_new (GST_SUNAUDIO_TRACK_OUTPUT,
-        2, GST_MIXER_TRACK_OUTPUT);
+        2, GST_MIXER_TRACK_OUTPUT | GST_MIXER_TRACK_MASTER);
     mixer->tracklist = g_list_append (mixer->tracklist, track);
 
     /* Input */