diff --git a/debian/changelog b/debian/changelog
index 51e1b383..1f9ef4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ llvm-toolchain-snapshot (1:4.0~svn288822-1~exp1) experimental; urgency=medium
   * New snapshot release
   * d/p/kfreebsd-support.diff removed (applied upstream)
   * debian/orig-tar.sh: less verbose
+  * d/p/lldb-missing-install.diff: For the install
+    of lldb-server and lldb-argdumper as they are not always installed
   * Ship new binary in clang-X.Y: clang-import-test
   * New symbols in libclang1:
     - clang_EvalResult_getAsLongLong
diff --git a/debian/patches/lldb-missing-install.diff b/debian/patches/lldb-missing-install.diff
new file mode 100644
index 00000000..14d10b62
--- /dev/null
+++ b/debian/patches/lldb-missing-install.diff
@@ -0,0 +1,22 @@
+Index: llvm-toolchain-snapshot-4.0~svn290518/lldb/tools/argdumper/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot-4.0~svn290518.orig/lldb/tools/argdumper/CMakeLists.txt
++++ llvm-toolchain-snapshot-4.0~svn290518/lldb/tools/argdumper/CMakeLists.txt
+@@ -11,3 +11,5 @@ else()
+ endif()
+ llvm_config(lldb-argdumper ${LLVM_LINK_COMPONENTS})
+ 
++install(TARGETS lldb-argdumper
++  RUNTIME DESTINATION bin)
+Index: llvm-toolchain-snapshot-4.0~svn290518/lldb/tools/lldb-server/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot-4.0~svn290518.orig/lldb/tools/lldb-server/CMakeLists.txt
++++ llvm-toolchain-snapshot-4.0~svn290518/lldb/tools/lldb-server/CMakeLists.txt
+@@ -188,3 +188,7 @@ llvm_config(lldb-server ${LLVM_LINK_COMP
+ target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})
+ 
+ set_target_properties(lldb-server PROPERTIES VERSION ${LLDB_VERSION})
++
++install(TARGETS lldb-server
++  RUNTIME DESTINATION bin)
++
diff --git a/debian/patches/series b/debian/patches/series
index caa03b01..59816601 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ fix-scan-view-path.diff
 #0011-SimplifyCFG-Hoisting-invalidates-metadata.patch
 clang-fix-cmpxchg8-detection-on-i386.patch
 lldb-addversion-suffix-to-llvm-server-exec.patch
+lldb-missing-install.diff