diff --git a/ChangeLog b/ChangeLog
index a86438a7c1..53b5d75e14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-17  Philippe Khalaf  <burger@speedy.org> 
+
+	* gst-libs/gst/rtp/gstbasertpdepayload.c:
+	(gst_base_rtp_depayload_set_gst_timestamp):
+		add queue delay to new segment as well (as opposed to just the first
+		buffer). (bug #322347)
+
 2005-12-16  Stefan Kost  <ensonic@users.sf.net>
 
 	* ext/libvisual/visual.c: (make_valid_name):
diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.c b/gst-libs/gst/rtp/gstbasertpdepayload.c
index a7477e4acd..64ba48b5f8 100644
--- a/gst-libs/gst/rtp/gstbasertpdepayload.c
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.c
@@ -295,7 +295,9 @@ gst_base_rtp_depayload_set_gst_timestamp (GstBaseRTPDepayload * filter,
   GST_DEBUG_OBJECT (filter, "calculating ts : timestamp : %u, clockrate : %u",
       timestamp, filter->clock_rate);
 
-  GST_BUFFER_TIMESTAMP (buf) = ts;
+  /* add delay to timestamp */
+  GST_BUFFER_TIMESTAMP (buf) = ts + (filter->queue_delay * GST_MSECOND);
+
   GST_DEBUG_OBJECT (filter, "calculated ts %"
       GST_TIME_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
 
@@ -309,9 +311,6 @@ gst_base_rtp_depayload_set_gst_timestamp (GstBaseRTPDepayload * filter,
     filter->need_newsegment = FALSE;
     GST_DEBUG_OBJECT (filter, "Pushed newsegment event on this first buffer");
   }
-  /* add delay to timestamp */
-  GST_BUFFER_TIMESTAMP (buf) =
-      GST_BUFFER_TIMESTAMP (buf) + (filter->queue_delay * GST_MSECOND);
 }
 
 static void