diff --git a/Makefile.am b/Makefile.am
index 238f1022b..7733c5c2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,13 @@ kcm_dir = kcm
 endif
 
 SUBDIRS=  include base lib kuser kdc admin kadmin kpasswd 
-SUBDIRS+= $(kcm_dir) appl doc tools tests packages etc po
+SUBDIRS+= $(kcm_dir) appl tools tests packages etc po
+
+if HEIMDAL_DOCUMENTATION
+SUBDIRS+= doc
+endif
+
+
 
 ## ACLOCAL = @ACLOCAL@ -I cf
 ACLOCAL_AMFLAGS = -I cf
diff --git a/configure.ac b/configure.ac
index 6902a171d..0359c09a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,6 +598,11 @@ AH_BOTTOM([#ifdef ROKEN_RENAME
 #include "roken_rename.h"
 #endif])
 
+AC_ARG_ENABLE(heimdal-documentation,
+	AS_HELP_STRING([--disable-heimdal-documentation],
+		[if you want disable to heimdal documentation]))
+AM_CONDITIONAL(HEIMDAL_DOCUMENTATION, test "$enable_heimdal_documentation" != no)
+
 AC_CONFIG_FILES(Makefile 		\
 	etc/Makefile			\
 	include/Makefile		\