diff --git a/ChangeLog b/ChangeLog
index cda85ff3fc..a50d59e746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* ext/a52dec/gsta52dec.c: (gst_a52dec_chain):
+	  When the first_access is 1 or 0, we should copy the timestamp from 
+	  the incoming buffer if there is one.
+
 2006-08-07  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/a52dec/gsta52dec.c: (gst_a52dec_channels), (gst_a52dec_push),
diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c
index 53bda75e90..71e84b1687 100644
--- a/ext/a52dec/gsta52dec.c
+++ b/ext/a52dec/gsta52dec.c
@@ -548,9 +548,9 @@ gst_a52dec_chain (GstPad * pad, GstBuffer * buf)
         ret = gst_a52dec_chain_raw (pad, subbuf);
       }
     } else {
-      /* No first_access, so no timestamp */
+      /* first_access = 0 or 1, so if there's a timestamp it applies to the first byte */
       subbuf = gst_buffer_create_sub (buf, offset, size - offset);
-      GST_BUFFER_TIMESTAMP (subbuf) = GST_CLOCK_TIME_NONE;
+      GST_BUFFER_TIMESTAMP (subbuf) = GST_BUFFER_TIMESTAMP (buf);
       ret = gst_a52dec_chain_raw (pad, subbuf);
     }
   } else {