diff --git a/ChangeLog b/ChangeLog
index acdfc8cc03..134a8fd811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-11  David Schleef  <ds@schleef.org>
+
+	* gst/gstbuffer.c: (gst_buffer_create_sub): Subbuffers should
+	inherit correct flags (READONLY and DONTKEEP).
+
 2004-01-11  David Schleef  <ds@schleef.org>
 
 	* gst/elements/gstfilesrc.c: (gst_filesrc_free_parent_mmap),
diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 2c9e43e810..83a95e683c 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -295,9 +295,13 @@ gst_buffer_create_sub (GstBuffer *parent, guint offset, guint size)
 
   GST_BUFFER_DURATION (buffer)     = GST_CLOCK_TIME_NONE;
   GST_BUFFER_OFFSET_END (buffer)   = GST_BUFFER_OFFSET_NONE;
-  /* make sure nobody overwrites data as it would overwrite in the parent.
-   * data in parent cannot be overwritten because we hold a ref */
-  GST_DATA_FLAG_SET (parent, GST_DATA_READONLY);
+
+  if (GST_BUFFER_FLAG_IS_SET (parent, GST_BUFFER_DONTKEEP)) {
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_DONTKEEP);
+  }
+  if (GST_BUFFER_FLAG_IS_SET (parent, GST_BUFFER_READONLY)) {
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_READONLY);
+  }
 
   return buffer;
 }