diff --git a/ChangeLog b/ChangeLog
index 6cb0cc7276..76c670318a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-08  Julien Moutte  <julien@fluendo.com>
+
+	* gst/matroska/matroska-demux.c:
+	(gst_matroska_demux_parse_blockgroup_or_simpleblock): Flag
+	keyframe and delta units correctly when dealign with a BlockGroup.
+	Fixes: #514397
+
 2008-02-08  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* tests/check/elements/.cvsignore:
diff --git a/common b/common
index 8b37d7ee83..df7f73bd45 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 8b37d7ee833fab1d25b484d8574df3dae231b5f2
+Subproject commit df7f73bd454e0b0ee7870d8c85874aba9329fd2e
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index aa570d719e..8feaa38757 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -2925,6 +2925,12 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
           GST_BUFFER_FLAG_UNSET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
         else
           GST_BUFFER_FLAG_SET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
+      } else {
+        if (referenceblock) {
+          GST_BUFFER_FLAG_SET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
+        } else {
+          GST_BUFFER_FLAG_UNSET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
+        }
       }
 
       if (stream->set_discont) {