diff --git a/Makefile.am b/Makefile.am
index 7d042c7..c58b8bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 # Generic definitions
+SUBDIRS = doc
 
+CLEANFILES=
 ACLOCAL_AMFLAGS =-I m4
 AUTOMAKE_OPTIONS = foreign subdir-objects
 AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \
@@ -7,13 +9,8 @@ AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \
 AM_CFLAGS=$(WARN_CFLAGS)
 LDADD = lib/libiscsi.la
 
-# Manpages
-man1_MANS = doc/iscsi-inq.1 doc/iscsi-ls.1 doc/iscsi-swp.1
-CLEANFILES = $(man1_MANS)
-
 EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \
 	     packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \
-	     doc/iscsi-inq.xml doc/iscsi-ls.xml doc/iscsi-swp.xml \
 	     aros/aros_compat.c aros/aros_compat.h aros/iscsi-ls.c \
 	     aros/Makefile.AROS \
 	     win32/vsbuild.bat win32/win32_compat.c win32/win32_compat.h \
@@ -397,12 +394,3 @@ bin/ld_iscsi.so: bin/ld_iscsi.o
 	$(CC) -shared -o bin/ld_iscsi.so bin/ld_iscsi.o -ldl
 endif
 
-XSLTPROC = /usr/bin/xsltproc
-
-.xml.1:
-if BUILD_MANPAGES
-	$(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-else
-	echo "Building without manpages"
-endif
-
diff --git a/configure.ac b/configure.ac
index ecabb58..4b3052b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,5 +128,7 @@ AC_CHECK_MEMBER([struct CU_SuiteInfo.pSetUpFunc],
 ]])
 
 
-AC_CONFIG_FILES(Makefile libiscsi.pc)
+AC_CONFIG_FILES([Makefile]
+		[doc/Makefile]
+		[libiscsi.pc])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..44b1d42
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,14 @@
+XSLTPROC = /usr/bin/xsltproc
+
+# Manpages
+man1_MANS = iscsi-inq.1 iscsi-ls.1 iscsi-swp.1
+
+EXTRA_DIST = iscsi-inq.xml iscsi-ls.xml iscsi-swp.xml
+
+.xml.1:
+if BUILD_MANPAGES
+	$(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+else
+	echo "Building without manpages"
+endif
+