diff --git a/ChangeLog b/ChangeLog
index 8a66fdcad3..48c335ff3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-23  Benjamin Otte  <otte@gnome.org>
+
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_link):
+	  don't enfore negotiation from source side, it breaks 
+	  sinesrc ! audioconvert ! osssink
+
 2004-07-22  David Schleef  <ds@schleef.org>
 
 	* gst/typefind/gsttypefindfunctions.c: (plugin_init): Add typefind
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 8c100669cb..8ce1f6f1cd 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -385,10 +385,6 @@ gst_audio_convert_link (GstPad * pad, const GstCaps * caps)
   this = GST_AUDIO_CONVERT (GST_OBJECT_PARENT (pad));
   otherpad = (pad == this->src ? this->sink : this->src);
 
-  /* negotiate sinkpad first */
-  if (pad == this->src && !gst_pad_is_negotiated (this->sink))
-    return GST_PAD_LINK_DELAYED;
-
   if (!gst_audio_convert_parse_caps (caps, &ac_caps))
     return GST_PAD_LINK_REFUSED;