diff --git a/ChangeLog b/ChangeLog
index 08e65a08c4..225f89252e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-06-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/sine/gstsinesrc.c: (gst_sinesrc_class_init),
+	(gst_sinesrc_init), (gst_sinesrc_create),
+	(gst_sinesrc_set_property), (gst_sinesrc_get_property),
+	(gst_sinesrc_start):
+	* gst/sine/gstsinesrc.h:
+	  add num-buffers and timestamp-offset properties
+	* gst/videotestsrc/gstvideotestsrc.c:
+	(gst_videotestsrc_class_init), (gst_videotestsrc_set_property),
+	(gst_videotestsrc_get_property):
+	  add timestamp-offset property
+
 2005-06-23  Christian Schaller  <uraeus@gnome.org>
 
 	* configure.ac: add videorate
diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index 91be57ad8e..12c2f0ba70 100644
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -54,7 +54,9 @@ enum
   ARG_SAMPLES_PER_BUFFER,
   ARG_FREQ,
   ARG_VOLUME,
-  ARG_SYNC
+  ARG_SYNC,
+  ARG_NUM_BUFFERS,
+  ARG_TIMESTAMP_OFFSET,
 };
 
 static GstStaticPadTemplate gst_sinesrc_src_template =
@@ -160,6 +162,16 @@ gst_sinesrc_class_init (GstSineSrcClass * klass)
   g_object_class_install_property (gobject_class, ARG_SYNC,
       g_param_spec_boolean ("sync", "Sync", "Synchronize to clock",
           FALSE, G_PARAM_READWRITE));
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_BUFFERS,
+      g_param_spec_int ("num-buffers", "num-buffers",
+          "Number of buffers to output before sending EOS", -1, G_MAXINT,
+          0, G_PARAM_READWRITE));
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TIMESTAMP_OFFSET,
+      g_param_spec_int64 ("timestamp-offset", "Timestamp offset",
+          "An offset added to timestamps set on buffers (in ns)", G_MININT64,
+          G_MAXINT64, 0, G_PARAM_READWRITE));
+
+
 
   //gstbasesrc_class->get_caps = GST_DEBUG_FUNCPTR ();
   gstbasesrc_class->set_caps = GST_DEBUG_FUNCPTR (gst_sinesrc_setcaps);
@@ -186,6 +198,9 @@ gst_sinesrc_init (GstSineSrc * src)
   src->samples_per_buffer = 1024;
   src->timestamp = G_GINT64_CONSTANT (0);
   src->offset = G_GINT64_CONSTANT (0);
+  src->timestamp_offset = G_GINT64_CONSTANT (0);
+  src->num_buffers = -1;
+  src->num_buffers_left = -1;
 
   src->seq = 0;
 
@@ -353,7 +368,16 @@ gst_sinesrc_create (GstBaseSrc * basesrc, guint64 offset,
   buf = gst_buffer_new_and_alloc (src->samples_per_buffer * 2);
   gst_buffer_set_caps (buf, GST_PAD_CAPS (basesrc->srcpad));
 
-  GST_BUFFER_TIMESTAMP (buf) = src->timestamp;
+  if (src->num_buffers_left == 0) {
+    /* FIXME: there's no GST_FLOW_ applicable for EOS, so we return ERROR
+     * even though nothing's wrong */
+    return GST_FLOW_ERROR;
+  } else {
+    if (src->num_buffers_left > 0)
+      src->num_buffers_left--;
+  }
+
+  GST_BUFFER_TIMESTAMP (buf) = src->timestamp + src->timestamp_offset;
   /* offset is the number of samples */
   GST_BUFFER_OFFSET (buf) = src->offset;
   GST_BUFFER_OFFSET_END (buf) = src->offset + src->samples_per_buffer;
@@ -437,6 +461,12 @@ gst_sinesrc_set_property (GObject * object, guint prop_id,
     case ARG_SYNC:
       src->sync = g_value_get_boolean (value);
       break;
+    case ARG_NUM_BUFFERS:
+      src->num_buffers = g_value_get_int (value);
+      break;
+    case ARG_TIMESTAMP_OFFSET:
+      src->timestamp_offset = g_value_get_int64 (value);
+      break;
     default:
       break;
   }
@@ -468,6 +498,12 @@ gst_sinesrc_get_property (GObject * object, guint prop_id,
     case ARG_SYNC:
       g_value_set_boolean (value, src->sync);
       break;
+    case ARG_NUM_BUFFERS:
+      g_value_set_int (value, src->num_buffers);
+      break;
+    case ARG_TIMESTAMP_OFFSET:
+      g_value_set_int64 (value, src->timestamp_offset);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -481,6 +517,7 @@ gst_sinesrc_start (GstBaseSrc * basesrc)
 
   src->timestamp = G_GINT64_CONSTANT (0);
   src->offset = G_GINT64_CONSTANT (0);
+  src->num_buffers_left = src->num_buffers;
 
   return TRUE;
 }
diff --git a/gst/sine/gstsinesrc.h b/gst/sine/gstsinesrc.h
index a10a81300d..1e1944158e 100644
--- a/gst/sine/gstsinesrc.h
+++ b/gst/sine/gstsinesrc.h
@@ -83,6 +83,9 @@ struct _GstSineSrc {
   gboolean tags_pushed;
 
   GstClock *clock;
+  GstClockTimeDiff timestamp_offset;
+  gint num_buffers, num_buffers_left;
+
 };
 
 struct _GstSineSrcClass {
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 49cb72a6e4..7d4b842438 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -49,8 +49,9 @@ enum
   ARG_0,
   ARG_TYPE,
   ARG_SYNC,
-  ARG_NUM_BUFFERS
-      /* FILL ME */
+  ARG_NUM_BUFFERS,
+  ARG_TIMESTAMP_OFFSET,
+  /* FILL ME */
 };
 
 static GstCaps *capslist = NULL;
@@ -174,6 +175,10 @@ gst_videotestsrc_class_init (GstVideotestsrcClass * klass)
       g_param_spec_int ("num-buffers", "num-buffers",
           "Number of buffers to output before sending EOS", -1, G_MAXINT,
           0, G_PARAM_READWRITE));
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TIMESTAMP_OFFSET,
+      g_param_spec_int64 ("timestamp-offset", "Timestamp offset",
+          "An offset added to timestamps set on buffers (in ns)",
+          G_MININT64, G_MAXINT64, 0, G_PARAM_READWRITE));
 
   parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
 
@@ -719,6 +724,9 @@ gst_videotestsrc_set_property (GObject * object, guint prop_id,
     case ARG_NUM_BUFFERS:
       videotestsrc->num_buffers = g_value_get_int (value);
       break;
+    case ARG_TIMESTAMP_OFFSET:
+      videotestsrc->timestamp_offset = g_value_get_int64 (value);
+      break;
     default:
       break;
   }
@@ -744,6 +752,9 @@ gst_videotestsrc_get_property (GObject * object, guint prop_id, GValue * value,
     case ARG_NUM_BUFFERS:
       g_value_set_int (value, videotestsrc->num_buffers);
       break;
+    case ARG_TIMESTAMP_OFFSET:
+      g_value_set_int64 (value, videotestsrc->timestamp_offset);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;