diff --git a/Allwmake-scan b/Allwmake-scan
deleted file mode 100755
index 064ff08459e1a41ca10b4547cbf739bd197b7be1..0000000000000000000000000000000000000000
--- a/Allwmake-scan
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Allwmake with scan-build (clang)
-
-c_compiler="$(command -v "$(wmake -show-c)")"
-cxx_compiler="$(command -v "$(wmake -show-cxx)")"
-
-set -x
-
-scan-build --use-cc="$c_compiler" --use-c++="$cxx_compiler" \
-    ./Allwmake "$@"
-
-#------------------------------------------------------------------------------
diff --git a/applications/test/00-dummy/Allwmake b/applications/test/00-dummy/Allwmake
index 3b9caf0c72c1fad5b28760c9e13a941793bd3e92..a860a07515ea8334c2f76490c0592f9460d9669e 100755
--- a/applications/test/00-dummy/Allwmake
+++ b/applications/test/00-dummy/Allwmake
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1                        # Run from this directory
 
 # Can never be too certain ...
 # Compile tools for wmake
-( cd "${WM_DIR:-${WM_PROJECT_DIR}/wmake}/src" && make )
+( cd "${WM_DIR:-${WM_PROJECT_DIR}/wmake}/src" && ./Allmake )
 
 #------------------------------------------------------------------------------
 
diff --git a/src/Allwmake-scan b/src/Allwmake-scan
new file mode 100755
index 0000000000000000000000000000000000000000..2d12e096bd6c1295e6df21510363e5679070b158
--- /dev/null
+++ b/src/Allwmake-scan
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Allwmake with scan-build (clang)
+
+command -v scan-build > /dev/null || {
+    exec 1>&2
+    echo "No scan-build found, stopping"
+    echo
+    exit 2
+}
+
+comp_cc="$(command -v "$(wmake -show-c)")"
+comp_cxx="$(command -v "$(wmake -show-cxx)")"
+
+set -x
+scan-build --use-cc="$comp_cc" --use-c++="$comp_cxx" \
+    ./Allwmake "$@"
+
+#------------------------------------------------------------------------------