diff --git a/debian/changelog b/debian/changelog
index 982c4e31..d9108a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-3.9 (1:3.9-2) unstable; urgency=medium
+
+  * Merge clang-include-fixer-3.9 into clang-3.9. Don't think
+    it deserves it own package
+
+ --
+ 
 llvm-toolchain-3.9 (1:3.9-1) unstable; urgency=medium
 
   * New stable release
diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in
index dc97feba..5ed3ee9d 100644
--- a/debian/clang-X.Y.install.in
+++ b/debian/clang-X.Y.install.in
@@ -13,15 +13,18 @@ usr/lib/llvm-@LLVM_VERSION@/share/scan-build/
 usr/lib/llvm-@LLVM_VERSION@/share/man/man1/scan-build.1
 usr/lib/llvm-@LLVM_VERSION@/libexec/ccc-analyzer
 usr/lib/llvm-@LLVM_VERSION@/libexec/c++-analyzer
-
 usr/lib/llvm-@LLVM_VERSION@/bin/modularize
 usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test
+usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-fixer
+usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols
 
 tools/clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 tools/clang/tools/scan-build-py-@LLVM_VERSION@      usr/share/clang/
 tools/clang/tools/scan-view-@LLVM_VERSION@       usr/share/clang/
 #usr/share/man/man1/clang.1     usr/share/man/man1/
 usr/lib/llvm-@LLVM_VERSION@/lib/cmake/clang/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/
+usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py
+usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py
 
 usr/bin/clang-@LLVM_VERSION@
 usr/bin/clang++-@LLVM_VERSION@
@@ -35,3 +38,5 @@ usr/bin/modularize-@LLVM_VERSION@
 usr/bin/scan-build-@LLVM_VERSION@
 usr/bin/scan-view-@LLVM_VERSION@
 usr/bin/c-index-test-@LLVM_VERSION@
+usr/bin/find-all-symbols-@LLVM_VERSION@
+usr/bin/clang-include-fixer-@LLVM_VERSION@
diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in
index d0d85502..5e6881ff 100644
--- a/debian/clang-X.Y.manpages.in
+++ b/debian/clang-X.Y.manpages.in
@@ -7,3 +7,5 @@ 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
+debian/man/find-all-symbols-@LLVM_VERSION@.1
+debian/man/clang-include-fixer-@LLVM_VERSION@.1
diff --git a/debian/clang-include-fixer-X.Y.install.in b/debian/clang-include-fixer-X.Y.install.in
deleted file mode 100644
index d8226a33..00000000
--- a/debian/clang-include-fixer-X.Y.install.in
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/find-all-symbols-@LLVM_VERSION@
-usr/bin/clang-include-fixer-@LLVM_VERSION@
-usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-fixer
-usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols
-usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py
-usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py
diff --git a/debian/clang-include-fixer-X.Y.manpages.in b/debian/clang-include-fixer-X.Y.manpages.in
deleted file mode 100644
index 743c7c59..00000000
--- a/debian/clang-include-fixer-X.Y.manpages.in
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/find-all-symbols-@LLVM_VERSION@.1
-debian/man/clang-include-fixer-@LLVM_VERSION@.1
diff --git a/debian/control b/debian/control
index 0de0b091..0f3aa834 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,11 @@ Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-3.9-dev, python
 Suggests: gnustep, gnustep-devel, clang-3.9-doc
 Replaces: clang-3.1, clang-3.2, clang-3.3,
- clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt
+ clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt,
+ clang-include-fixer-3.9
 Breaks: clang-3.1, clang-3.2, clang-3.3,
- clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt
+ clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt,
+  clang-include-fixer-3.9
 Description: C, C++ and Objective-C compiler (LLVM based)
  Clang project is a C, C++, Objective C and Objective C++ front-end
  for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
@@ -67,14 +69,6 @@ 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-3.9
-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-3.9-doc
 Architecture: all
 Section: doc