diff --git a/debian/changelog b/debian/changelog
index e1add947..7648e5a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-llvm-toolchain-3.8 (1:3.8.1-4) UNRELEASED; urgency=medium
+llvm-toolchain-3.8 (1:3.8.1-4) unstable; urgency=medium
 
   * Fix the FTBFS under mips/mipsel? (enable the link against atomic)
     (Closes: #820537)
+  * Bring back llvm-tools to life
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 03 Jul 2016 12:10:44 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 20 Jul 2016 10:20:46 +0200
 
 llvm-toolchain-3.8 (1:3.8.1-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 7a9d212e..ed825739 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-3.8-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+ llvm-3.8-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-3.8-ocaml-dev
 Section: ocaml
 Architecture: any
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 e3e7e0b4..49ce551b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -242,6 +242,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 \
 		-DLLVM_ENABLE_RTTI=ON \