diff --git a/common b/common
index 0702fe19e9..18612522c0 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0702fe19e974bc4461b5cfeb5db0e80de00a84d3
+Subproject commit 18612522c062bceacfe3952d89e850a0ca3d412a
diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index b3c7a9bf3f..857fee4401 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -91,6 +91,9 @@ GTKDOC_LIBS = $(GST_OBJ_LIBS) $(SCANOBJ_DEPS)
 GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
 GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
+GTKDOC_EXTRA_ENVIRONMENT= \
+    GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/plugin-scanner
+
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.
 DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index f3d3c98c88..092d75ec87 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -95,6 +95,9 @@ GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_OBJ_LIBS)
 GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
 GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
+GTKDOC_EXTRA_ENVIRONMENT= \
+    GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/plugin-scanner
+
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.
 DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt