diff --git a/ChangeLog b/ChangeLog
index 88b498dee0..8e53218c47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-10  Edward Hervey  <edward@fluendo.com>
+
+	* plugins/elements/gstidentity.c: (gst_identity_transform_ip):
+	Set the buffer offset/offset_end to GST_CLOCK_TIME_NONE when using
+	the single-segment mode.
+
 2006-01-10  Brian Cameron  <brian dot cameron at sun dot com>
 
 	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c
index 2158cb97fd..0e8f6c7239 100644
--- a/plugins/elements/gstidentity.c
+++ b/plugins/elements/gstidentity.c
@@ -449,8 +449,11 @@ gst_identity_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
     g_usleep (identity->sleep_time);
 
   if (identity->single_segment && (trans->segment.format == GST_FORMAT_TIME)
-      && (ret == GST_FLOW_OK))
+      && (ret == GST_FLOW_OK)) {
     GST_BUFFER_TIMESTAMP (buf) = runtimestamp;
+    GST_BUFFER_OFFSET (buf) = GST_CLOCK_TIME_NONE;
+    GST_BUFFER_OFFSET_END (buf) = GST_CLOCK_TIME_NONE;
+  }
 
   return ret;
 }