diff --git a/ChangeLog b/ChangeLog
index 4893a1ffc5..2f1f07bc28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-06-15  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* autogen.sh:
+	  Add default for new --enable-plugin-docs switch.
+
+	* configure.ac:
+	  Use new GST_PLUGIN_DOCS macro to check for pyxml etc.
+	  Fixes #344039.
+
+	* docs/Makefile.am:
+	  Use new ENABLE_PLUGIN_DOCS conditional.
+
 2006-06-14  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstbin.c: (bin_query_duration_done), (gst_bin_query):
diff --git a/autogen.sh b/autogen.sh
index 12523c1907..f2b13ffdeb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,7 +25,7 @@ then
 fi
 . common/gst-autogen.sh
 
-CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-failing-tests --enable-poisoning --enable-gtk-doc --enable-docbook'
+CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-failing-tests --enable-poisoning --enable-gtk-doc --enable-docbook --enable-plugin-docs'
 
 autogen_options $@
 
diff --git a/common b/common
index dd85f55044..bbfa014696 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit dd85f550441bd5722b98f4dd304e40826383240f
+Subproject commit bbfa0146961f4ca61ddbca7b42360b5741a6354b
diff --git a/configure.ac b/configure.ac
index ba17620f4e..eceb97c0bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,6 +278,7 @@ dnl check for documentation tools
 GST_DOCBOOK_CHECK
 GTK_DOC_CHECK([1.3])
 AS_PATH_PYTHON([2.1])
+GST_PLUGIN_DOCS([1.3],[2.1])
 
 dnl *** checks for libraries ***
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6cf75c6447..bd8708a157 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,9 +1,15 @@
 if ENABLE_GTK_DOC
-SUBDIRS_GTK_DOC = gst libs plugins
+SUBDIRS_GTK_DOC = gst libs
 else
 SUBDIRS_GTK_DOC =
 endif
 
+if ENABLE_PLUGIN_DOCS
+SUBDIRS_PLUGIN_DOCS = plugins
+else
+SUBDIRS_PLUGIN_DOCS =
+endif
+
 if ENABLE_DOCBOOK
 SUBDIRS_DOCBOOK = faq manual pwg
 else
@@ -12,7 +18,7 @@ endif
 
 BUILT_SOURCES = version.entities
 
-SUBDIRS = design $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC)
+SUBDIRS = design $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC) $(SUBDIRS_PLUGIN_DOCS)
 DIST_SUBDIRS = design gst libs plugins faq manual pwg slides xsl
 
 EXTRA_DIST = \