diff --git a/debian/changelog b/debian/changelog
index f45f71d5..bcb59c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -401,7 +401,7 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium
 
 llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium
 
-  * New uptsream release
+  * New upstream release
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 09 Jul 2021 09:13:12 +0200
 
@@ -686,12 +686,35 @@ llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 08 Jul 2020 15:19:14 +0200
 
-llvm-toolchain-11 (1:11.1.0-1~exp3) UNRELEASED; urgency=medium
+llvm-toolchain-11 (1:11.1.0-3) unstable; urgency=medium
 
+  * Add two patches from ubuntu to fix lto and gcc-11 build failures
+  * Use minimum version for cmake-test
+  * Don't require libclang-11-dev on cmake-test
+  * Add new llvm-11-linker-tools (from Ubuntu)
+  * Merge new fixes from branch=9
+  * clang-11: Drop Recommends: libomp-11-dev
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 27 Sep 2021 15:50:46 +0200
+
+llvm-toolchain-11 (1:11.1.0-2) unstable; urgency=medium
+
+  * Ajust the cmake test to unbreak autopkgtest
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 26 Sep 2021 22:02:43 +0200
+
+llvm-toolchain-11 (1:11.1.0-1) unstable; urgency=medium
+
+  [ Sylvestre Ledru ]
+  * Upload to unstable
+  * bump autopkgtest cmake version (Closes: #994501)
+    Thanks to Timo Röhling for the patch
+
+  [ Gianfranco Costamagna ]
   * Cherry-pick upstream commit to fix a libgl1-mesa-dri texture failure.
     (Closes: #989545)
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 01 Sep 2021 12:24:34 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 24 Sep 2021 12:54:55 +0200
 
 llvm-toolchain-11 (1:11.1.0-1~exp2) experimental; urgency=medium
 
@@ -773,6 +796,41 @@ llvm-toolchain-11 (1:11.0.1~+rc1-1~exp1) experimental; urgency=medium
 
 llvm-toolchain-11 (1:11.0.0-5) unstable; urgency=medium
 
+llvm-toolchain-9 (1:9.0.1-19) unstable; urgency=medium
+
+  * Add two patches from ubuntu to fix lto and gcc-11 build failures
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 27 Sep 2021 15:39:19 +0200
+
+llvm-toolchain-9 (1:9.0.1-18) unstable; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Cherry-pick nmu again. (version 16.1)
+  * bump minimum cmake version on qualify-clang.sh too
+  * simplify cmake test without minor version
+  [ Andreas Beckmann <anbe@debian.org> ]
+  * clang-9: Drop Recommends: libomp-9-dev which is not co-installable with
+    libomp-11-dev (and libomp-dev) for smoother upgrades of libomp-dev from
+    buster to bullseye.  (Closes: #990452)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 27 Sep 2021 15:02:13 +0200
+
+llvm-toolchain-9 (1:9.0.1-17) unstable; urgency=medium
+
+  * Remove an old breaks/replaces for 9 which was causing
+    some issues on Debian buster. Thanks to Julien Wajsberg
+    for the bug report
+  * bump autopkgtest cmake version (Closes: #994501)
+    Thanks to Timo Röhling for the patch
+  * cherry pick 68d5235cb58f988c71b403334cd9482d663841ab to build
+    with newer version of the kernel
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 25 Sep 2021 16:00:36 +0200
+
+llvm-toolchain-9 (1:9.0.1-16) unstable; urgency=medium
+
+  * Only enable libomp-9-doc on supported archs
+
   [ Adrian Bunk ]
   * Fix the fuzzer build on i386.
 
@@ -1566,9 +1624,9 @@ llvm-toolchain-9 (1:9.0.1-13) unstable; urgency=medium
 
 llvm-toolchain-9 (1:9.0.1-12) unstable; urgency=medium
 
+  [ Jessica Clarke ]
   * Cherry-pick upstream patch D74453 to fix atomic compare-and-swap on
     riscv64.
-    riscv64.
 
   [ William Grant ]
   * debian/patches/riscv64-multilib-empty.patch: Adjust riscv64 GCC detector
diff --git a/debian/control b/debian/control
index e6e9037b..5df78d2f 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang-common-14-dev (= ${binary:Version}),
  libclang1-14 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
-Recommends: llvm-14-dev, python3, libomp-14-dev
+Recommends: llvm-14-dev, python3
+# libomp-14-dev
 Suggests: clang-14-doc
 Description: C, C++ and Objective-C compiler
  Clang project is a C, C++, Objective C and Objective C++ front-end
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 8048eafe..c987bbb3 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -89,7 +89,7 @@ fi
 
 rm -rf cmaketest && mkdir cmaketest
 cat > cmaketest/CMakeLists.txt <<EOF
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.7)
 project(SanityCheck)
 add_library(MyLibrary foo.cpp)
 EOF
@@ -248,7 +248,7 @@ echo '{
 
 rm -rf cmaketest && mkdir cmaketest
 cat > cmaketest/CMakeLists.txt <<EOF
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.7)
 project(SanityCheck)
 add_library(MyLibrary foo.cpp)
 EOF
@@ -1378,7 +1378,7 @@ fi
 
 rm -rf cmaketest && mkdir cmaketest
 cat > cmaketest/CMakeLists.txt <<EOF
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.7)
 project(SanityCheck)
 find_package(LLVM $VERSION REQUIRED CONFIG)
 message(STATUS "LLVM_CMAKE_DIR: \${LLVM_CMAKE_DIR}")
@@ -1403,7 +1403,7 @@ rm -rf cmaketest
 # Test case for bug #900440
 rm -rf cmaketest && mkdir cmaketest
 cat > cmaketest/CMakeLists.txt <<EOF
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.7)
 project(testllvm)
 
 find_package(LLVM CONFIG REQUIRED)
diff --git a/debian/rules b/debian/rules
index c2f287a7..648b95e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -538,13 +538,13 @@ build_doc:
 	cd $(CURDIR)/llvm/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
 	cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
 	-(if test "$(OCAML_ENABLE)" = yes; then \
-	ninja -C "$(TARGET_BUILD_STAGE2)" ocaml_doc; \
+	ninja -C "$(TARGET_BUILD_STAGE2)" ocaml_doc $(VERBOSE); \
 	fi)
 
-	ninja -C $(TARGET_BUILD_STAGE2) docs-llvm-html docs-clang-html docs-clang-tools-html docs-clang-tools-man docs-clang-man docs-llvm-man
+	ninja -C $(TARGET_BUILD_STAGE2) docs-llvm-html docs-clang-html docs-clang-tools-html docs-clang-tools-man docs-clang-man docs-llvm-man $(VERBOSE)
 
 ifeq (${POLLY_ENABLE},yes)
-	ninja -C $(TARGET_BUILD_STAGE2) docs-polly-html docs-polly-man
+	ninja -C $(TARGET_BUILD_STAGE2) docs-polly-html docs-polly-man $(VERBOSE)
 endif
 
 # Rename manpages
@@ -661,7 +661,9 @@ endif
 	rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/__pycache__/ \
 	$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/*/__pycache__/
 
-	DESTDIR=$(DEB_INST) ninja -C libclc/build install
+	DESTDIR=$(DEB_INST) ninja -C libcxxabi/build install $(VERBOSE)
+	DESTDIR=$(DEB_INST) ninja -C libcxx/build install $(VERBOSE)
+	DESTDIR=$(DEB_INST) ninja -C libclc/build install $(VERBOSE)
 
 # Rename binaries
 	mkdir -p $(DEB_INST)/usr/bin/
diff --git a/debian/tests/cmake-test b/debian/tests/cmake-test
index 5aac605b..24fa6f74 100755
--- a/debian/tests/cmake-test
+++ b/debian/tests/cmake-test
@@ -18,7 +18,7 @@ fi
 
 cd "$AUTOPKGTEST_TMP"
 cat <<EOF > CMakeLists.txt
-cmake_minimum_required(VERSION 2.6.2)
+cmake_minimum_required(VERSION 3.7)
 project(cmake-test)
 find_package(LLVM $LLVM_VERSION REQUIRED
   COMPONENTS
diff --git a/debian/tests/control b/debian/tests/control
index b0dcd1cb..04df670e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -10,7 +10,7 @@ Depends: @, cmake, make, g++, libstdc++-10-dev
 Restrictions: allow-stderr
 
 Tests: cmake-test
-Depends: gcc, build-essential, cmake, llvm-14-dev, libclang-common-14-dev
+Depends: gcc, build-essential, cmake, llvm-14-dev
 
 Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)"
 Depends: python3-lldb-14