diff --git a/debian/clang-format-X.Y.manpages.in b/debian/clang-format-X.Y.manpages.in
index 486b909d..27cf9348 100644
--- a/debian/clang-format-X.Y.manpages.in
+++ b/debian/clang-format-X.Y.manpages.in
@@ -1,2 +1,3 @@
 debian/man/clang-format-diff-@LLVM_VERSION@.1
 debian/man/clang-format-@LLVM_VERSION@.1
+debian/man/git-clang-format-@LLVM_VERSION@.1
diff --git a/debian/lldb-X.Y.manpages.in b/debian/lldb-X.Y.manpages.in
index 22dbbbcb..36a62aea 100644
--- a/debian/lldb-X.Y.manpages.in
+++ b/debian/lldb-X.Y.manpages.in
@@ -1,2 +1,2 @@
 debian/man/lldb-@LLVM_VERSION@.1
-
+debian/man/lldb-mi-@LLVM_VERSION@.1
diff --git a/debian/llvm-X.Y-runtime.manpages.in b/debian/llvm-X.Y-runtime.manpages.in
index 0f0bf921..839952d0 100644
--- a/debian/llvm-X.Y-runtime.manpages.in
+++ b/debian/llvm-X.Y-runtime.manpages.in
@@ -1,2 +1 @@
-docs/_build/man/lli*
-
+debian/man/lli*
diff --git a/debian/rules b/debian/rules
index 0c80bfbc..9179cc12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -264,7 +264,7 @@ build_doc:
 	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
 
-	CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements pp-trace sancov lli"; \
+	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)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \