diff --git a/ChangeLog b/ChangeLog
index abb6b8f987..0e5b64645c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-18  Edward Hervey  <edward@fluendo.com>
+
+	* gst/base/gstbasesink.c: (gst_base_sink_change_state): 
+	Also reset the ->current_* values in READY->PAUSED
+
 2005-11-18  Andy Wingo  <wingo@pobox.com>
 
 	* gst/net/gstnetclientclock.c (gst_net_client_clock_thread):
diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c
index 73d2582f41..682bd97af6 100644
--- a/gst/base/gstbasesink.c
+++ b/gst/base/gstbasesink.c
@@ -1590,6 +1590,9 @@ gst_base_sink_change_state (GstElement * element, GstStateChange transition)
       basesink->segment_start = 0;
       basesink->segment_stop = -1;
       basesink->segment_time = 0;
+      basesink->current_start = -1;
+      basesink->current_duration = -1;
+      basesink->current_end = -1;
       basesink->segment_accum = 0;
       ret = GST_STATE_CHANGE_ASYNC;
       break;
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 73d2582f41..682bd97af6 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -1590,6 +1590,9 @@ gst_base_sink_change_state (GstElement * element, GstStateChange transition)
       basesink->segment_start = 0;
       basesink->segment_stop = -1;
       basesink->segment_time = 0;
+      basesink->current_start = -1;
+      basesink->current_duration = -1;
+      basesink->current_end = -1;
       basesink->segment_accum = 0;
       ret = GST_STATE_CHANGE_ASYNC;
       break;