diff --git a/debian/changelog b/debian/changelog
index 42a00c5a..fc1a11d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ llvm-toolchain-3.8 (1:3.8.1-17) unstable; urgency=medium
 
   * Disable NEON generation on armhf (Closes: #841474, #842142)
     Thanks to Pauli for the fix
+  * Remove the info section from the generated manpages (Closes: #846269)
+  * Fix the path to lldb-server (to lldb-server-3.8) (Closes: #846638)
+  * Also install python-lldb-3.8 when installing lldb-3.8 (Closes: #846612)
+  * Disable libedit usage in lldb because of garbage (Closes: #846616)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 13 Nov 2016 13:38:01 +0100
 
diff --git a/debian/control b/debian/control
index 66c2dd35..8e0120df 100644
--- a/debian/control
+++ b/debian/control
@@ -397,8 +397,8 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lldb-3.8
 Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel arm64
 # ia64 hurd powerpc ppc64el sparc64  ppc64  mips64el  have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), llvm-3.8-dev
-Suggests: python-lldb-3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), llvm-3.8-dev,
+ python-lldb-3.8
 Conflicts: lldb-3.4, lldb-3.5
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
diff --git a/debian/patches/lldb-server-path.diff b/debian/patches/lldb-server-path.diff
new file mode 100644
index 00000000..d7480b4e
--- /dev/null
+++ b/debian/patches/lldb-server-path.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-3.8-3.8.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+===================================================================
+--- llvm-toolchain-3.8-3.8.1.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
++++ llvm-toolchain-3.8-3.8.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+@@ -40,7 +40,7 @@
+ #if defined(__APPLE__)
+ # define DEBUGSERVER_BASENAME    "debugserver"
+ #else
+-# define DEBUGSERVER_BASENAME    "lldb-server"
++# define DEBUGSERVER_BASENAME    "lldb-server-3.8"
+ #endif
+ 
+ #if defined (HAVE_LIBCOMPRESSION)
diff --git a/debian/patches/series b/debian/patches/series
index 3c9c20fa..85c9ee10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,3 +54,4 @@ upstream-msan-prevent-initialization-failure.diff
 upstream-asan-msan-fix-reallocation-logic.diff
 lit-force-lang.diff
 clang-arm-default-vfp3-on-armv7a.patch
+lldb-server-path.diff
diff --git a/debian/rules b/debian/rules
index e55634c5..1dd3be8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,7 +130,10 @@ LLDB_DISABLE_ARCHS := hurd-i386 ia64 ppc64el powerpc s390x sparc64 ppc64 mips64e
 # hurd has threading issues
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.
-		LLDB_ENABLE=no
+	LLDB_ENABLE=no
+else
+# See https://llvm.org/bugs/show_bug.cgi?id=28898
+	CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON
 endif
 
 
@@ -297,13 +300,13 @@ build_doc:
 		cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js; \
 	done
 
-	help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
-	help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
+	help2man --version-string=$(LLVM_VERSION) --no-info clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
+	help2man --version-string=$(LLVM_VERSION) --no-info clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
 
 	CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements git-clang-format pp-trace sancov lli"; \
 	for f in $$CMDS; do \
 		echo "Generating manpage of $$f"; \
-		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-discard-stderr --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/$(BUILD_DIR)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
+		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-discard-stderr --version-string=$(LLVM_VERSION) --no-info $(TARGET_BUILD)/$(BUILD_DIR)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
 	done
 
 override_dh_auto_install: