diff --git a/debian/changelog b/debian/changelog
index 9fc11ff3..2ad12d2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 llvm-toolchain-12 (1:12.0.1-7) UNRELEASED; urgency=medium
 
-  *  cmake: use ON instead of YES for consistency
+  * 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
 
   [  Gianfranco Costamagna ]
   * Add a patch to fix omp build on riscv64
diff --git a/debian/rules b/debian/rules
index 948f55b9..ced0e90d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -205,7 +205,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel hurd-i386 powerpc))
   LIBUNWIND_ENABLE=no
 else
   PROJECTS+=;libunwind
-  CMAKE_LIBCXX_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON
+  CMAKE_LIBCXX_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON \
+	-DDLIBCXXABI_ENABLE_STATIC_UNWINDER=ON \
+	-DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF \
+	-DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON
 endif
 
 RUN_TEST=yes