diff --git a/ChangeLog b/ChangeLog
index b33e80ff28..39c6ac2f1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-12  Stefan Kost  <ensonic@users.sf.net>
+
+	* configure.ac:
+	  Use pkg-config to locate check. Bump core requirement.
+
+	* ext/ffmpeg/gstffmpegdeinterlace.c: (gst_ffmpegdeinterlace_chain):
+	* ext/ffmpeg/gstffmpegscale.c: (gst_ffmpegscale_transform):
+	  Replace deprecated method.
+	  
+
 2007-07-05  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_chain_video),
diff --git a/configure.ac b/configure.ac
index e87c502a32..b2c1753a21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_SUBST(GST_MAJORMINOR)
 AM_PROG_LIBTOOL
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.10.4
+GST_REQ=0.10.13
 LIBOIL_MAJORMINOR=0.3
 LIBOIL_REQ=0.3.6
 
@@ -171,9 +171,10 @@ AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl FIXME: get rid of this by making sure gstreamer-check brings it in
 dnl check for "check", unit testing library/header
-AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
-AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
-
+PKG_CHECK_MODULES(CHECK, check >= 0.9.2,
+  AM_CONDITIONAL(HAVE_CHECK, true),
+  AM_CONDITIONAL(HAVE_CHECK, false)
+)
 dnl Add MacOSX specific flags
 AC_CANONICAL_HOST
 case $host_os in
diff --git a/ext/ffmpeg/gstffmpegdeinterlace.c b/ext/ffmpeg/gstffmpegdeinterlace.c
index 755b449a04..21487b529d 100644
--- a/ext/ffmpeg/gstffmpegdeinterlace.c
+++ b/ext/ffmpeg/gstffmpegdeinterlace.c
@@ -180,7 +180,7 @@ gst_ffmpegdeinterlace_chain (GstPad * pad, GstBuffer * inbuf)
     avpicture_deinterlace (&deinterlace->to_frame, &deinterlace->from_frame,
         deinterlace->pixfmt, deinterlace->width, deinterlace->height);
 
-    gst_buffer_stamp (outbuf, inbuf);
+    gst_buffer_copy_metadata (outbuf, inbuf, GST_BUFFER_COPY_TIMESTAMPS);
 
     result = gst_pad_push (deinterlace->srcpad, outbuf);
   }
diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/ffmpeg/gstffmpegscale.c
index 65ada28b9f..7fb185beb1 100644
--- a/ext/ffmpeg/gstffmpegscale.c
+++ b/ext/ffmpeg/gstffmpegscale.c
@@ -347,7 +347,7 @@ gst_ffmpegscale_transform (GstBaseTransform * trans, GstBuffer * inbuf,
   GstFFMpegScale *scale = GST_FFMPEGSCALE (trans);
   AVPicture in_frame, out_frame;
 
-  gst_buffer_stamp (outbuf, inbuf);
+  gst_buffer_copy_metadata (outbuf, inbuf, GST_BUFFER_COPY_TIMESTAMPS);
 
   gst_ffmpeg_avpicture_fill (&in_frame,
       GST_BUFFER_DATA (inbuf),