diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index fdeb4d2018..abf70b68f5 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -2,9 +2,7 @@ if DRI
 DRI_SUBDIR = dri
 endif
 
-if BUILDDOCS
 DOC_SUBDIR = doc
-endif
 
 
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am
index ed87f0578b..55e69b0358 100644
--- a/hw/xfree86/doc/Makefile.am
+++ b/hw/xfree86/doc/Makefile.am
@@ -1,4 +1,8 @@
+if BUILDDOCS
 SUBDIRS = devel man sgml
+else
+SUBDIRS = man
+endif
 
 EXTRA_DIST = \
 	changelogs/CHANGELOG \