diff --git a/debian/changelog b/debian/changelog
index d7246d9a..f473c9ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-snapshot (1:5.0~svn305653-2) UNRELEASED; urgency=medium
+
+  * Ship the opt-viewer new program as part of llvm-5.0 tools
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 09 Jul 2017 17:36:10 +0200
+
 llvm-toolchain-snapshot (1:5.0~svn305653-1) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in
index db5574f7..9fec1e27 100644
--- a/debian/llvm-X.Y-tools.install.in
+++ b/debian/llvm-X.Y-tools.install.in
@@ -1,9 +1,17 @@
+
 usr/lib/llvm-@LLVM_VERSION@/bin/count
 usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck
 usr/lib/llvm-@LLVM_VERSION@/bin/not
+usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-viewer.py
+usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/optrecord.py
+usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/style.css
+usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-diff.py
+usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/optpmap.py
+usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-stats.py
 
 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@
+