diff --git a/Makefile.am b/Makefile.am
index 88f8e660cb..fe5f9d37a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
-SUBDIRS = gst-libs ext docs
-EXTRA_DIST=gst-ffmpeg.spec depcomp \
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
+SUBDIRS = gst-libs ext docs common
+EXTRA_DIST = \
+	gst-ffmpeg.spec depcomp \
 	AUTHORS COPYING NEWS README ChangeLog
 
 ACLOCAL_AMFLAGS = -I common/m4
diff --git a/autogen.sh b/autogen.sh
index 0453df261b..b2bb25a89c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,7 +30,7 @@ then
 fi
 . common/gst-autogen.sh
 
-CONFIGURE_DEF_OPT='--enable-maintainer-mode'
+CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc'
 
 autogen_options $@
 
diff --git a/configure.ac b/configure.ac
index 671ba5b923..b652271ef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,9 @@ ext/libpostproc/Makefile
 gst-libs/Makefile
 gst-libs/ext/Makefile
 docs/Makefile
+docs/version.entities
 docs/plugins/Makefile
+common/Makefile
+common/m4/Makefile
 )
 AC_OUTPUT