diff --git a/debian/changelog b/debian/changelog
index cf5e8d91..7b7fcb44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,20 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 30 Jan 2021 17:31:15 +0100
 
+llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium
+
+  [ Kasper Kantz ]
+  * Add riscv64 architecture in control
+    enable liblldb, libomp and others which are
+    currently unavailable in riscv64 repository.
+
+  [ Krzysztof Aleksander Pyrkosz ]
+  * Add libxml2 as a dependency as it is necessary
+    for llvm manifest tool (llvm-mt)
+    (Closes: #990537)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Jul 2021 08:19:59 +0200
+
 llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium
 
   * New upsream release
@@ -357,12 +371,18 @@ llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental;
 
 llvm-toolchain-11 (1:11.1.0-1~exp2) experimental; urgency=medium
 
+  * Fix the default binary path for scan-build-py to clang-11 (instead of
+    clang) - see scan-build-py-fix-default-bin.diff
+    tested by
+    https://github.com/opencollab/llvm-toolchain-integration-test-suite/
+
   [ Krzysztof Aleksander Pyrkosz ]
   * Add libxml2 as a dependency as it is necessary
     for llvm manifest tool (llvm-mt)
     (Closes: #990537)
+    - not really working for now
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 11 Jul 2021 23:32:10 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 17 Jul 2021 20:13:57 +0200
 
 llvm-toolchain-11 (1:11.1.0-1~exp1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 998c63f1..364acf62 100644
--- a/debian/control
+++ b/debian/control
@@ -388,7 +388,7 @@ Description: Modular compiler and toolchain technologies, tools
 
 Package: libllvm-13-ocaml-dev
 Section: ocaml
-Architecture: amd64 arm64 armhf ppc64el s390x
+Architecture: amd64 arm64 armhf ppc64el s390x riscv64
 Suggests: llvm-13-doc
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-13-dev (= ${binary:Version})
 Replaces: libllvm-x.y-ocaml-dev
@@ -452,7 +452,7 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lld -------------
 
 Package: lld-13
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -462,7 +462,7 @@ Description: LLVM-based linker
  Project.
 
 Package: liblld-13
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -476,7 +476,7 @@ Description: LLVM-based linker, library
 
 Package: liblld-13-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lld-13 (= ${binary:Version}),
  liblld-13 (= ${binary:Version})
@@ -492,7 +492,7 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-13
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}), llvm-13-dev,
  python3-lldb-13
@@ -503,7 +503,7 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-13
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -517,7 +517,7 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-13
 Section: python
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-13 (= ${binary:Version}), python3-six
 Conflicts: python3-lldb-x.y
@@ -533,7 +533,7 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-13-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -551,7 +551,7 @@ Description: Next generation, high-performance debugger, header files
 
 Package: libomp-13-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
+Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
 Depends: libomp5-13 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-13-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
@@ -565,7 +565,7 @@ Description: LLVM OpenMP runtime - dev package
 
 Package: libomp5-13
 Multi-Arch: same
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
+Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libomp5 (<< 44)
 Provides: libomp-x.y
@@ -578,7 +578,7 @@ Description: LLVM OpenMP runtime
 
 Package: libomp-13-doc
 Section: doc
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
+Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
 Replaces: libiomp-x.y-doc
 Breaks: libiomp-x.y-doc
diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff
new file mode 100644
index 00000000..960773ca
--- /dev/null
+++ b/debian/patches/scan-build-py-fix-default-bin.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-12-12.0.0/clang/tools/scan-build-py/libscanbuild/arguments.py
+===================================================================
+--- llvm-toolchain-12-12.0.0.orig/clang/tools/scan-build-py/libscanbuild/arguments.py
++++ llvm-toolchain-12-12.0.0/clang/tools/scan-build-py/libscanbuild/arguments.py
+@@ -250,7 +250,7 @@ def create_analyze_parser(from_build_com
+         '--use-analyzer',
+         metavar='<path>',
+         dest='clang',
+-        default='clang',
++        default='clang-12',
+         help="""'%(prog)s' uses the 'clang' executable relative to itself for
+         static analysis. One can override this behavior with this option by
+         using the 'clang' packaged with Xcode (on OS X) or from the PATH.""")
diff --git a/debian/patches/series b/debian/patches/series
index f10927d2..c496f622 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -142,4 +142,4 @@ lld-use-link-atomic-i386.diff
 lower-python-dep.diff
 scan-build-py-fix-analyze-path.diff
 revert-D103865-s390x-crash.patch
-
+scan-build-py-fix-default-bin.diff