diff --git a/ChangeLog b/ChangeLog
index f8f457c4ec..e95eeaa452 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-01  Benjamin Otte  <otte@gnome.org>
+
+	* gst/elements/gstbufferstore.c:
+	(gst_buffer_store_add_buffer_func):
+	  don't try to make subbuffers bigger than they can be. (fixes
+	  #159970)
+
 2004-11-29  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* docs/gst/gstreamer-sections.txt:
diff --git a/gst/elements/gstbufferstore.c b/gst/elements/gstbufferstore.c
index c73a6b553a..f3d8e55089 100644
--- a/gst/elements/gstbufferstore.c
+++ b/gst/elements/gstbufferstore.c
@@ -208,7 +208,7 @@ gst_buffer_store_add_buffer_func (GstBufferStore * store, GstBuffer * buffer)
             start_offset = GST_BUFFER_OFFSET (buffer) > start_offset ? 0 :
                 start_offset - GST_BUFFER_OFFSET (buffer);
             sub = gst_buffer_create_sub (buffer, start_offset,
-                MIN (GST_BUFFER_SIZE (buffer),
+                MIN (GST_BUFFER_SIZE (buffer) - start_offset,
                     GST_BUFFER_OFFSET (current) - start_offset -
                     GST_BUFFER_OFFSET (buffer)));
             g_assert (sub);
diff --git a/plugins/elements/gstbufferstore.c b/plugins/elements/gstbufferstore.c
index c73a6b553a..f3d8e55089 100644
--- a/plugins/elements/gstbufferstore.c
+++ b/plugins/elements/gstbufferstore.c
@@ -208,7 +208,7 @@ gst_buffer_store_add_buffer_func (GstBufferStore * store, GstBuffer * buffer)
             start_offset = GST_BUFFER_OFFSET (buffer) > start_offset ? 0 :
                 start_offset - GST_BUFFER_OFFSET (buffer);
             sub = gst_buffer_create_sub (buffer, start_offset,
-                MIN (GST_BUFFER_SIZE (buffer),
+                MIN (GST_BUFFER_SIZE (buffer) - start_offset,
                     GST_BUFFER_OFFSET (current) - start_offset -
                     GST_BUFFER_OFFSET (buffer)));
             g_assert (sub);