diff --git a/debian/changelog b/debian/changelog
index a0e0f29b..101e8691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 llvm-toolchain-11 (1:11.1.0-3) unstable; urgency=medium
 
   * Also build lld on s390x
+  * Fix the path to analyze-{cc,c++} for scan-build-py with
+    --intercept-first (scan-build-py-fix-analyze-path.diff)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 28 Apr 2021 22:30:40 +0200
 
diff --git a/debian/patches/scan-build-py-fix-analyze-path.diff b/debian/patches/scan-build-py-fix-analyze-path.diff
new file mode 100644
index 00000000..9e5f5c7e
--- /dev/null
+++ b/debian/patches/scan-build-py-fix-analyze-path.diff
@@ -0,0 +1,15 @@
+Index: llvm-toolchain-11-11.0.1/clang/tools/scan-build-py/libscanbuild/analyze.py
+===================================================================
+--- llvm-toolchain-11-11.0.1.orig/clang/tools/scan-build-py/libscanbuild/analyze.py
++++ llvm-toolchain-11-11.0.1/clang/tools/scan-build-py/libscanbuild/analyze.py
+@@ -39,8 +39,8 @@ from libscanbuild.shell import decode
+ 
+ __all__ = ['scan_build', 'analyze_build', 'analyze_compiler_wrapper']
+ 
+-COMPILER_WRAPPER_CC = 'analyze-cc'
+-COMPILER_WRAPPER_CXX = 'analyze-c++'
++COMPILER_WRAPPER_CC = '/usr/share/clang/scan-build-py-11/bin/analyze-cc'
++COMPILER_WRAPPER_CXX = '/usr/share/clang/scan-build-py-11/bin/analyze-c++'
+ 
+ CTU_EXTDEF_MAP_FILENAME = 'externalDefMap.txt'
+ CTU_TEMP_DEFMAP_FOLDER = 'tmpExternalDefMaps'
diff --git a/debian/patches/series b/debian/patches/series
index 58d25730..fc1c83a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -142,3 +142,4 @@ libcxx-armhf-ftbfs.diff
 silent-integration-test-suite-i386.diff
 0001-Add-minor-version-to-libclang.so-and-libclang-cpp.so.patch
 revert-abi-change-clang.diff
+scan-build-py-fix-analyze-path.diff