diff --git a/gst/elements/gstfdsrc.c b/gst/elements/gstfdsrc.c
index a1a716b96b..56782e824e 100644
--- a/gst/elements/gstfdsrc.c
+++ b/gst/elements/gstfdsrc.c
@@ -113,9 +113,10 @@ gst_fdsrc_class_init (GstFdSrcClass *klass)
 }
 
 static void gst_fdsrc_init(GstFdSrc *fdsrc) {
-  fdsrc->srcpad = gst_pad_new("src",GST_PAD_SRC);
-  gst_pad_set_get_function(fdsrc->srcpad,gst_fdsrc_get);
-  gst_element_add_pad(GST_ELEMENT(fdsrc),fdsrc->srcpad);
+  fdsrc->srcpad = gst_pad_new ("src", GST_PAD_SRC);
+  
+  gst_pad_set_get_function (fdsrc->srcpad, gst_fdsrc_get);
+  gst_element_add_pad (GST_ELEMENT (fdsrc), fdsrc->srcpad);
 
   fdsrc->fd = 0;
   fdsrc->curoffset = 0;
@@ -176,28 +177,23 @@ gst_fdsrc_get(GstPad *pad)
   GstBuffer *buf;
   glong readbytes;
 
-  g_return_val_if_fail (pad != NULL, NULL);
-  src = GST_FDSRC(gst_pad_get_parent (pad));
+  src = GST_FDSRC (gst_pad_get_parent (pad));
 
   /* create the buffer */
-  /* FIXME: should eventually use a bufferpool for this*/
-  buf = gst_buffer_new ();
-  g_return_val_if_fail (buf, NULL);
-
-  /* allocate the space for the buffer data */
-  GST_BUFFER_DATA(buf) = g_malloc(src->blocksize);
-  g_return_val_if_fail(GST_BUFFER_DATA(buf) != NULL, NULL);
+  buf = gst_buffer_new_and_alloc (src->blocksize);
 
   /* read it in from the file */
-  readbytes = read(src->fd,GST_BUFFER_DATA(buf),src->blocksize);
+  readbytes = read (src->fd, GST_BUFFER_DATA (buf), src->blocksize);
+
   /* if nothing was read, we're in eos */
   if (readbytes == 0) {
     gst_element_set_eos (GST_ELEMENT (src));
     return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
   }
 
-  GST_BUFFER_OFFSET(buf) = src->curoffset;
-  GST_BUFFER_SIZE(buf) = readbytes;
+  GST_BUFFER_OFFSET (buf) = src->curoffset;
+  GST_BUFFER_SIZE (buf) = readbytes;
+  GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
   src->curoffset += readbytes;
 
   /* we're done, return the buffer */
diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c
index 5f159e160a..93336d5b91 100644
--- a/gst/elements/gstfilesrc.c
+++ b/gst/elements/gstfilesrc.c
@@ -401,7 +401,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
   GST_BUFFER_SIZE (buf) = size;
   GST_BUFFER_MAXSIZE (buf) = size;
   GST_BUFFER_OFFSET (buf) = offset;
-  GST_BUFFER_TIMESTAMP (buf) = -1LL;
+  GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
   GST_BUFFER_POOL_PRIVATE (buf) = src;
   GST_BUFFER_FREE_FUNC (buf) = (GstDataFreeFunction) gst_filesrc_free_parent_mmap;
 
diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c
index a1a716b96b..56782e824e 100644
--- a/plugins/elements/gstfdsrc.c
+++ b/plugins/elements/gstfdsrc.c
@@ -113,9 +113,10 @@ gst_fdsrc_class_init (GstFdSrcClass *klass)
 }
 
 static void gst_fdsrc_init(GstFdSrc *fdsrc) {
-  fdsrc->srcpad = gst_pad_new("src",GST_PAD_SRC);
-  gst_pad_set_get_function(fdsrc->srcpad,gst_fdsrc_get);
-  gst_element_add_pad(GST_ELEMENT(fdsrc),fdsrc->srcpad);
+  fdsrc->srcpad = gst_pad_new ("src", GST_PAD_SRC);
+  
+  gst_pad_set_get_function (fdsrc->srcpad, gst_fdsrc_get);
+  gst_element_add_pad (GST_ELEMENT (fdsrc), fdsrc->srcpad);
 
   fdsrc->fd = 0;
   fdsrc->curoffset = 0;
@@ -176,28 +177,23 @@ gst_fdsrc_get(GstPad *pad)
   GstBuffer *buf;
   glong readbytes;
 
-  g_return_val_if_fail (pad != NULL, NULL);
-  src = GST_FDSRC(gst_pad_get_parent (pad));
+  src = GST_FDSRC (gst_pad_get_parent (pad));
 
   /* create the buffer */
-  /* FIXME: should eventually use a bufferpool for this*/
-  buf = gst_buffer_new ();
-  g_return_val_if_fail (buf, NULL);
-
-  /* allocate the space for the buffer data */
-  GST_BUFFER_DATA(buf) = g_malloc(src->blocksize);
-  g_return_val_if_fail(GST_BUFFER_DATA(buf) != NULL, NULL);
+  buf = gst_buffer_new_and_alloc (src->blocksize);
 
   /* read it in from the file */
-  readbytes = read(src->fd,GST_BUFFER_DATA(buf),src->blocksize);
+  readbytes = read (src->fd, GST_BUFFER_DATA (buf), src->blocksize);
+
   /* if nothing was read, we're in eos */
   if (readbytes == 0) {
     gst_element_set_eos (GST_ELEMENT (src));
     return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
   }
 
-  GST_BUFFER_OFFSET(buf) = src->curoffset;
-  GST_BUFFER_SIZE(buf) = readbytes;
+  GST_BUFFER_OFFSET (buf) = src->curoffset;
+  GST_BUFFER_SIZE (buf) = readbytes;
+  GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
   src->curoffset += readbytes;
 
   /* we're done, return the buffer */
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index 5f159e160a..93336d5b91 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -401,7 +401,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
   GST_BUFFER_SIZE (buf) = size;
   GST_BUFFER_MAXSIZE (buf) = size;
   GST_BUFFER_OFFSET (buf) = offset;
-  GST_BUFFER_TIMESTAMP (buf) = -1LL;
+  GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
   GST_BUFFER_POOL_PRIVATE (buf) = src;
   GST_BUFFER_FREE_FUNC (buf) = (GstDataFreeFunction) gst_filesrc_free_parent_mmap;