diff --git a/cde/Makefile.am b/cde/Makefile.am
index 979916117..567f4623a 100644
--- a/cde/Makefile.am
+++ b/cde/Makefile.am
@@ -9,5 +9,9 @@ MAINTAINERCLEANFILES = Makefile.in \
 		config.h.in \
 		install-sh
 
-SUBDIRS = util lib programs include doc
+SUBDIRS = util lib programs include
+
+if BUILD_DOCS
+SUBDIRS += doc
+endif
 
diff --git a/cde/configure.ac b/cde/configure.ac
index da178dd2b..a6886a50e 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -259,6 +259,13 @@ AC_ARG_ENABLE([misc-fixed],
 )
 AM_CONDITIONAL([MISC_FIXED], [test -n "$enable_misc_fixed"])
 
+dnl Build the help and dtinfo docs?
+AC_ARG_ENABLE([docs],
+        AS_HELP_STRING([--disable-docs], [Disable building help/dtinfo docs (default=no)]),
+        [disable_docs="yes"], [disable_docs=""]
+)
+AM_CONDITIONAL([BUILD_DOCS], [test -z "$disable_docs"])
+
 dnl hmmm...
 RM="rm -f"
 AC_SUBST(RM)