diff --git a/debian/changelog b/debian/changelog
index 91dcb198..9cf21995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 llvm-toolchain-snapshot (1:4.0~svn275971-1) unstable; urgency=medium
 
   * Introduce clang-include-fixer-4.0
+  * Fix the renaming of the manpages (Closes: #834077)
+  * Use the manpage from clang.rst instead of help2man
   * Disable the build of lldb on mips64el, ppc64 and s390x for real
   * Add symlink from ./build to ../share and ../lib etc
     Thanks to Ximin Luo for the patch (Closes: #834144)
diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in
index a7215f7c..ef0d30e9 100644
--- a/debian/clang-X.Y.manpages.in
+++ b/debian/clang-X.Y.manpages.in
@@ -1,4 +1,5 @@
-debian/man/clang-@LLVM_VERSION@.1
+clang/docs/_build/man/clang-@LLVM_VERSION@.1
+clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1
 debian/man/clang-check-@LLVM_VERSION@.1
 debian/man/clang-rename-@LLVM_VERSION@.1
 debian/man/clang-query-@LLVM_VERSION@.1
@@ -6,4 +7,4 @@ debian/man/clang-apply-replacements-@LLVM_VERSION@.1
 debian/man/sancov-@LLVM_VERSION@.1
 debian/man/scan-view-@LLVM_VERSION@.1
 debian/man/modularize-@LLVM_VERSION@.1
-clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1
+
diff --git a/debian/patches/silent-symbolizer.diff b/debian/patches/disable-llvm-symbolizer-test.diff
similarity index 69%
rename from debian/patches/silent-symbolizer.diff
rename to debian/patches/disable-llvm-symbolizer-test.diff
index 908c0afa..f9491690 100644
--- a/debian/patches/silent-symbolizer.diff
+++ b/debian/patches/disable-llvm-symbolizer-test.diff
@@ -11,15 +11,16 @@ Description: Silent a test failing on yakkety amd64
 Author: Sylvestre <sylvestre@debian.org>
 Last-Update: 2016-08-26
 
-Index: llvm-toolchain-snapshot_4.0~svn279658/test/tools/llvm-symbolizer/print_context.c
+Index: llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279658.orig/test/tools/llvm-symbolizer/print_context.c
-+++ llvm-toolchain-snapshot_4.0~svn279658/test/tools/llvm-symbolizer/print_context.c
-@@ -1,6 +1,7 @@
+--- llvm-toolchain-3.9-3.9~+rc1.orig/test/tools/llvm-symbolizer/print_context.c
++++ llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c
+@@ -1,7 +1,7 @@
  // REQUIRES: x86_64-linux
  // RUN: %host_cc -O0 -g %s -o %t 2>&1
  // RUN: %t 2>&1 | llvm-symbolizer -print-source-context-lines=5 -obj=%t | FileCheck %s
+-
 +// XFAIL: *
- 
  #include <stdio.h>
  
+ int inc(int a) {
diff --git a/debian/patches/series b/debian/patches/series
index 2c7a6bf1..c276f605 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,4 +32,4 @@ fix-cmake-config-prefix.diff
 lldb-link-atomic-cmake.patch
 disable-source-interleave.diff
 silent-gold-utils.diff
-silent-symbolizer.diff
+disable-llvm-symbolizer-test.diff
diff --git a/debian/rules b/debian/rules
index 88df88d1..0358cef6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -254,16 +254,18 @@ build_doc:
 	-(cd $(TARGET_BUILD) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man)
 
 # Rename manpages
-	d=$(TARGET_BUILD)/docs/man/; \
+	d=$(CURDIR)/docs/_build/man/; \
 	if test -d $$d; then \
-	cd $$d; \
-	for f in *.1; do \
-		echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
-	done; \
+		cd $$d; \
+		for f in *.1; do \
+			echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
+		done; \
+	else \
+		echo "could not find $$d"; \
 	fi
 # the clang doc generation only generates clang manpage
 # When it will do more, we should move that in the loop above
-#	cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
+	cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
 
 # Remove the copy of jquery. See bug #701087
 	for d in $(TARGET_BUILD)/docs/html/_static/ $(TARGET_BUILD)/tools/clang/docs/html/_static/ $(TARGET_BUILD)/tools/clang/tools/extra/docs/html/_static/; do \