diff --git a/debian/changelog b/debian/changelog
index 2bbb607b..0c5a7590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -149,6 +149,18 @@ llvm-toolchain-12 (1:12.0.1-7) UNRELEASED; urgency=medium
 
   [  Gianfranco Costamagna ]
   * Add a patch to fix omp build on riscv64
+  * cmake: use ON instead of YES for consistency
+  * Add LIBCXXABI_ENABLE_STATIC_UNWINDER=ON
+    LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF
+    LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON
+    to libc++ when libunwind is built
+    Matches what is done on brew:
+    https://bit.ly/3kDNpC9
+  * Don't generate the llvm-mcmarkup & lldb-mi manpages (don't exist anymore)
+    (LP: #1940713)
+
+  [  Gianfranco Costamagna ]
+  * Add a patch to fix omp build on riscv64
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 29 Aug 2021 15:15:18 +0200
 
diff --git a/debian/rules b/debian/rules
index 658eb4e0..43d79283 100755
--- a/debian/rules
+++ b/debian/rules
@@ -601,7 +601,7 @@ endif
 	help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 || true
 	help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 || true
 
-	CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang++ clang-tblgen clang-check clang-cpp clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields ld.lld llvm-tblgen clang-change-namespace clang-offload-bundler clangd"; \
+	CMDS="llvm-dwarfdump llvm-mc llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb clang-format clang clang++ clang-tblgen clang-check clang-cpp clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields ld.lld llvm-tblgen clang-change-namespace clang-offload-bundler clangd"; \
 	for f in $$CMDS; do \
 		echo "Generating manpage of $$f"; \
 		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD_STAGE2)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1 || true; \