diff --git a/ChangeLog b/ChangeLog
index b135ef132b..df0e2c0f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-02  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* gst/elements/gstfilesrc.c: (gst_filesrc_map_region),
+	(gst_filesrc_get_read):
+	  set all the values on buffers that we can
+
 2004-02-02  David Schleef  <ds@schleef.org>
 
 	Change usage of isblah() to g_ascii_isblah() to be more locale
diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c
index a9f9f7e27e..e36657818c 100644
--- a/gst/elements/gstfilesrc.c
+++ b/gst/elements/gstfilesrc.c
@@ -420,6 +420,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
   GST_BUFFER_SIZE (buf) = size;
   GST_BUFFER_MAXSIZE (buf) = size;
   GST_BUFFER_OFFSET (buf) = offset;
+  GST_BUFFER_OFFSET_END (buf) = offset + size;
   GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
   GST_BUFFER_PRIVATE (buf) = src;
   g_object_ref (src);
@@ -647,6 +648,10 @@ gst_filesrc_get_read (GstFileSrc *src)
     return NULL;
   }
 
+  GST_BUFFER_SIZE (buf) = readsize;
+  GST_BUFFER_MAXSIZE (buf) = readsize;
+  GST_BUFFER_OFFSET (buf) = src->curoffset;
+  GST_BUFFER_OFFSET_END (buf) = src->curoffset + readsize;
   src->curoffset += readsize;
 
   return buf;
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index a9f9f7e27e..e36657818c 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -420,6 +420,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
   GST_BUFFER_SIZE (buf) = size;
   GST_BUFFER_MAXSIZE (buf) = size;
   GST_BUFFER_OFFSET (buf) = offset;
+  GST_BUFFER_OFFSET_END (buf) = offset + size;
   GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
   GST_BUFFER_PRIVATE (buf) = src;
   g_object_ref (src);
@@ -647,6 +648,10 @@ gst_filesrc_get_read (GstFileSrc *src)
     return NULL;
   }
 
+  GST_BUFFER_SIZE (buf) = readsize;
+  GST_BUFFER_MAXSIZE (buf) = readsize;
+  GST_BUFFER_OFFSET (buf) = src->curoffset;
+  GST_BUFFER_OFFSET_END (buf) = src->curoffset + readsize;
   src->curoffset += readsize;
 
   return buf;