diff --git a/debian/changelog b/debian/changelog
index aa65d24c..d787e3e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ llvm-toolchain-4.0 (1:4.0.1~+rc3-2) unstable; urgency=medium
     to avoid the recurring problem about conflicts
     (Closes: #835546, #863739, #863742)
   * Standards-Version => 4.0.0
-  * Generate the llvm-tblgen & lld manpages
+  * Generate the llvm-tblgen, clang-change-namespace, clang-offload-bundler
+    lld, clang++, clang-check, clang-cpp & clang-import-test manpages
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 14 Jun 2017 19:06:20 +0200
 
diff --git a/debian/liblld-X.Y.install.in b/debian/liblld-X.Y.install.in
index 475da624..9e815c20 100644
--- a/debian/liblld-X.Y.install.in
+++ b/debian/liblld-X.Y.install.in
@@ -7,4 +7,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/liblldELF.a
 usr/lib/llvm-@LLVM_VERSION@/lib/liblldCore.a
 usr/lib/llvm-@LLVM_VERSION@/lib/liblldMachO.a
 usr/lib/llvm-@LLVM_VERSION@/lib/liblldCOFF.a
-
diff --git a/debian/rules b/debian/rules
index 080461fe..9b9abd1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -317,7 +317,7 @@ build_doc:
 	help2man --version-string=$(LLVM_VERSION) --no-discard-stderr clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
 	help2man --version-string=$(LLVM_VERSION) --no-discard-stderr 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-check clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields ld.lld llvm-tblgen"; \
+	CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang++ clang-check clang-cpp clang-import-test clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields ld.lld llvm-tblgen clang-change-namespace clang-offload-bundler"; \
 	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 --version-string=$(LLVM_VERSION) --no-discard-stderr $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \