diff --git a/debian/changelog b/debian/changelog
index 3e249bc4..c15b3c44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:3.7~svn229332-1~exp1) experimental; urgency=medium
   * New snapshot release
   * Support of gcc 5.0 (Closes: #777988)
   * compiler-rt-i586.diff: fix a build issue of compiler-rt under i386
+  * lldb-gdbserver & lldb-platform have been merged into lldb-server
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 15 Feb 2015 22:22:15 +0100
 
diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in
index f4d27dc6..8f865554 100644
--- a/debian/lldb-X.Y.install.in
+++ b/debian/lldb-X.Y.install.in
@@ -1,9 +1,7 @@
 usr/bin/lldb-@LLVM_VERSION@
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb
-usr/lib/llvm-@LLVM_VERSION@/bin/lldb-platform
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi
-usr/lib/llvm-@LLVM_VERSION@/bin/lldb-gdbserver
+usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server
 
-usr/bin/lldb-platform-@LLVM_VERSION@
-usr/bin/lldb-gdbserver-@LLVM_VERSION@
+usr/bin/lldb-server-@LLVM_VERSION@
 usr/bin/lldb-mi-@LLVM_VERSION@