diff --git a/ChangeLog b/ChangeLog
index 07addb5679..cfb7cf9a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-20  Michael Smith  <msmith@fluendo.com>
+
+	* gst/tcp/gstmultifdsink.c:
+	(gst_multi_fd_sink_client_queue_buffer):
+	  If caps change, then update the client's idea of the caps so that we
+	  don't end up re-sending streamheaders for every single buffer after
+	  the caps change.
+
 2006-10-20  Michael Smith  <msmith@fluendo.com>
 
 	* ext/ogg/gstoggparse.c: (gst_ogg_parse_dispose),
diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c
index e48f24013b..6ca8026fa8 100644
--- a/gst/tcp/gstmultifdsink.c
+++ b/gst/tcp/gstmultifdsink.c
@@ -1166,6 +1166,9 @@ gst_multi_fd_sink_client_queue_buffer (GstMultiFdSink * sink,
         }
       }
     }
+    /* Replace the old caps */
+    gst_caps_unref (client->caps);
+    client->caps = gst_caps_ref (caps);
   }
 
   if (G_UNLIKELY (send_streamheader)) {