diff --git a/debian/control b/debian/control
index d3a76d6e..deb32e24 100644
--- a/debian/control
+++ b/debian/control
@@ -27,14 +27,14 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
 
 # ------------- clang -------------
 
-Package: clang-12
+Package: clang-13
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-12-dev (= ${binary:Version}),
- libclang1-12 (= ${binary:Version}), libc6-dev, binutils
+ ${dep:devlibs-objc}, libclang-common-13-dev (= ${binary:Version}),
+ libclang1-13 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
-Recommends: llvm-12-dev, python3, libomp-12-dev
-Suggests: clang-12-doc
+Recommends: llvm-13-dev, python3, libomp-13-dev
+Suggests: clang-13-doc
 Description: C, C++ and Objective-C compiler
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -43,9 +43,9 @@ Description: C, C++ and Objective-C compiler
  Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also
  provides most of the support of C++20.
 
-Package: clang-tools-12
+Package: clang-tools-13
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-12 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-13 (= ${binary:Version}),
  python3
 Description: clang-based tools for C/C++ developments
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -57,10 +57,10 @@ Description: clang-based tools for C/C++ developments
  .
  This package contains some clang-based tools like scan-build, clang-cl, etc.
 
-Package: clang-format-12
+Package: clang-format-13
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm12 (= ${binary:Version})
+ libllvm13 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -73,21 +73,21 @@ Description: Tool to format C/C++/Obj-C code
  .
  This package also provides vim and emacs plugins.
 
-Package: clang-tidy-12
+Package: clang-tidy-13
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm12 (= ${binary:Version}), libclang-common-12-dev,
- clang-tools-12, python3-yaml
+ libllvm13 (= ${binary:Version}), libclang-common-13-dev,
+ clang-tools-13, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
  errors, like style violations, interface misuse, or bugs that can be deduced
  via static analysis. clang-tidy is modular and provides a convenient interface
  for writing new checks.
 
-Package: clangd-12
+Package: clangd-13
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libclang-common-12-dev (= ${binary:Version})
+ libclang-common-13-dev (= ${binary:Version})
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
@@ -98,7 +98,7 @@ Description: Language server that provides IDE-like features to editors
  clangd is a language server that implements the Language Server Protocol;
  it can work with many editors through a plugin.
 
-Package: clang-12-doc
+Package: clang-13-doc
 Architecture: all
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax
@@ -112,7 +112,7 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-12
+Package: libclang1-13
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -133,12 +133,12 @@ Description: C interface to the Clang library
  locations with elements within the AST, and other facilities that support
  Clang-based development tools.
 
-Package: libclang-12-dev
+Package: libclang-13-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-12 (= ${binary:Version}),
- libclang-common-12-dev (= ${binary:Version})
+ ${dep:devlibs-objc}, libclang1-13 (= ${binary:Version}),
+ libclang-common-13-dev (= ${binary:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -148,12 +148,12 @@ Description: Clang library - Development package
  provides most of the support of C++20.
  .
  This package contains the Clang headers to develop extensions over
- libclang1-12.
+ libclang1-13.
 
-Package: libclang-common-12-dev
+Package: libclang-common-13-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -165,10 +165,10 @@ Description: Clang library - Common development package
  This package contains the Clang generic headers and some libraries
  (profiling, etc).
 
-Package: libclang-cpp12
+Package: libclang-cpp13
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -186,12 +186,12 @@ Description: C++ interface to the Clang library
  locations with elements within the AST, and other facilities that support
  Clang-based development tools.
 
-Package: libclang-cpp12-dev
+Package: libclang-cpp13-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp12 (= ${binary:Version})
-# Move of libclang-cpp.so into libclang-cpp12.dev
+ libclang-cpp13 (= ${binary:Version})
+# Move of libclang-cpp.so into libclang-cpp13.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -212,10 +212,10 @@ Description: C++ interface to the Clang library
  linker at build time.
 
 
-Package: libfuzzer-12-dev
+Package: libfuzzer-13-dev
 Architecture: linux-any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-13 (= ${binary:Version})
 Description: Library for coverage-guided fuzz testing
  LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing
  of other libraries.
@@ -233,10 +233,10 @@ Description: Library for coverage-guided fuzz testing
  instrumentation.
 
 
-Package: python3-clang-12
+Package: python3-clang-13
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-12-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-13-dev
 Replaces: python-clang-x.y,
 Conflicts: python-clang-x.y
 Provides: python-clang-x.y
@@ -250,7 +250,7 @@ Description: Clang Python Bindings
  .
  This binding package provides access to the Clang compiler and libraries.
 
-Package: clang-12-examples
+Package: clang-13-examples
 Architecture: any
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -266,7 +266,7 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm12
+Package: libllvm13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -279,11 +279,11 @@ Description: Modular compiler and toolchain technologies, runtime library
  .
  This package contains the LLVM runtime library.
 
-Package: llvm-12
+Package: llvm-13
 Architecture: any
-Suggests: llvm-12-doc
-Depends: llvm-12-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: llvm-12-dev
+Suggests: llvm-13-doc
+Depends: llvm-13-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: llvm-13-dev
 Description: Modular compiler and toolchain technologies
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -307,7 +307,7 @@ Description: Modular compiler and toolchain technologies
  a young scheme front-end, and Java support is in development. LLVM can
  generate code for X96, SparcV10, PowerPC or many other architectures.
 
-Package: llvm-12-runtime
+Package: llvm-13-runtime
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: binfmt-support
@@ -327,11 +327,11 @@ Description: Modular compiler and toolchain technologies, IR interpreter
  This package provides the minimal required to execute programs in LLVM
  format.
 
-Package: llvm-12-dev
+Package: llvm-13-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-12 (= ${binary:Version}), libllvm12 (= ${binary:Version}), libtinfo-dev,
- llvm-12-tools (= ${binary:Version}), libclang-cpp12 (= ${binary:Version}), libz3-dev
+ llvm-13 (= ${binary:Version}), libllvm13 (= ${binary:Version}), libtinfo-dev,
+ llvm-13-tools (= ${binary:Version}), libclang-cpp13 (= ${binary:Version}), libz3-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -348,7 +348,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers
  This package provides the libraries and headers to develop applications
  using llvm.
 
-Package: llvm-12-tools
+Package: llvm-13-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  python3-pygments, python3-yaml,
@@ -368,11 +368,11 @@ Description: Modular compiler and toolchain technologies, tools
  .
  This package provides tools for testing.
 
-Package: libllvm-12-ocaml-dev
+Package: libllvm-13-ocaml-dev
 Section: ocaml
 Architecture: amd64 arm64 armhf ppc64el s390x
-Suggests: llvm-12-doc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-12-dev (= ${binary:Version})
+Suggests: llvm-13-doc
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-13-dev (= ${binary:Version})
 Replaces: libllvm-x.y-ocaml-dev
 Conflicts: libllvm-x.y-ocaml-dev
 Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev
@@ -391,7 +391,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings
  .
  This package provides the OCaml bindings to develop applications using llvm.
 
-Package: llvm-12-doc
+Package: llvm-13-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
@@ -410,10 +410,10 @@ Description: Modular compiler and toolchain technologies, documentation
  .
  This package contains all documentation (extensive).
 
-Package: llvm-12-examples
+Package: llvm-13-examples
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, llvm-12-dev (>= ${source:Version}), llvm-12-dev (<< ${source:Version}+c~)
+Depends: ${misc:Depends}, llvm-13-dev (>= ${source:Version}), llvm-13-dev (<< ${source:Version}+c~)
 Description: Modular compiler and toolchain technologies, examples
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -433,20 +433,20 @@ Description: Modular compiler and toolchain technologies, examples
 
 # ------------- lld -------------
 
-Package: lld-12
+Package: lld-13
 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
  components which highly leverage existing libraries in the larger LLVM
  Project.
 
-Package: liblld-12
+Package: liblld-13
 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -456,12 +456,12 @@ Description: LLVM-based linker, library
  .
  This package contains the LLD runtime library.
 
-Package: liblld-12-dev
+Package: liblld-13-dev
 Section: libdevel
 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, lld-12 (= ${binary:Version}),
- liblld-12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, lld-13 (= ${binary:Version}),
+ liblld-13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker, header files
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -473,21 +473,21 @@ Description: LLVM-based linker, header files
 
 # ------------- lldb -------------
 
-Package: lldb-12
+Package: lldb-13
 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}), llvm-12-dev,
- python3-lldb-12
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}), llvm-13-dev,
+ python3-lldb-13
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
  LLDB is a next generation, high-performance debugger. It is built as a set of
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-12
+Package: liblldb-13
 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -497,11 +497,11 @@ Description: Next generation, high-performance debugger, library
  .
  This package contains the LLDB runtime library.
 
-Package: python3-lldb-12
+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
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-12 (= ${binary:Version}), python3-six
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-13 (= ${binary:Version}), python3-six
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -513,11 +513,11 @@ Description: Next generation, high-performance debugger, python3 lib
  .
  This binding package provides access to lldb.
 
-Package: liblldb-12-dev
+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
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-12 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-13 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, header files
  LLDB is a next generation, high-performance debugger. It is built as a set of
@@ -531,11 +531,11 @@ Description: Next generation, high-performance debugger, header files
 # 44 because it was the first version in which openmp & libc++ have been
 # managed in llvm-defaults
 
-Package: libomp-12-dev
+Package: libomp-13-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
-Depends: libomp5-12 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libomp-12-doc
+Depends: libomp5-13 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: libomp-13-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
 Conflicts: libomp-x.y-dev
@@ -545,7 +545,7 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-12
+Package: libomp5-13
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -558,7 +558,7 @@ Description: LLVM OpenMP runtime
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp-12-doc
+Package: libomp-13-doc
 Section: doc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
@@ -573,7 +573,7 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-12
+Package: libc++1-13
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -597,11 +597,11 @@ Description: LLVM C++ Standard library
      as exception objects, rtti and memory allocation.
    * Extensive unit tests.
 
-Package: libc++-12-dev
+Package: libc++-13-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-12 (= ${binary:Version}), ${misc:Depends}
+Depends: libc++1-13 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -621,7 +621,7 @@ Description: LLVM C++ Standard library (development files)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-12
+Package: libc++abi1-13
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -640,11 +640,11 @@ Description: LLVM low level support for a standard C++ library
    * Correctness as defined by the C++ standards.
    * Provide a portable sublayer to ease the porting of libc++
 
-Package: libc++abi-12-dev
+Package: libc++abi-13-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-12 (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-13 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff
index 8bd0dfda..053cc8d0 100644
--- a/debian/patches/clang-analyzer-force-version.diff
+++ b/debian/patches/clang-analyzer-force-version.diff
@@ -1,16 +1,16 @@
 # Force the version of clang in the analyzer
 # This was causing the static analyzer to fail silently if the clang & clang++ are
 # not installed
-Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer
+Index: llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/tools/scan-build/libexec/ccc-analyzer
-+++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer
+--- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/tools/scan-build/libexec/ccc-analyzer
++++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer
 @@ -90,7 +90,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
    if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
  
    $Clang = $ENV{'CLANG_CXX'};
 -  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
-+  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-12'; }
++  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-13'; }
  
    $IsCXX = 1
  }
@@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-
  
    $Clang = $ENV{'CLANG'};
 -  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
-+  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-12'; }
++  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-13'; }
  
    $IsCXX = 0
  }
diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
index f464b4ae..e4f299b9 100644
--- a/debian/patches/clang-format-version.diff
+++ b/debian/patches/clang-format-version.diff
@@ -4,42 +4,42 @@
  clang/tools/clang-format/clang-format.py      |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-Index: llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py
+--- llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py
 @@ -58,7 +58,7 @@ def main():
    parser.add_argument('-style',
                        help='formatting style to apply (LLVM, GNU, Google, Chromium, '
                        'Microsoft, Mozilla, WebKit)')
 -  parser.add_argument('-binary', default='clang-format',
-+  parser.add_argument('-binary', default='clang-format-12',
++  parser.add_argument('-binary', default='clang-format-13',
                        help='location of binary to use for clang-format')
    args = parser.parse_args()
  
-Index: llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.el
+Index: llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el
-+++ llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.el
 @@ -37,7 +37,7 @@
    :group 'tools)
  
  (defcustom clang-format-executable
 -  (or (executable-find "clang-format")
-+  (or (executable-find "clang-format-12")
++  (or (executable-find "clang-format-13")
        "clang-format")
    "Location of the clang-format executable.
  
-Index: llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py
-+++ llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.py
+--- llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.py
 @@ -48,7 +48,7 @@ import vim
  
  # set g:clang_format_path to the path to clang-format if it is not on the path
  # Change this to the full path if clang-format is not on the path.
 -binary = 'clang-format'
-+binary = 'clang-format-12'
++binary = 'clang-format-13'
  if vim.eval('exists("g:clang_format_path")') == "1":
    binary = vim.eval('g:clang_format_path')
  
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
index 014ef617..0c53ce89 100644
--- a/debian/patches/clang-tidy-run-bin.diff
+++ b/debian/patches/clang-tidy-run-bin.diff
@@ -1,17 +1,17 @@
-Index: llvm-toolchain-snapshot_12~++20200423123502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+Index: llvm-toolchain-snapshot_13~++20200423133502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200423123502+bbb7921da97.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-+++ llvm-toolchain-snapshot_12~++20200423123502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+--- llvm-toolchain-snapshot_13~++20200423133502+bbb7921da97.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-snapshot_13~++20200423133502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 @@ -186,10 +186,10 @@ def main():
                        action='store_true', help='allow alpha checkers from '
                                                  'clang-analyzer.')
    parser.add_argument('-clang-tidy-binary', metavar='PATH',
 -                      default='clang-tidy',
-+                      default='clang-tidy-12',
++                      default='clang-tidy-13',
                        help='path to clang-tidy binary')
    parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
 -                      default='clang-apply-replacements',
-+                      default='clang-apply-replacements-12',
++                      default='clang-apply-replacements-13',
                        help='path to clang-apply-replacements binary')
    parser.add_argument('-checks', default=None,
                        help='checks filter, when not specified, use clang-tidy '
diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff
index a6132063..b834691c 100644
--- a/debian/patches/fix-scan-view-path.diff
+++ b/debian/patches/fix-scan-view-path.diff
@@ -1,12 +1,12 @@
-Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-view/bin/scan-view
+--- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-view/bin/scan-view
 @@ -28,6 +28,7 @@ kDefaultPort = 8181
  kMaxPortsToTry = 100
  
  ###
-+BASE_DIR = '/usr/share/clang/scan-view-12'
++BASE_DIR = '/usr/share/clang/scan-view-13'
  
  
  def url_is_up(url):
diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff
index 4af626e2..edeb25e3 100644
--- a/debian/patches/lldb-libname.diff
+++ b/debian/patches/lldb-libname.diff
@@ -2,16 +2,16 @@
  lldb/scripts/Python/finishSwigPythonLLDB.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_12~svn3312515/lldb/scripts/Python/finishSwigPythonLLDB.py
+Index: llvm-toolchain-snapshot_13~svn3313515/lldb/scripts/Python/finishSwigPythonLLDB.py
 ===================================================================
---- llvm-toolchain-snapshot_12~svn3312515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
-+++ llvm-toolchain-snapshot_12~svn3312515/lldb/scripts/Python/finishSwigPythonLLDB.py
+--- llvm-toolchain-snapshot_13~svn3313515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
++++ llvm-toolchain-snapshot_13~svn3313515/lldb/scripts/Python/finishSwigPythonLLDB.py
 @@ -443,7 +443,7 @@ def make_symlink_liblldb(
              if eOSType == utilsOsType.EnumOsType.Darwin:
                  strLibFileExtn = ".dylib"
              else:
 -                strLibFileExtn = ".so"
-+                strLibFileExtn = "-12.so"
++                strLibFileExtn = "-13.so"
              strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
  
      bOk, strErrMsg = make_symlink(
diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
index 9313692b..66694a04 100644
--- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
+++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
@@ -12,10 +12,10 @@ which could then break something else.
 
 This probably should have upstream bug but I couldn't find any existing report.
 
-Index: llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+Index: llvm-toolchain-snapshot_13~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 ===================================================================
---- llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-+++ llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+--- llvm-toolchain-snapshot_13~++20201021041841+fa5fa63fd14.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
++++ llvm-toolchain-snapshot_13~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 @@ -35,6 +35,7 @@
  #include "lldb/Utility/StreamString.h"
  #include "llvm/ADT/SmallString.h"
diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff
index 0cd1ec91..8dc00a73 100644
--- a/debian/patches/python-clangpath.diff
+++ b/debian/patches/python-clangpath.diff
@@ -2,16 +2,16 @@
  clang/bindings/python/clang/cindex.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/bindings/python/clang/cindex.py
+Index: llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/bindings/python/clang/cindex.py
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/bindings/python/clang/cindex.py
-+++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/bindings/python/clang/cindex.py
+--- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/bindings/python/clang/cindex.py
++++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/bindings/python/clang/cindex.py
 @@ -4160,7 +4160,7 @@ class Config(object):
          elif name == 'Windows':
              file = 'libclang.dll'
          else:
 -            file = 'libclang.so'
-+            file = 'libclang-12.so'
++            file = 'libclang-13.so'
  
          if Config.library_path:
              file = Config.library_path + '/' + file
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 0570826e..2f7ed26e 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -2,16 +2,16 @@
  clang/tools/scan-build/bin/scan-build |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/bin/scan-build
+Index: llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-build/bin/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/tools/scan-build/bin/scan-build
-+++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/bin/scan-build
+--- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/tools/scan-build/bin/scan-build
++++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-build/bin/scan-build
 @@ -1478,7 +1478,7 @@ sub FindClang {
    if (!defined $Options{AnalyzerDiscoveryMethod}) {
      $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
      if (!defined $Clang || ! -x $Clang) {
 -      $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
-+      $Clang = Cwd::realpath("/usr/lib/llvm-12/bin/clang");
++      $Clang = Cwd::realpath("/usr/lib/llvm-13/bin/clang");
        if (!defined $Clang || ! -x $Clang) {
          # When an Xcode toolchain is present, look for a clang in the sibling bin
          # of the parent of the bin directory. So if scan-build is at
diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh
index 92099782..9e8a74cd 100644
--- a/debian/prepare-new-release.sh
+++ b/debian/prepare-new-release.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-ORIG_VERSION=11
-TARGET_VERSION=12
-ORIG_VERSION_2=11_0
-TARGET_VERSION_2=12_0
-ORIG_VERSION_3=110
-TARGET_VERSION_3=120
+ORIG_VERSION=12
+TARGET_VERSION=13
+ORIG_VERSION_2=12_0
+TARGET_VERSION_2=13_0
+ORIG_VERSION_3=120
+TARGET_VERSION_3=130
 
 LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/unpack.sh debian/tests/cmake-test`
 for F in $LIST; do
diff --git a/debian/tests/cmake-test b/debian/tests/cmake-test
index c44681c6..34e13a2c 100755
--- a/debian/tests/cmake-test
+++ b/debian/tests/cmake-test
@@ -2,7 +2,7 @@
 
 set -e
 
-LLVM_VERSION=12
+LLVM_VERSION=13
 
 # this is taken from libjsoncpp package
 # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we
diff --git a/debian/tests/control b/debian/tests/control
index 3082f0fa..3d98786d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,7 +2,7 @@ Test-Command: bash -v ./debian/qualify-clang.sh
 Depends: @, cmake, make, g++, file, dpkg-dev, binfmt-support
 # Comment the dbgsym package because of bug #917528
 # dbgsym packages not being available in testing
-# clang-12-dbgsym, libclang1-12-dbgsym
+# clang-13-dbgsym, libclang1-13-dbgsym
 Restrictions: allow-stderr
 
 Tests: integration-test-suite-test
@@ -10,10 +10,10 @@ Depends: @, cmake, make, g++, libstdc++-10-dev
 Restrictions: allow-stderr
 
 Tests: cmake-test
-Depends: gcc, build-essential, cmake, llvm-12-dev, libclang-common-12-dev
+Depends: gcc, build-essential, cmake, llvm-13-dev, libclang-common-13-dev
 
 Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)"
-Depends: python3-lldb-12
+Depends: python3-lldb-13
 
 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)"
-Depends: python3-clang-12
+Depends: python3-clang-13
diff --git a/debian/unpack.sh b/debian/unpack.sh
index 5af2885a..b039843a 100644
--- a/debian/unpack.sh
+++ b/debian/unpack.sh
@@ -1,6 +1,6 @@
 set -e
 ORIG_VERSION=snapshot
-MAJOR_VERSION=12 # 8.0.1
+MAJOR_VERSION=13 # 8.0.1
 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;'  | sort -ru`
 
 VERSION=$REV