diff --git a/ChangeLog b/ChangeLog
index 4a8aa2bffc..4123199635 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-23  Andy Wingo  <wingo@pobox.com>
 
+	* sys/oss/gstosssrc.c (gst_oss_src_open): Set the device-name
+	property after opening the mixer.
+
 	* sys/oss/gstosssrc.c: 
 	* sys/oss/gstosssrc.h: Easy to implement a mixer, eh...
 
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index c40df24a62..f65f1cf860 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -306,9 +306,17 @@ gst_oss_src_open (GstAudioSrc * asrc)
     return FALSE;
   }
 
-  if (!oss->mixer)
+  if (!oss->mixer) {
     oss->mixer = gst_ossmixer_new ("/dev/mixer", GST_OSS_MIXER_CAPTURE);
 
+    if (oss->mixer) {
+      if (oss->device_name) {
+        g_free (oss->device_name);
+      }
+      oss->device_name = g_strdup (oss->mixer->cardname);
+    }
+  }
+
   return TRUE;
 }