diff --git a/debian/changelog b/debian/changelog
index b0800555..b12ac40a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ llvm-toolchain-snapshot (1:3.8~svn247576-2) UNRELEASED; urgency=medium
 
   * Ship run-clang-tidy.py & lang-tidy-diff.py
   * Remove macho-dump from LLVM (removed by upstream r248302)
+  * Introduce clang-tidy-3.8 as a separate package. Replaces clang-modernize
+  * Remove cpp11-migrate-3.8 package. Has been replaced by clang-modernize
+    for a while (which will be replaced by clang-tidy)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 21 Sep 2015 13:16:35 +0200
 
diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in
index 3681fc1e..23dc1016 100644
--- a/debian/clang-X.Y.install.in
+++ b/debian/clang-X.Y.install.in
@@ -4,7 +4,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-check
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen
 usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements
-usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy
 usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-query
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename
@@ -22,7 +21,6 @@ usr/bin/clang-check-@LLVM_VERSION@
 usr/bin/clang-tblgen-@LLVM_VERSION@
 usr/bin/c-index-test-@LLVM_VERSION@
 usr/bin/clang-apply-replacements-@LLVM_VERSION@
-usr/bin/clang-tidy-@LLVM_VERSION@
 usr/bin/pp-trace-@LLVM_VERSION@
 usr/bin/clang-query-@LLVM_VERSION@
 usr/bin/clang-rename-@LLVM_VERSION@
diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in
index dabecf22..46514394 100644
--- a/debian/clang-X.Y.lintian-overrides.in
+++ b/debian/clang-X.Y.lintian-overrides.in
@@ -5,7 +5,6 @@ clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-v
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz
-clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz
 
diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in
index 852e6c0a..3a952059 100644
--- a/debian/clang-X.Y.manpages.in
+++ b/debian/clang-X.Y.manpages.in
@@ -3,6 +3,5 @@ clang/tools/scan-build/scan-build-@LLVM_VERSION@.1
 debian/man/clang-check-@LLVM_VERSION@.1
 debian/man/clang-tblgen-@LLVM_VERSION@.1
 debian/man/scan-view-@LLVM_VERSION@.1
-debian/man/clang-tidy-@LLVM_VERSION@.1
 debian/man/clang-apply-replacements-@LLVM_VERSION@.1
 debian/man/pp-trace-@LLVM_VERSION@.1
diff --git a/debian/clang-tidy-X.Y.install.in b/debian/clang-tidy-X.Y.install.in
new file mode 100644
index 00000000..1041ae4c
--- /dev/null
+++ b/debian/clang-tidy-X.Y.install.in
@@ -0,0 +1,2 @@
+usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy
+usr/bin/clang-tidy-@LLVM_VERSION@
diff --git a/debian/clang-tidy-X.Y.lintian-overrides.in b/debian/clang-tidy-X.Y.lintian-overrides.in
new file mode 100644
index 00000000..3cad8316
--- /dev/null
+++ b/debian/clang-tidy-X.Y.lintian-overrides.in
@@ -0,0 +1,3 @@
+# I know but well...
+clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz
+
diff --git a/debian/clang-tidy-X.Y.manpages.in b/debian/clang-tidy-X.Y.manpages.in
new file mode 100644
index 00000000..fa4a8146
--- /dev/null
+++ b/debian/clang-tidy-X.Y.manpages.in
@@ -0,0 +1 @@
+debian/man/clang-tidy-@LLVM_VERSION@.1
diff --git a/debian/control b/debian/control
index 6dcbfd84..e4a9812a 100644
--- a/debian/control
+++ b/debian/control
@@ -56,11 +56,9 @@ Description: Tool to format C/C++/Obj-C code
  .
  This package also provides vim and emacs plugins.
 
-Package: cpp11-migrate-3.8
+Package: clang-modernize-3.8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.8
-Replaces: cpp11-migrate-3.3
-Breaks: cpp11-migrate-3.3
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-tidy-3.8
 Description: Tool to convert C++98 and C++03 code to C++11
  The purpose of the C++11 Migrator is to do source-to-source translation to
  migrate existing C++ code to use C++11 features to enhance
@@ -69,20 +67,20 @@ Description: Tool to convert C++98 and C++03 code to C++11
  the first two categories. The migrator is based on Clang's LibTooling and
  the AST Matching library.
  .
+ From clang 3.8, this package has been replaced by clang-tidy
+ .
  This is a transitional dummy package. It can safely be removed.
 
-Package: clang-modernize-3.8
+Package: clang-tidy-3.8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.8
-Replaces: cpp11-migrate-3.3, cpp11-migrate-3.4
-Breaks: cpp11-migrate-3.3, cpp11-migrate-3.4
-Description: Tool to convert C++98 and C++03 code to C++11
- The purpose of the C++11 Migrator is to do source-to-source translation to
- migrate existing C++ code to use C++11 features to enhance
- maintainability, readability, runtime performance, and compile-time
- performance. Development is still early and transforms fall mostly into
- the first two categories. The migrator is based on Clang's LibTooling and
- the AST Matching library.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: clang-modernize-3.8
+Breaks: clang-modernize-3.8
+Description: clang-based C++ linter tool
+ Provide an extensible framework for diagnosing and fixing typical programming
+ errors, like style violations, interface misuse, or bugs that can be deduced
+ via static analysis. clang-tidy is modular and provides a convenient interface
+ for writing new checks.
 
 
 Package: clang-3.8-doc