diff --git a/Makefile.am b/Makefile.am
index ca0ef2779c..e7debfc22c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,3 @@
-if BUILD_DOCS
-# disabled until it actually works
-# SUBDIRS_DOCS = docs
-SUBDIRS_DOCS =
-else
-SUBDIRS_DOCS =
-endif
-
 # if USE_GCONFTOOL
 # GCONF_DIR = gconf
 # else
@@ -23,9 +15,6 @@ DIST_SUBDIRS = 			\
 	gst sys ext gst-libs	\
 	m4 common
 
-# disabled
-#	docs
-
 EXTRA_DIST = \
 	gst-plugins.spec depcomp \
 	AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
diff --git a/common b/common
index 4ca96aedcf..03aa1cd7f7 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 4ca96aedcf2be0b3dcf31fce732aed1da21b8850
+Subproject commit 03aa1cd7f77f87fc24565044c0a3c9c5124c39a4