diff --git a/debian/changelog b/debian/changelog
index fcd9e17d..ce593bd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-9 (1:9~+rc5-1~exp2) experimental; urgency=medium
+
+  * debian/patches/D67877.patch: fix LLVMExports.cmake with upstream-proposed
+    patch (Closes: #941082)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 24 Sep 2019 18:57:31 +0200
+
 llvm-toolchain-9 (1:9~+rc5-1~exp1) experimental; urgency=medium
 
   * New snapshot release
diff --git a/debian/patches/D67877.patch b/debian/patches/D67877.patch
new file mode 100644
index 00000000..46833b1f
--- /dev/null
+++ b/debian/patches/D67877.patch
@@ -0,0 +1,38 @@
+Origin: https://reviews.llvm.org/D67877
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941082
+
+Index: llvm-toolchain-9-9~+rc5/clang/lib/Analysis/plugins/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-9-9~+rc5.orig/clang/lib/Analysis/plugins/CMakeLists.txt
++++ llvm-toolchain-9-9~+rc5/clang/lib/Analysis/plugins/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS)
++if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS AND CLANG_BUILD_EXAMPLES)
+   add_subdirectory(SampleAnalyzer)
+   add_subdirectory(CheckerDependencyHandling)
+   add_subdirectory(CheckerOptionHandling)
+Index: llvm-toolchain-9-9~+rc5/clang/test/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-9-9~+rc5.orig/clang/test/CMakeLists.txt
++++ llvm-toolchain-9-9~+rc5/clang/test/CMakeLists.txt
+@@ -123,14 +123,12 @@
+   endif()
+ endif()
+ 
+-if (CLANG_ENABLE_STATIC_ANALYZER)
+-  if (LLVM_ENABLE_PLUGINS)
+-    list(APPEND CLANG_TEST_DEPS
+-      SampleAnalyzerPlugin
+-      CheckerDependencyHandlingAnalyzerPlugin
+-      CheckerOptionHandlingAnalyzerPlugin
+-      )
+-  endif()
++if (CLANG_ENABLE_STATIC_ANALYZER AND CLANG_BUILD_EXAMPLES AND LLVM_ENABLE_PLUGINS)
++  list(APPEND CLANG_TEST_DEPS
++    SampleAnalyzerPlugin
++    CheckerDependencyHandlingAnalyzerPlugin
++    CheckerOptionHandlingAnalyzerPlugin
++    )
+ endif()
+ 
+ add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS})
diff --git a/debian/patches/series b/debian/patches/series
index e3c68d60..4b2f3e78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -130,3 +130,4 @@ clang-riscv64-multiarch.diff
 clang-riscv64-rv64gc.diff
 
 #try-to-unbreak-thinlto.diff
+D67877.patch