diff --git a/ChangeLog b/ChangeLog
index 7647b4d949..8203634c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-08  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* sys/sunaudio/gstsunaudiomixer.c:
+	(gst_sunaudiomixer_change_state):
+	Construct the correct mixer device name when the AUDIODEV env var
+	is set.
+
+	Patch by: Jerry Tan <jerry.tan at sun dot com>
+	Fixes: #383596
+
 2006-12-08  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_open):
diff --git a/sys/sunaudio/gstsunaudiomixer.c b/sys/sunaudio/gstsunaudiomixer.c
index fb0ce95436..a5eb0c932d 100644
--- a/sys/sunaudio/gstsunaudiomixer.c
+++ b/sys/sunaudio/gstsunaudiomixer.c
@@ -86,7 +86,7 @@ gst_sunaudiomixer_change_state (GstElement * element, GstStateChange transition)
         if (audiodev == NULL) {
           this->mixer = gst_sunaudiomixer_ctrl_new ("/dev/audioctl");
         } else {
-          gchar *device = g_strdup_printf ("/dev/%sctl", audiodev);
+          gchar *device = g_strdup_printf ("%sctl", audiodev);
 
           this->mixer = gst_sunaudiomixer_ctrl_new (device);
           g_free (device);