diff --git a/ChangeLog b/ChangeLog
index f7a1b06d7d..352e065163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-03  Peter Kjellerstedt  <pkj@axis.com>
+
+	* configure.ac:
+	Use AG_GST_CHECK_PLUGIN and AG_GST_DISABLE_PLUGIN to simplify which
+	plug-ins are included/excluded. (#498222)
+
 2008-02-27  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* ext/mad/gstmad.c: (gst_mad_sink_event):
diff --git a/common b/common
index e746d20ef5..668c3f0b72 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e746d20ef536a73aea9964666c7d5f6d5c9465df
+Subproject commit 668c3f0b72d50813c30eb04be7048f638037c571
diff --git a/configure.ac b/configure.ac
index 1b5f22d137..faf9a1b52f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,33 +76,12 @@ AG_GST_ARG_WITH_PKG_CONFIG_PATH
 AG_GST_ARG_WITH_PACKAGE_NAME
 AG_GST_ARG_WITH_PACKAGE_ORIGIN
 
-dnl these are all the gst plug-ins, compilable without additional libs
-GST_PLUGINS_ALL="\
-	asfdemux \
-	dvdlpcmdec \
-	dvdsub \
-	iec958 \
-	mpegaudioparse \
-	mpegstream \
-	realmedia \
-	synaesthesia \
-	"
-
-AC_SUBST(GST_PLUGINS_ALL)
-
-GST_PLUGINS_SELECTED=""
 AG_GST_ARG_WITH_PLUGINS
 
 AG_GST_ARG_ENABLE_EXTERNAL
 
 AG_GST_ARG_ENABLE_EXPERIMENTAL
 
-if test "x$BUILD_EXPERIMENTAL" != "xyes"; then
-  GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/synaesthesia//`
-fi
-
-AC_SUBST(GST_PLUGINS_SELECTED)
-
 dnl *** checks for platform ***
 
 dnl * hardware/architecture *
@@ -167,8 +146,7 @@ AG_GST_GLIB_CHECK([2.6])
 
 dnl liboil is required
 PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.8, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
-if test "x$HAVE_LIBOIL" != "xyes"
-then
+if test "x$HAVE_LIBOIL" != "xyes"; then
   AC_ERROR([liboil-0.3.8 or later is required])
 fi
 
@@ -210,6 +188,23 @@ AG_GST_SET_LEVEL_DEFAULT($GST_CVS)
 dnl used in examples
 AG_GST_DEFAULT_ELEMENTS
 
+dnl *** plug-ins to include ***
+
+dnl these are all the gst plug-ins, compilable without additional libs
+AG_GST_CHECK_PLUGIN(asfdemux)
+AG_GST_CHECK_PLUGIN(dvdlpcmdec)
+AG_GST_CHECK_PLUGIN(dvdsub)
+AG_GST_CHECK_PLUGIN(iec958)
+AG_GST_CHECK_PLUGIN(mpegaudioparse)
+AG_GST_CHECK_PLUGIN(mpegstream)
+AG_GST_CHECK_PLUGIN(realmedia)
+AG_GST_CHECK_PLUGIN(synaesthesia)
+
+dnl disable experimental plug-ins
+if test "x$BUILD_EXPERIMENTAL" != "xyes"; then
+  AG_GST_DISABLE_PLUGIN(synaesthesia)
+fi
+
 dnl *** ext plug-ins ***
 dnl keep this list sorted alphabetically !