diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 5dd400d87..b783bcaea 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-29  Bastien Nocera  <hadess@hadess.net>
+
+	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_init):
+	better way to look for the volume track (patch by Michal Bukovjan
+	<bukovjan@mbox.dkm.cz>) (Closes: #153866)
+
 2004-09-27  Sergey V. Udaltsov  <svu@gnome.org>
 
 	* gnome-settings-keyboard-xkb.c: fix one GSwitchItXkbConfig memory
diff --git a/gnome-settings-daemon/actions/acme-volume-gstreamer.c b/gnome-settings-daemon/actions/acme-volume-gstreamer.c
index 2a0165494..522cd92bb 100644
--- a/gnome-settings-daemon/actions/acme-volume-gstreamer.c
+++ b/gnome-settings-daemon/actions/acme-volume-gstreamer.c
@@ -214,7 +214,7 @@ acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
 			for (; tracks != NULL; tracks = tracks->next) {
 				GstMixerTrack *track = tracks->data;
 				
-				if (! g_strcasecmp (track->label, "volume")) {
+				if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
 					self->_priv->mixer = GST_MIXER (element);
 					self->_priv->track = track;