diff --git a/Makefile.am b/Makefile.am
index 91551c10..c3065ff3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,7 @@ EXTRA_DIST = \
     extras/console-qr/console-qr.sh \
     extras/sanitizer/asan-build.sh \
     extras/sanitizer/ubsan-build.sh \
+    extras/clang/scan-build.sh \
     fwknop.spec \
     iphone/main.m \
     iphone/Fwknop.xcodeproj \
diff --git a/extras/clang/scan-build.sh b/extras/clang/scan-build.sh
new file mode 100755
index 00000000..29e36cb1
--- /dev/null
+++ b/extras/clang/scan-build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ -x ./configure ]; then
+    make clean
+    scan-build ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/run $@
+    script -c 'scan-build make'
+else
+    echo "[*] Execute from the fwknop top level sources directory"
+fi
+
+exit 0