diff --git a/ChangeLog b/ChangeLog
index 39626cffbf..6a4989d6e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-17  Michael Smith <msmith@fluendo.com>
+
+	* gst/audiotestsrc/gstaudiotestsrc.c: (gst_audio_test_src_do_seek):
+	* gst/videotestsrc/gstvideotestsrc.c: (gst_video_test_src_do_seek):
+	  Use the segment->last_stop value to calculate the next timestamp to
+	  generate after a seek; not the segment->start value.
+
 2007-05-15  David Schleef  <ds@schleef.org>
 
 	* docs/Makefile.am: Install docs even when --disable-gtk-doc
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c
index 7fed0c7aac..4308fcb259 100644
--- a/gst/audiotestsrc/gstaudiotestsrc.c
+++ b/gst/audiotestsrc/gstaudiotestsrc.c
@@ -607,7 +607,8 @@ gst_audio_test_src_do_seek (GstBaseSrc * basesrc, GstSegment * segment)
   GstAudioTestSrc *src = GST_AUDIO_TEST_SRC (basesrc);
   GstClockTime time;
 
-  time = segment->time = segment->start;
+  segment->time = segment->start;
+  time = segment->last_stop;
 
   /* now move to the time indicated */
   src->n_samples = time * src->samplerate / GST_SECOND;
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 1bb3998d39..e78ddcf1a0 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -497,7 +497,8 @@ gst_video_test_src_do_seek (GstBaseSrc * bsrc, GstSegment * segment)
 
   src = GST_VIDEO_TEST_SRC (bsrc);
 
-  time = segment->time = segment->start;
+  segment->time = segment->start;
+  time = segment->last_stop;
 
   /* now move to the time indicated */
   if (src->rate_numerator) {