diff --git a/debian/changelog b/debian/changelog
index c06f9022..a05b29df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-3.8 (1:3.8.1-1) UNRELEASED; urgency=medium
+llvm-toolchain-3.8 (1:3.8-3) unstable; urgency=medium
 
   [ Brad King ]
   * Install cmake files in usr/share/llvm-@LLVM_VERSION@/cmake/ instead of
@@ -23,7 +23,10 @@ llvm-toolchain-3.8 (1:3.8.1-1) UNRELEASED; urgency=medium
   * Unbreak circular dependency by Suggesting the python binding from
     liblldb-3.8-dev
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 13 Mar 2016 18:25:13 +0100
+  [ Alexis La Goutte ]
+  * Fix an issue with scan-view (Closes: #825101)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 25 May 2016 11:05:18 +0200
 
 llvm-toolchain-3.8 (1:3.8-2) unstable; urgency=medium
 
diff --git a/debian/patches/scan-view-fix-path.diff b/debian/patches/scan-view-fix-path.diff
new file mode 100644
index 00000000..0db8033d
--- /dev/null
+++ b/debian/patches/scan-view-fix-path.diff
@@ -0,0 +1,11 @@
+--- llvm-toolchain-snapshot_3.8~svn253186.orig/clang/tools/scan-view/bin/scan-view.old    2016-05-23 15:27:03.278422015 +0200
++++ llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-view/bin/scan-view        2016-05-23 15:34:30.517953399 +0200
+@@ -61,7 +61,7 @@
+
+ def run(port, options, root):
+     # Prefer to look relative to the installed binary
+-    share = os.path.dirname(__file__) + "/../share/scan-view"
++    share = os.path.dirname(__file__) + "/../share/"
+     if not os.path.isdir(share):
+         # Otherwise look relative to the source
+         share = os.path.dirname(__file__) + "/../../scan-view/share"