diff --git a/ChangeLog b/ChangeLog
index 109316e1d4..b1561b1d39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-16  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* ext/mad/gstmad.c: (clip_outgoing_buffer):
+	Fix buffer clipping to correctly clip to the segment stop.
+
 2007-07-15  Jan Schmidt  <thaytan@noraisin.net>
 
 	* gst/mpegaudioparse/gstmpegaudioparse.c:
diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 890c683dff..c323abfaa9 100644
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -1251,7 +1251,7 @@ clip_outgoing_buffer (GstMad * mad, GstBuffer * buffer)
       GST_BUFFER_DATA (buffer) += diff;
       GST_BUFFER_SIZE (buffer) -= diff;
     }
-    diff = cstop - stop;
+    diff = stop - cstop;
     if (diff > 0) {
       GST_BUFFER_DURATION (buffer) -= diff;
       /* time->frames->bytes */