diff --git a/ChangeLog b/ChangeLog
index a19158934b..a815a8a03e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-07  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* Makefile.am:
+	* configure.ac:
+	* gst-element-check.m4:
+	* gst-element-check.m4.in:
+	  Make gst-element-check-$VERSION.m4 call gst-inspect-$VERSION
+	  instead of the unversioned gst-inspect (#324176, #168659).
+
 2006-07-06  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstmessage.h:
diff --git a/Makefile.am b/Makefile.am
index bef54e0792..3d0ae1a311 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,8 @@ debug:
 	echo $(win32)
 
 EXTRA_DIST = \
-	gstreamer.spec gstreamer.spec.in gst-element-check.m4 \
+	gstreamer.spec gstreamer.spec.in \
+	gst-element-check.m4 gst-element-check.m4.in \
 	configure.ac autogen.sh depcomp \
 	ABOUT-NLS RELEASE \
 	$(win32)
diff --git a/configure.ac b/configure.ac
index b3e61537e4..d0a8c1b7f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,6 +541,7 @@ pkgconfig/gstreamer-dataprotocol.pc
 pkgconfig/gstreamer-dataprotocol-uninstalled.pc
 pkgconfig/gstreamer-net.pc
 pkgconfig/gstreamer-net-uninstalled.pc
+gst-element-check.m4
 gstreamer.spec
 )
 
diff --git a/gst-element-check.m4 b/gst-element-check.m4
deleted file mode 100644
index e608f195d0..0000000000
--- a/gst-element-check.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-dnl Perform a check for a GStreamer element using gst-inspect
-dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl Last modification: 25/01/2005
-
-dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-
-AC_DEFUN([AM_GST_ELEMENT_CHECK],
-[
-  if test "x$GST_INSPECT" == "x"; then
-    AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
-  fi
-
-  if test "x$GST_INSPECT" != "x"; then
-    AC_MSG_CHECKING(GStreamer element $1)
-    if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
-      AC_MSG_RESULT(found.)
-      $2
-    else
-      AC_MSG_RESULT(not found.)
-      $3
-    fi
-  fi
-])
diff --git a/gst-element-check.m4.in b/gst-element-check.m4.in
index e608f195d0..e535687a36 100644
--- a/gst-element-check.m4.in
+++ b/gst-element-check.m4.in
@@ -7,11 +7,11 @@ dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
 AC_DEFUN([AM_GST_ELEMENT_CHECK],
 [
   if test "x$GST_INSPECT" == "x"; then
-    AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
+    AC_CHECK_PROG(GST_INSPECT, gst-inspect-@GST_MAJORMINOR@, gst-inspect-@GST_MAJORMINOR@, [])
   fi
 
   if test "x$GST_INSPECT" != "x"; then
-    AC_MSG_CHECKING(GStreamer element $1)
+    AC_MSG_CHECKING(GStreamer @GST_MAJORMINOR@ element $1)
     if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
       AC_MSG_RESULT(found.)
       $2