diff --git a/ChangeLog b/ChangeLog
index 30981237a3..0308929438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-12  Stefan Kost  <ensonic@users.sf.net>
+
+	* configure.ac:
+	  Use pkg-config to locate check.
+
 2007-07-12  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/interleave/deinterleave.c: (gst_deinterleave_process):
diff --git a/configure.ac b/configure.ac
index bbce53a4f1..892634dfe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,9 +193,10 @@ AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
 
 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 Check for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"