diff --git a/ChangeLog b/ChangeLog
index 4249d913cf..6344fb36d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-30  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* libs/gst/base/gstbasesink.c: (gst_base_sink_get_sync_times),
+	(gst_base_sink_get_position):
+	The reported position must always be smaller than the last seen
+	timestamps (or timestamp + duration for reverse).
+
 2008-05-30  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Patch by: Rob Bradford <rob at robster dot org dot uk>
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 8b56ffede1..e9aa72b798 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -3168,12 +3168,8 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
       *cur = time + gst_guint64_to_gdouble (now - base) * rate;
 
       /* never report more than last seen position */
-      if (last != -1) {
-        if (rate < 0.0)
-          *cur = MIN (last, *cur);
-        else
-          *cur = MAX (last, *cur);
-      }
+      if (last != -1)
+        *cur = MIN (last, *cur);
 
       gst_object_unref (clock);