diff --git a/ChangeLog b/ChangeLog
index c3f1339b5e..d13bf79a01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-16  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	patch by: Wim Taymans (wim@fluendo.com)
+
+	* gst/gstbuffer.c:
+	* gst/gstindex.h:
+	* libs/gst/dataprotocol/dataprotocol.c:
+	  copy KEY_UNIT and DELTA_UNIT flags correctly.  Fixes #150242
+
 2004-08-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* Makefile.am:
diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 97445f9dd7..80ca7e162e 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -149,7 +149,8 @@ gst_buffer_default_copy (GstBuffer * buffer)
 
   /* copy relevant flags */
   flags = GST_DATA_FLAG_SHIFT (GST_BUFFER_KEY_UNIT) |
-      GST_DATA_FLAG_SHIFT (GST_BUFFER_IN_CAPS);
+      GST_DATA_FLAG_SHIFT (GST_BUFFER_IN_CAPS) |
+      GST_DATA_FLAG_SHIFT (GST_BUFFER_DELTA_UNIT);
   flags = GST_BUFFER_FLAGS (buffer) & flags;
 
   _GST_DATA_INIT (GST_DATA (copy),
diff --git a/gst/gstindex.h b/gst/gstindex.h
index b24a93ec4c..a22f78707b 100644
--- a/gst/gstindex.h
+++ b/gst/gstindex.h
@@ -78,6 +78,7 @@ struct _GstIndexAssociation {
 typedef enum {
   GST_ASSOCIATION_FLAG_NONE 	= 0,
   GST_ASSOCIATION_FLAG_KEY_UNIT = (1 << 0),
+  GST_ASSOCIATION_FLAG_DELTA_UNIT = (1 << 1),
 
   /* new flags should start here */
   GST_ASSOCIATION_FLAG_LAST	= (1 << 8)
diff --git a/libs/gst/dataprotocol/dataprotocol.c b/libs/gst/dataprotocol/dataprotocol.c
index a1aa067dcd..8df6fc080d 100644
--- a/libs/gst/dataprotocol/dataprotocol.c
+++ b/libs/gst/dataprotocol/dataprotocol.c
@@ -186,9 +186,10 @@ gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags,
   GST_WRITE_UINT64_BE (h + 32, GST_BUFFER_OFFSET_END (buffer));
 
   /* data flags */
-  /* we only copy KEY_UNIT and IN_CAPS flags */
+  /* we only copy KEY_UNIT,DELTA_UNIT and IN_CAPS flags */
   flags_mask = GST_DATA_FLAG_SHIFT (GST_BUFFER_KEY_UNIT) |
-      GST_DATA_FLAG_SHIFT (GST_BUFFER_IN_CAPS);
+      GST_DATA_FLAG_SHIFT (GST_BUFFER_IN_CAPS) |
+      GST_DATA_FLAG_SHIFT (GST_BUFFER_DELTA_UNIT);
 
   GST_WRITE_UINT16_BE (h + 40, GST_BUFFER_FLAGS (buffer) & flags_mask);