diff --git a/debian/changelog b/debian/changelog
index e1b6799d..a034df71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,9 @@
 llvm-toolchain-snapshot (1:4.0~svn275970-1~exp1) experimental; urgency=medium
 
   * New snapshot release
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Jul 2016 14:26:05 +0200
-
-llvm-toolchain-snapshot (1:3.9~svn275968-1~exp1) experimental; urgency=medium
-
-  * New snapshot release
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Jul 2016 13:21:22 +0200
-
-llvm-toolchain-snapshot (1:3.9~svn275597-1~exp2) UNRELEASED; urgency=medium
-
+  * Bring back llvm-4.0-tools to life
+  * ship clang-tblgen & yaml-bench as part of the libclang-common-X.Y-dev
+    package
   * Silent test CodeGen/SPARC/LeonInsertNOPsDoublePrecision.ll
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 15 Jul 2016 21:29:38 +0200
diff --git a/debian/control b/debian/control
index 7f56283a..c5029ac4 100644
--- a/debian/control
+++ b/debian/control
@@ -288,6 +288,25 @@ Description: Modular compiler and toolchain technologies, libraries and headers
  This package provides the libraries and headers to develop applications
  using llvm.
 
+Package: llvm-4.0-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+ llvm-4.0-dev (= ${binary:Version})
+Description: Modular compiler and toolchain technologies, tools
+ LLVM is a collection of libraries and tools that make it easy to build
+ compilers, optimizers, just-in-time code generators, and many other
+ compiler-related programs.
+ .
+ LLVM uses a single, language-independent virtual instruction set both
+ as an offline code representation (to communicate code between
+ compiler phases and to run-time systems) and as the compiler internal
+ representation (to analyze and transform programs). This persistent
+ code representation allows a common set of sophisticated compiler
+ techniques to be applied at compile-time, link-time, install-time,
+ run-time, or "idle-time" (between program runs).
+ .
+ This package provides tools for testing.
+
 Package: libllvm-4.0-ocaml-dev
 Section: ocaml
 Architecture: any
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index ba08e70c..3d9d13ef 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -5,3 +5,10 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/*.txt
 
 #usr/lib/clang/@LLVM_VERSION_FULL@/lib             /usr/lib/clang/@LLVM_VERSION@/
 #usr/lib/clang/@LLVM_VERSION_FULL@/include/         /usr/include/clang/@LLVM_VERSION@/
+
+usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen
+usr/lib/llvm-@LLVM_VERSION@/bin/yaml-bench
+
+usr/bin/clang-tblgen-@LLVM_VERSION@
+usr/bin/yaml-bench-@LLVM_VERSION@
+
diff --git a/debian/llvm-X.Y-tools.dirs.in b/debian/llvm-X.Y-tools.dirs.in
new file mode 100644
index 00000000..401df068
--- /dev/null
+++ b/debian/llvm-X.Y-tools.dirs.in
@@ -0,0 +1,2 @@
+/usr/lib/llvm-@LLVM_VERSION@/build/unittests
+/usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/
diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in
new file mode 100644
index 00000000..db5574f7
--- /dev/null
+++ b/debian/llvm-X.Y-tools.install.in
@@ -0,0 +1,9 @@
+usr/lib/llvm-@LLVM_VERSION@/bin/count
+usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck
+usr/lib/llvm-@LLVM_VERSION@/bin/not
+
+utils/lit/*             /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/
+
+usr/bin/count-@LLVM_VERSION@
+usr/bin/FileCheck-@LLVM_VERSION@
+usr/bin/not-@LLVM_VERSION@
diff --git a/debian/rules b/debian/rules
index 8e6590aa..195ea431 100755
--- a/debian/rules
+++ b/debian/rules
@@ -214,6 +214,7 @@ override_dh_auto_configure: preconfigure
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_CXX_FLAGS='$(CXXFLAGS_EXTRA)' \
 	-DLLVM_LINK_LLVM_DYLIB=ON \
+	-DLLVM_INSTALL_UTILS=ON \
 	-DLLVM_VERSION_SUFFIX= \
 	-DLLVM_ENABLE_SPHINX=ON \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
@@ -306,10 +307,6 @@ override_dh_auto_install:
 	mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \
 	   $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang
 
-# internal tools, don't care
-	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/count
-	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/not
-	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/FileCheck
 # Don't think it is used
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly*a
 # Probably useless