diff --git a/debian/changelog b/debian/changelog
index a9ef75eb..2154601a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ llvm-toolchain-snapshot (1:4.0~svn279916-2) UNRELEASED; urgency=medium
     for real
   * Also ship clang-reorder-fields as part of the clang-4.0 package
   * Build lldb on arm64. Hopefully, works.
+  * Tentative fix for lldb-server build
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 27 Aug 2016 20:15:58 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 09 Sep 2016 19:11:37 +0200
 
 llvm-toolchain-snapshot (1:4.0~svn279916-1) unstable; urgency=medium
 
diff --git a/debian/patches/fix-lldb-server-build b/debian/patches/fix-lldb-server-build
new file mode 100644
index 00000000..f8ed5b59
--- /dev/null
+++ b/debian/patches/fix-lldb-server-build
@@ -0,0 +1,11 @@
+--- a/cmake/modules/AddLLVM.cmake
++++ b/cmake/modules/AddLLVM.cmake
+@@ -486,7 +486,7 @@
+     # On DLL platforms symbols are imported from the tool by linking against it.
+     set(llvm_libs ${ARG_PLUGIN_TOOL})
+   elseif (DEFINED LLVM_LINK_COMPONENTS OR DEFINED ARG_LINK_COMPONENTS)
+-    if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
++    if (NOT ARG_STATIC AND LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
+       set(llvm_libs LLVM)
+     else()
+       llvm_map_components_to_libnames(llvm_libs
diff --git a/debian/patches/series b/debian/patches/series
index 61211408..934f9efc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@ disable-source-interleave.diff
 silent-gold-utils.diff
 disable-llvm-symbolizer-test.diff
 kfreebsd-support.diff
+fix-lldb-server-build