diff --git a/debian/changelog b/debian/changelog
index aa056eda..22eb2bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-11 (1:11.0.0~+rc2-6) unstable; urgency=medium
+
+  * Fix "libc++-11-dev includes libc++abi-11-dev headers"
+    (Closes: #969274)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 07 Sep 2020 13:32:26 +0200
+
 llvm-toolchain-11 (1:11.0.0~+rc2-5) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
diff --git a/debian/rules b/debian/rules
index 3942feb7..ed476be5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -777,7 +777,8 @@ override_dh_installdeb:
 
 	rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python*-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc
 	rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make*
-
+# Remove some libc++ abi files in the libc++ file. See bug #969274
+	rm -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/c++/__cxxabi_config.h $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/c++/cxxabi.h
 # Remove auto generated python pyc
 	find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f