diff --git a/ChangeLog b/ChangeLog
index 477465af47..fcf2c3a2b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-02  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* ext/wavpack/gstwavpackparse.c:
+	(gst_wavpack_parse_handle_seek_event):
+	Remove old workaround that was needed when seeking after the last
+	sample. With the fixed error handling this works now as expected
+	without pushing the last sample although it wasn't requested.
+
 2007-05-02  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* ext/wavpack/gstwavpackparse.c:
diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c
index ef86961732..91eb7cf093 100644
--- a/ext/wavpack/gstwavpackparse.c
+++ b/ext/wavpack/gstwavpackparse.c
@@ -540,11 +540,6 @@ gst_wavpack_parse_handle_seek_event (GstWavpackParse * wvparse,
       stop = gst_util_uint64_scale_int (stop, rate, GST_SECOND);
   }
 
-  /* if seek is to something after the end of the stream seek only
-   * to the end. this can be caused by rounding errors */
-  if (start >= wvparse->total_samples)
-    start = wvparse->total_samples - 1;
-
   if (start < 0) {
     GST_OBJECT_UNLOCK (wvparse);
     GST_DEBUG_OBJECT (wvparse, "Invalid start sample %" G_GINT64_FORMAT, start);