2 files changed, 6 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 45a693ac9..ad32cf920 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if DOCUMENTATION_ONLY
   SUBDIRS = doc
-else
-  SUBDIRS = doc m4 src po pkgconfig
+else 
+  SUBDIRS = m4 src po pkgconfig
+if DOCUMENTATION
+  SUBDIRS += doc
+endif
 endif
 
 if !TALER_ONLY
diff --git a/configure.ac b/configure.ac
index 5d308c658..ee2f1f49f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,7 +679,7 @@ AC_MSG_CHECKING(whether to build documentation)
 AC_ARG_ENABLE([documentation],
    [AS_HELP_STRING([--enable-documentation], [build the documentation])],
    [documentation=${enableval}],
-   [documentation=yes])
+   [documentation=no])
 AC_MSG_RESULT($documentation)
 if test "x$documentation" = "xyes"
 then