diff --git a/ChangeLog b/ChangeLog
index 991cff3113..0687061c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-18  Michael Smith  <msmith@fluendo.com>
+
+	* ext/ogg/gstoggmux.c: (gst_ogg_mux_push_buffer):
+	  Timestamps are unsigned; comparision against GST_CLOCK_TIME_NONE was
+	  always true, leading to dropping all timestamps.
+
 2006-09-18  Stefan Kost  <ensonic@users.sf.net>
 
 	* ext/libvisual/visual.c: (gst_vis_src_negotiate),
diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index 14cd212597..7034f379cf 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -523,7 +523,8 @@ gst_ogg_mux_push_buffer (GstOggMux * mux, GstBuffer * buffer)
 
   /* Ensure we have monotonically increasing timestamps in the output. */
   if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer)) {
-    if (GST_BUFFER_TIMESTAMP (buffer) < mux->last_ts)
+    if (mux->last_ts != GST_CLOCK_TIME_NONE &&
+        GST_BUFFER_TIMESTAMP (buffer) < mux->last_ts)
       GST_BUFFER_TIMESTAMP (buffer) = mux->last_ts;
     else
       mux->last_ts = GST_BUFFER_TIMESTAMP (buffer);