diff --git a/Makefile.am b/Makefile.am
index 624adef..ed6adff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src doc
+SUBDIRS = src
 ACLOCAL_AMFLAGS = -I m4
 
 pcfiles = libcmis-@LIBCMIS_API_VERSION@.pc
diff --git a/configure.ac b/configure.ac
index b0c94cc..9d6aedc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,12 +44,6 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_LIBTOOL_WIN32_DLL
 
-# TODO Check for docbook-to-man
-AC_CHECK_PROG(DOCBOOK2X,[docbook-to-man],[docbook2X])
-if test "x$DOCBOOK2X" = "x"; then
-    AC_MSG_ERROR([docbook-to-man is missing. Install docbook2X package.])
-fi
-
 AC_ARG_ENABLE([werror],
 	[AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, usefull for development])],
 	[enable_werror="$enableval"],