diff --git a/ChangeLog b/ChangeLog
index f6b7b22547..fb52b26d39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-15  Andy Wingo  <wingo@pobox.com>
+
+	* ext/ogg/gstoggmux.c (gst_ogg_mux_collected): When updating
+	timestamp, update timestamp_end as well. Fixes a bugaboo. I hope
+	to the Lord Jesus that I do not have to touch the ogg muxer ever
+	again.
+
 2006-02-15  Edward Hervey  <edward@fluendo.com>
 
 	* gst/typefind/gsttypefindfunctions.c: (qt_type_find):
diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index 0a492dae24..451c867e13 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -1300,6 +1300,7 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
      */
     if (pad->timestamp < timestamp_end) {
       pad->timestamp = timestamp_end;
+      pad->timestamp_end = timestamp_end;
       GST_DEBUG_OBJECT (ogg_mux, "Updated timestamp of pad %" GST_PTR_FORMAT
           " (oggpad %p) to %" GST_TIME_FORMAT, pad->collect.pad, pad,
           GST_TIME_ARGS (timestamp_end));