diff --git a/ChangeLog b/ChangeLog
index 8df2623214..9bde2ce24c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst-libs/gst/audio/gstaudiosrc.c: (gst_audioringbuffer_stop):
+	Disable a code path that is now called but causes a deadlock for some
+	reason and is unneeded.
+
 2008-09-04  Stefan Kost  <ensonic@users.sf.net>
 
 	* sys/xvimage/xvimagesink.c:
diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c
index 2afb397937..8974e23c5d 100644
--- a/gst-libs/gst/audio/gstaudiosrc.c
+++ b/gst-libs/gst/audio/gstaudiosrc.c
@@ -439,10 +439,11 @@ gst_audioringbuffer_stop (GstRingBuffer * buf)
     csrc->reset (src);
     GST_DEBUG ("reset done");
   }
-
+#if 0
   GST_DEBUG ("stop, waiting...");
   GST_AUDIORING_BUFFER_WAIT (buf);
   GST_DEBUG ("stoped");
+#endif
 
   return TRUE;
 }