diff --git a/ChangeLog b/ChangeLog
index 72a6538b59..a5ae9fdabf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-11  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Patch by: Stefan Kost <ensonic@users.sf.net>
+
+	* gst/rtpmanager/rtpjitterbuffer.c: (calculate_skew):
+	Don't try to reset the clock skew when we have no timestamps.
+	Fixes #519005.
+
 2008-03-08  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Patch by: Sjoerd Simons <sjoerd at luon dot net>
diff --git a/gst/rtpmanager/rtpjitterbuffer.c b/gst/rtpmanager/rtpjitterbuffer.c
index a2c08fb0e6..8aaefeb00b 100644
--- a/gst/rtpmanager/rtpjitterbuffer.c
+++ b/gst/rtpmanager/rtpjitterbuffer.c
@@ -208,7 +208,7 @@ again:
       GST_TIME_ARGS (gstrtptime), GST_TIME_ARGS (jbuf->base_rtptime),
       GST_TIME_ARGS (send_diff));
 
-  if (jbuf->prev_send_diff != -1) {
+  if (jbuf->prev_send_diff != -1 && time != -1) {
     gint64 delta_diff;
 
     if (send_diff > jbuf->prev_send_diff)