diff --git a/ChangeLog b/ChangeLog
index a82b7f5461..18b69827e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-28  Edward Hervey  <edward@fluendo.com>
+
+	* libs/gst/base/gstbasesink.c: (gst_base_sink_get_sync_times):
+	Inform GstSegment of the last stop position in order for the current
+	segment to have a proper duration if it doesn't have a specific stop
+	position from which a duration could be calculated.
+	This bug was noticeable when a non-flushing, non-update new segment was
+	followed by another segment (all buffers from the new segment were being
+	dropped).
+
 2006-08-28  Wim Taymans  <wim@fluendo.com>
 
 	* libs/gst/base/gstbasesrc.c: (gst_base_src_perform_seek):
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 3f1261c379..3d29dc86cd 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -933,6 +933,9 @@ gst_base_sink_get_sync_times (GstBaseSink * basesink, GstMiniObject * obj,
         GST_TIME_ARGS (cstop));
   }
 
+  /* set last stop position */
+  gst_segment_set_last_stop (segment, GST_FORMAT_TIME, cstop);
+
 do_times:
   /* this can produce wrong values if we accumulated non-TIME segments. If this happens,
    * upstream is behaving very badly */