diff --git a/README.md b/README.md
index b2d3bef..7ba1e08 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ in org-mode files and produce the source code and the documentation from these f
 
 ```
 ./autogen.sh
-QMCKL_DEVEL=1 ./configure --prefix=$PWD/_install --enable-silent-rules --enable-maintainer-mode
+./configure --prefix=$PWD/_install --enable-silent-rules --enable-maintainer-mode
 
 make
 make check
@@ -54,7 +54,7 @@ by the preprocessor otherwise). To enable vfc_ci support, the library should be
 configured with the following command :
 
 ```
-QMCKL_DEVEL=1 ./configure --prefix=$PWD/_install \ --enable-silent-rules --enable-maintainer-mode --enable-vfc_ci --host=x86_64 \ CC="verificarlo-f" FC="verificarlo-f"
+./configure --prefix=$PWD/_install \ --enable-silent-rules --enable-maintainer-mode --enable-vfc_ci --host=x86_64 \ CC="verificarlo-f" FC="verificarlo-f"
 ```
 
 where CC and FC are set to verificarlo-f, and support is explicitely enabled
diff --git a/configure.ac b/configure.ac
index 5fef528..550f858 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,11 +189,16 @@ AC_TYPE_UINT64_T
 AC_CHECK_FUNCS([memset strerror])
 
 # Development mode
+if test "x$enable_maintainer_mode" == "xyes" ; then
+  QMCKL_DEVEL=" -- Developer mode"
+else
+  QMCKL_DEVEL=""
+fi
+
 AM_CONDITIONAL([QMCKL_DEVEL],[test "x$QMCKL_DEVEL" != x])
 
 if test "x${QMCKL_DEVEL}" != "x"; then
 
-  QMCKL_DEVEL=" -- Developer mode"
   AC_PROG_AWK
   AM_PATH_PYTHON
   ${PYTHON} ${srcdir}/tools/build_makefile.py
diff --git a/tools/build_makefile.py b/tools/build_makefile.py
index 42880f2..e3851c2 100755
--- a/tools/build_makefile.py
+++ b/tools/build_makefile.py
@@ -206,7 +206,7 @@ def main():
               "if QMCKL_DEVEL" ]
     for f in DEPS_ORG.keys():
         output += [ DEPS_ORG[f] + ": "+f,
-                    "\t$(tangle_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/tangle.sh "+f,
+                    "\t$(tangle_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/missing bash $(srcdir)/tools/tangle.sh "+f,
                     "" ]
     output += [ "endif",
                 "" ]
@@ -257,7 +257,7 @@ def main():
 
     for f in sorted(DEPS_DOC.keys()):
         output += [ DEPS_DOC[f] + ": " + f + " $(htmlize_el)",
-                    "\t$(export_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/build_doc.sh "+f,
+                    "\t$(export_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/missing bash $(srcdir)/tools/build_doc.sh "+f,
                     "" ]
     output += ["endif"]