diff --git a/Makefile.am b/Makefile.am
index 414c405908..254a34400d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ endif
 
 # ORDER MATTERS below.  One must build dependencies FIRST, then things
 # that depend on them later
-SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) doc/manpages
+SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) doc
 
 # Putting a directory name recursively copies the entire contents - the
 # dist-hook below gets rid of CVS directories.
diff --git a/configure.ac b/configure.ac
index 1c50d1d368..68ffcc3ce6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -674,6 +674,7 @@ AC_CONFIG_FILES([
                  client/Makefile
                  client/win/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
                  db/Makefile
+                 doc/Makefile
                  doc/manpages/Makefile
                  lib/Makefile
                  Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000000..32fc3c0eab
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,10 @@
+## -*- mode: make; tab-width: 4 -*-
+## $Id$
+
+include $(top_srcdir)/Makefile.incl
+
+if HAVE_DOCBOOK2X_MAN
+  MAYBE_MANPAGES = manpages
+endif
+
+SUBDIRS = $(MAYBE_MANPAGES)
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 5395a75977..69cce87935 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -3,15 +3,20 @@
 
 include $(top_srcdir)/Makefile.incl
 
-if HAVE_DOCBOOK2X_MAN
-man_MANS = \
-    boinc_client.1 \
-    boinc_cmd.1 \
-    boincmgr.1
-else
-man_MANS = 
+if ENABLE_CLIENT
+  CLIENT_MANS = boinc_client.1 boinc_cmd.1
 endif
 
+if BUILD_CLIENTGUI
+  CLIENTGUI_MANS = boincmgr.1
+endif
+
+if ENABLE_SERVER
+  SERVER_MANS = 
+endif
+
+man_MANS = $(CLIENT_MANS) $(CLIENTGUI_MANS) $(SERVER_MANS)
+
 %.1: %.xml
 	$(DOCBOOK2X_MAN) $<