diff --git a/ChangeLog b/ChangeLog
index ae89ce9fb1..abb6f4f1b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-24  Johan Dahlin  <johan@gnome.org>
+
+	* ext/theora/theoraenc.c (theora_enc_chain): Call
+	gst_pad_try_set_caps instead of gst_pad_set_explicit_caps so the
+	streamheader caps are set correctly.
+
 2004-06-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/vorbis/vorbisenc.c: (raw_caps_factory),
@@ -254,7 +260,7 @@
 
 2004-06-17  Johan Dahlin  <johan@gnome.org>
 
-	* ext/tcp/*: Revert Zaheer changes.
+	* ext/tcp/*: Revert Zaheer changes, to make things actually work again.
 
 2004-06-16  Wim Taymans  <wim@fluendo.com>
 
diff --git a/ext/theora/theoraenc.c b/ext/theora/theoraenc.c
index b6070ad9f0..e3ef26e262 100644
--- a/ext/theora/theoraenc.c
+++ b/ext/theora/theoraenc.c
@@ -407,11 +407,7 @@ theora_enc_chain (GstPad * pad, GstData * data)
 
     /* negotiate with these caps */
     GST_DEBUG ("here are the caps: %" GST_PTR_FORMAT, caps);
-    if (!gst_pad_set_explicit_caps (enc->srcpad, caps)) {
-      gst_caps_free (caps);
-      gst_data_unref (data);
-      return;
-    }
+    gst_pad_try_set_caps (enc->srcpad, caps);
 
     /* push out the header buffers */
     theora_push_buffer (enc, buf1);