diff --git a/debian/changelog b/debian/changelog
index 252d23fe..6c526a59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 llvm-toolchain-snapshot (1:4.0~svn275971-1~exp1) experimental; urgency=medium
 
+  * Introduce clang-include-fixer-4.0
   * 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/control b/debian/control
index 63e8cbe3..3ab0d4db 100644
--- a/debian/control
+++ b/debian/control
@@ -67,6 +67,13 @@ Description: clang-based C++ linter tool
  via static analysis. clang-tidy is modular and provides a convenient interface
  for writing new checks.
 
+Package: clang-include-fixer-4.0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python
+Description: clang-based C/C++ include fixer
+ Provide automated way of adding #include directives for missing symbols in one
+ translation unit.
+
 
 Package: clang-4.0-doc
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 88708f52..88df88d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -274,7 +274,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 lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize"; \
+	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 clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols"; \
 	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) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \