diff --git a/ChangeLog b/ChangeLog
index 2b247a0dcc..f63f2a1bea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-29  Wim Taymans  <wim@fluendo.com>
+
+	* gst-libs/gst/rtp/gstrtcpbuffer.c: (gst_rtcp_packet_add_rb):
+	Fix offset bug in generation RR packets.
+
 2007-04-27  Julien MOUTTE  <julien@moutte.net>
 
 	* ext/theora/theoradec.c: (_theora_granule_time),
diff --git a/common b/common
index a19d235c89..61edc2dc7b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a19d235c89d99ca7849078d501129f521e30d98d
+Subproject commit 61edc2dc7b8eba179d85a6545e46e0d65239e94d
diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.c b/gst-libs/gst/rtp/gstrtcpbuffer.c
index 066c796967..aec6bdc869 100644
--- a/gst-libs/gst/rtp/gstrtcpbuffer.c
+++ b/gst-libs/gst/rtp/gstrtcpbuffer.c
@@ -822,9 +822,9 @@ gst_rtcp_packet_add_rb (GstRTCPPacket * packet, guint32 ssrc,
   /* skip header */
   offset = packet->offset + 4;
   if (packet->type == GST_RTCP_TYPE_RR)
-    offset += 8;
+    offset += 4;
   else
-    offset += 28;
+    offset += 24;
 
   /* move to current index */
   offset += (packet->count * 24);