diff -ru control-center-2.12.1/gnome-settings-daemon/actions/acme-volume-alsa.c control-center-2.12.1-new/gnome-settings-daemon/actions/acme-volume-alsa.c
--- control-center-2.12.1/gnome-settings-daemon/actions/acme-volume-alsa.c	2004-12-16 23:27:52.000000000 +1100
+++ control-center-2.12.1-new/gnome-settings-daemon/actions/acme-volume-alsa.c	2006-01-22 20:56:54.252639372 +1100
@@ -23,6 +23,7 @@
 #include "config.h"
 #include "acme-volume-alsa.h"
 
+#include <gconf/gconf-client.h>
 #include <alsa/asoundlib.h>
 
 #ifndef DEFAULT_CARD
@@ -202,9 +203,14 @@
 static gboolean
 acme_volume_alsa_open (AcmeVolumeAlsa *self)
 {
+	GConfClient *conf_client;
 	snd_mixer_selem_id_t *sid;
 	snd_mixer_t *handle;
 	snd_mixer_elem_t *elem;
+	char *mixer_elem;
+	conf_client=gconf_client_get_default();
+	mixer_elem = gconf_client_get_string (conf_client, "/apps/gnome_settings_daemon/keybindings/volume_mixer_element", NULL);
+	g_object_unref(conf_client);
 
 	if (self->_priv->timer_id != 0)
 	{
@@ -238,7 +244,7 @@
 	}
 
 	snd_mixer_selem_id_alloca (&sid);
-	snd_mixer_selem_id_set_name (sid, "Master");
+	snd_mixer_selem_id_set_name (sid, mixer_elem);
 	elem = snd_mixer_find_selem (handle, sid);
 	if (!elem)
 	{
diff -ru control-center-2.12.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.12.1-new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in
--- control-center-2.12.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2004-05-18 03:03:38.000000000 +1000
+++ control-center-2.12.1-new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2006-01-22 18:42:18.141011112 +1100
@@ -50,6 +50,18 @@
 
 
         <schema>
+            <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mixer_element</key>
+            <applyto>/apps/gnome_settings_daemon/keybindings/volume_mixer_element</applyto>
+            <type>string</type>
+            <default>Master</default>
+            <locale name="C">
+                <short>Mixer element</short>
+                <long>The mixer element which the volume up and down keys should control.</long>
+            </locale>
+        </schema>
+
+
+        <schema>
             <key>/schemas/apps/gnome_settings_daemon/keybindings/power</key>
             <applyto>/apps/gnome_settings_daemon/keybindings/power</applyto>
             <type>string</type>
