diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index c3ec66c..2efb3d2 100644
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -1174,9 +1174,11 @@
       GstClockTime timestamp = GST_CLOCK_TIME_NONE;
 
       if (gst_segment_to_running_time_full (&GST_AGGREGATOR_PAD (pad)->segment,
-              GST_FORMAT_TIME, GST_BUFFER_DTS_OR_PTS (buffer), &timestamp) == 1)
+              GST_FORMAT_TIME, GST_BUFFER_DTS_OR_PTS (buffer),
+              &timestamp) == 1) {
         GST_BUFFER_PTS (tag) = timestamp;
-
+        GST_BUFFER_DURATION (tag) = GST_BUFFER_DURATION (buffer);
+      }
       GST_BUFFER_OFFSET (tag) = GST_BUFFER_OFFSET_NONE;
       GST_BUFFER_OFFSET_END (tag) = GST_BUFFER_OFFSET_NONE;
     } else {
diff --git a/tests/check/elements/flvmux.c b/tests/check/elements/flvmux.c
index 0cf9b99..34b5d1c 100644
--- a/tests/check/elements/flvmux.c
+++ b/tests/check/elements/flvmux.c
@@ -260,7 +260,8 @@
   /* pull header0 */
   buf = gst_harness_pull (h);
   fail_unless_equals_uint64 (base_time, GST_BUFFER_PTS (buf));
-  fail_unless_equals_uint64 (base_time, GST_BUFFER_DTS (buf));
+  fail_unless_equals_uint64 (GST_CLOCK_TIME_NONE, GST_BUFFER_DTS (buf));
+  fail_unless_equals_uint64 (0, GST_BUFFER_DURATION (buf));
   gst_buffer_map (buf, &map, GST_MAP_READ);
   /* 0x08 means it is audio */
   fail_unless_equals_int (0x08, map.data[0]);
@@ -276,7 +277,7 @@
   /* pull header1 */
   buf = gst_harness_pull (h);
   fail_unless_equals_uint64 (base_time, GST_BUFFER_PTS (buf));
-  fail_unless_equals_uint64 (base_time, GST_BUFFER_DTS (buf));
+  fail_unless_equals_uint64 (GST_CLOCK_TIME_NONE, GST_BUFFER_DTS (buf));
   fail_unless_equals_uint64 (0, GST_BUFFER_DURATION (buf));
   gst_buffer_map (buf, &map, GST_MAP_READ);
   /* 0x08 means it is audio */
@@ -293,7 +294,7 @@
   /* pull data */
   buf = gst_harness_pull (h);
   fail_unless_equals_uint64 (base_time, GST_BUFFER_PTS (buf));
-  fail_unless_equals_uint64 (base_time, GST_BUFFER_DTS (buf));
+  fail_unless_equals_uint64 (GST_CLOCK_TIME_NONE, GST_BUFFER_DTS (buf));
   fail_unless_equals_uint64 (duration, GST_BUFFER_DURATION (buf));
   fail_unless_equals_uint64 (GST_BUFFER_OFFSET_NONE, GST_BUFFER_OFFSET (buf));
   fail_unless_equals_uint64 (GST_BUFFER_OFFSET_NONE,
@@ -313,7 +314,7 @@
   /* pull data */
   buf = gst_harness_pull (h);
   fail_unless_equals_uint64 (base_time + duration, GST_BUFFER_PTS (buf));
-  fail_unless_equals_uint64 (base_time + duration, GST_BUFFER_DTS (buf));
+  fail_unless_equals_uint64 (GST_CLOCK_TIME_NONE, GST_BUFFER_DTS (buf));
   fail_unless_equals_uint64 (duration, GST_BUFFER_DURATION (buf));
   fail_unless_equals_uint64 (GST_BUFFER_OFFSET_NONE, GST_BUFFER_OFFSET (buf));
   fail_unless_equals_uint64 (GST_BUFFER_OFFSET_NONE,