diff --git a/.gitignore b/.gitignore
index ac5ad8f44..fd235d95c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ config.sub
 libtool
 ltmain.sh
 test-driver
-m4/
 GPATH
 GRTAGS
 GTAGS
diff --git a/Makefile.am b/Makefile.am
index d62e19a50..d2e8d8e05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,19 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-SUBDIRS = . contrib src doc
+if DOC_ONLY
+if ENABLE_DOC
+  SUBDIRS = . contrib doc
+else
+  SUBDIRS = . contrib
+endif
+else
+if ENABLE_DOC
+  SUBDIRS = . contrib src doc
+else
+  SUBDIRS = . contrib src
+endif
+endif
 
 BUILT_SOURCES = src/include/taler_error_codes.h
 
diff --git a/configure.ac b/configure.ac
index b47aeb982..edd8a83ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,10 @@ AC_INIT([taler-exchange], [0.8.1], [taler-bug@gnunet.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/util/util.c])
 AC_CONFIG_HEADERS([taler_config.h])
-# support for non-recursive builds
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_BUILD
+# support for non-recursive builds
 AM_INIT_AUTOMAKE([subdir-objects 1.9 tar-pax])
 
 # pretty build rules
@@ -32,6 +32,8 @@ AM_SILENT_RULES([yes])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_AWK
+AC_PROG_CC
+# FIXME: AC_PROG_CC_C99 is obsolete, remove for autoconf 2.70
 AC_PROG_CC_C99
 AC_PROG_OBJC
 AC_PROG_INSTALL
@@ -48,12 +50,19 @@ DX_INIT_DOXYGEN([taler-exchange],,,
  DX_CHI_FEATURE(OFF),
  DX_XML_FEATURE(OFF))
 
-# Checks for programs.
-
-AC_PROG_CC
-AC_PROG_CC_C99
+AC_MSG_CHECKING([whether to compile documentation ONLY])
+AC_ARG_ENABLE([only-doc],
+  [AS_HELP_STRING([--enable-only-doc], [only compile Taler documentation])],
+  [doc_only=${enableval}],
+  [doc_only=no])
+AC_MSG_RESULT($doc_only)
+AM_CONDITIONAL([DOC_ONLY], [test "x$doc_only" = "xyes"])
 
 
+# Not indented, as most of the file falls under this one...
+AS_IF([test "x$doc_only" != xyes],[
+
+# Force some CFLAGS
 CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS"
 
 # Checks for header files.
@@ -489,6 +498,32 @@ AC_TYPE_UINTMAX_T
 # Checks for library functions.
 AC_CHECK_FUNCS([strdup])
 
+
+AC_ARG_ENABLE([[doc]],
+  [AS_HELP_STRING([[--disable-doc]], [do not build any documentation])], ,
+    [enable_doc=yes])
+test "x$enable_doc" = "xno" || enable_doc=yes
+AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
+
+
+],[  # This is the big test "$doc_only" on top of the file!
+
+
+# logic if doc_only is set, make sure conditionals are still defined
+AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [false])
+AM_CONDITIONAL([MHD_HAVE_EPOLL], [false])
+AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
+AM_CONDITIONAL([HAVE_SQLITE], [false])
+AM_CONDITIONAL([HAVE_LIBCURL], [false])
+AM_CONDITIONAL([HAVE_LIBGNURL], [false])
+AM_CONDITIONAL([HAVE_DEVELOPER], [false])
+AM_CONDITIONAL([USE_COVERAGE], [false])
+AM_CONDITIONAL([ENABLE_DOC], [true])
+AM_CONDITIONAL([HAVE_TWISTER], [false])
+
+# end of 'doc_only'
+])
+
 AC_CONFIG_FILES([Makefile
                  contrib/Makefile
                  doc/Makefile
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 000000000..1f12f43df
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,6 @@
+# These are added by "autoreconf -if"
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index a84077a5e..047260bae 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -61,7 +61,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
   AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
 
   AC_ARG_WITH(libcurl,
-     AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
+     AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
      [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
 
   if test "$_libcurl_with" != "no" ; then
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 6cf482fcb..9a29eb5ba 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -23,7 +23,7 @@ dnl
 AC_DEFUN([AM_PATH_LIBGCRYPT],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   AC_ARG_WITH(libgcrypt-prefix,
-            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+            AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
                            [prefix where LIBGCRYPT is installed (optional)]),
      libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
   if test x$libgcrypt_config_prefix != x ; then
diff --git a/m4/libgnurl.m4 b/m4/libgnurl.m4
index da72e5e87..412709373 100644
--- a/m4/libgnurl.m4
+++ b/m4/libgnurl.m4
@@ -61,7 +61,7 @@ AC_DEFUN([LIBGNURL_CHECK_CONFIG],
   AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP])
 
   AC_ARG_WITH(libgnurl,
-     AC_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]),
+     AS_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]),
      [_libgnurl_with=$withval],[_libgnurl_with=ifelse([$1],,[yes],[$1])])
 
   if test "$_libgnurl_with" != "no" ; then