diff --git a/Projects/AnalysisBase/build.sh b/Projects/AnalysisBase/build.sh
index e60c02d3ca2148f2a07ef57b309a03958db5b480..99bcd79bf86b6b938cf568202064437918db96bf 100755
--- a/Projects/AnalysisBase/build.sh
+++ b/Projects/AnalysisBase/build.sh
@@ -12,8 +12,6 @@ usage() {
     echo "    -t: The (optional) CMake build type to use."
     echo "    -b: The (optional) build directory to use."
     echo "    -g: The (optional) CMake generator to use."
-    echo "        Be careful that only the default can be used for"
-    echo "        automatic builds by the script."
     echo "    -a: Abort on error."
     echo "  Build step selection:"
     echo "    -c: Execute the CMake step."
@@ -133,7 +131,18 @@ fi
 
 # Run the build:
 if [ -n "$EXE_MAKE" ]; then
-    time make -k 2>&1 | tee cmake_build.log
+    if [ "$NIGHTLY" = true ]; then
+        # In order to build the project in a nightly setup, allowing for some
+        # build steps to fail while still continuing, we need to use "make"
+        # directly. Only allowing the usage of the Makefile generator.
+        time make -k 2>&1 | tee cmake_build.log
+    else
+        # However in a non-nightly setup we can just rely on CMake to start
+        # the build for us. In this case we can use any generator we'd like
+        # for the build. Notice however that the installation step can still
+        # be only done correctly by using GNU Make directly.
+        time cmake --build . 2>&1 | tee cmake_build.log
+    fi
 fi
 
 # Install the results:
diff --git a/Projects/AnalysisBase/build_externals.sh b/Projects/AnalysisBase/build_externals.sh
index 2e0f2e997998a0a6717a57b25968ef0d6c0f489f..61ed38e82ff3154475a25ae9ac260be292bfd653 100755
--- a/Projects/AnalysisBase/build_externals.sh
+++ b/Projects/AnalysisBase/build_externals.sh
@@ -27,7 +27,7 @@ while getopts ":t:b:fh" opt; do
         b)
             BUILDDIR=$OPTARG
             ;;
-	f)
+        f)
             FORCE=1
             ;;
         h)
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index ddbb5db0e886a3e9501aad6bafa5b833dad2465b..76c7f6d55d4c320cd491cef7dd7e5a0543895573 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -1,4 +1,4 @@
 # Versions of the various externals to build before starting the build of
 # this project, when doing a full stack nightly build.
 
-AnalysisBaseExternalsVersion = master
+AnalysisBaseExternalsVersion = 1.0.1