diff --git a/debian/changelog b/debian/changelog
index 09815cd2..f07a244e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,6 +91,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.
 
@@ -869,9 +904,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 ef4be0c2..7586ddc0 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  llvm-11-linker-tools (= ${binary:Version}),
  libclang1-11 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
-Recommends: llvm-11-dev, python3, libomp-11-dev
+Recommends: llvm-11-dev, python3
+# libomp-11-dev
 Suggests: clang-11-doc
 Description: C, C++ and Objective-C compiler
  Clang project is a C, C++, Objective C and Objective C++ front-end