diff --git a/Makefile.am b/Makefile.am
index 62c8d9501..cea140bea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ endif
 
 SUBDIRS = \
 	doc \
+	man \
 	include \
 	dix  \
 	fb \
@@ -68,6 +69,7 @@ dist-hook: ChangeLog INSTALL
 
 DIST_SUBDIRS = \
 	doc \
+	man \
 	include \
 	dix  \
 	fb \
diff --git a/configure.ac b/configure.ac
index c6b16b5de..e23274c67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2151,10 +2151,10 @@ damageext/Makefile
 dbe/Makefile
 dix/Makefile
 doc/Makefile
-doc/man/Makefile
 doc/xml/Makefile
 doc/xml/dtrace/Makefile
 doc/xml/xserver.ent
+man/Makefile
 fb/Makefile
 record/Makefile
 config/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4c08b6f42..b9015bcf6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = man xml
+SUBDIRS = xml
 
 dist_noinst_DATA = smartsched
diff --git a/doc/man/Makefile.am b/man/Makefile.am
similarity index 100%
rename from doc/man/Makefile.am
rename to man/Makefile.am
diff --git a/doc/man/Xserver.man b/man/Xserver.man
similarity index 100%
rename from doc/man/Xserver.man
rename to man/Xserver.man