diff --git a/configure.ac b/configure.ac
index 4e07af9cb5..31cb9b7870 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1407,13 +1407,16 @@ dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
 GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
+SHAVE_INIT([common])
+
 dnl *** output files ***
 
 dnl po/Makefile.in
 
-
 AC_CONFIG_FILES(
 Makefile
+common/shave
+common/shave-libtool
 gst-plugins-bad.spec
 gst/Makefile
 gst/aacparse/Makefile
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index da2d04a660..84dc00de37 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -168,8 +168,8 @@ extra_files =
 GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir)
 GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS)
 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
+GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
+GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.