diff --git a/debian/changelog b/debian/changelog
index 0207a67f..c52436de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ llvm-toolchain-snapshot (1:3.8~svn255217-1~exp1) experimental; urgency=medium
 
   * New snapshot release
   * Fix an install issue with clang-tidy
+  * clang-modernize has been removed. Long live to clang-tidy, its
+    replacement
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 10 Dec 2015 05:18:29 +0100
 
diff --git a/debian/clang-modernize-X.Y.install.in b/debian/clang-modernize-X.Y.install.in
deleted file mode 100644
index 3400bb61..00000000
--- a/debian/clang-modernize-X.Y.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/llvm-@LLVM_VERSION@/bin/clang-modernize
-usr/bin/clang-modernize-@LLVM_VERSION@
diff --git a/debian/clang-modernize-X.Y.lintian-overrides.in b/debian/clang-modernize-X.Y.lintian-overrides.in
deleted file mode 100644
index bbb307e2..00000000
--- a/debian/clang-modernize-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# I know but well...
-clang-modernize-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-modernize-@LLVM_VERSION@.1.gz
diff --git a/debian/clang-modernize-X.Y.manpages.in b/debian/clang-modernize-X.Y.manpages.in
deleted file mode 100644
index bff37127..00000000
--- a/debian/clang-modernize-X.Y.manpages.in
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/clang-modernize-@LLVM_VERSION@.1
diff --git a/debian/control b/debian/control
index e6269e0e..b7c742b8 100644
--- a/debian/control
+++ b/debian/control
@@ -56,21 +56,6 @@ Description: Tool to format C/C++/Obj-C code
  .
  This package also provides vim and emacs plugins.
 
-Package: clang-modernize-3.8
-Architecture: any
-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
- 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.
- .
- 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-tidy-3.8
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index ef270da0..cc512e8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -265,7 +265,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-tblgen llvm-ranlib lldb clang-format clang-modernize clang clang-tblgen clang-check clang-tidy clang-apply-replacements pp-trace sancov"; \
+	CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen llvm-ranlib lldb clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements pp-trace sancov"; \
 	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 --no-discard-stderr --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/$(BUILD_DIR)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \