diff --git a/debian/changelog b/debian/changelog
index ee50013d..5c83e505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 llvm-toolchain-5.0 (1:5.0.1-4) UNRELEASED; urgency=medium
 
-  [ Sylvestre Ledru ]
+  * Move the VCS to git.
+    Many thanks to James Clarke for doing the conversion
   * Ignore the test tools/gold/X86/comdat.ll
     until https://bugs.llvm.org/show_bug.cgi?id=36166
     is fixed.
@@ -65,6 +66,7 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp2) experimental; urgency=medium
   * Remove some old breaks/replaces/conflicts (<3.8)
   * Fix some wrong-section-according-to-package-name and
     priority-extra-is-replaced-by-priority-optional issues
+  * liblld-4.0-dev depends on liblld-4.0 (Closes: #856545)
   * Use ?= for some variables declarations
   * Remove the hardcoded declarations of llvm version in debian/rules
   * add /usr/lib/cuda to the CUDA toolkit search paths
@@ -85,8 +87,11 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium
       - gsplit-dward on 32 bits archs
       - -g everywhere
     Many thanks to Adrian Bunk for that
+  * Fix the fix-scan-view-path.diff path (Closes: #885827)
+  * Move libomp-dev from Suggests to Recommends (Closes: #882781)
+  * Do not ship liblld-4.0-dbg for now (Closes: #889269)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 03 Nov 2017 15:30:19 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 11 Feb 2018 00:01:50 +0100
 
 llvm-toolchain-4.0 (1:4.0.1-8) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c6fd4a79..c08c5766 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,10 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
 #    libctypes-ocaml-dev [amd64 arm64 armel armhf i386],
 #    dh-ocaml [amd64 arm64 armel armhf i386],
 Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
 Homepage: http://www.llvm.org/
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-llvm/llvm-toolchain/branches/5.0/
-Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/5.0/
+Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 5.0
+Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/5.0
 
 # ------------- clang -------------
 
@@ -43,7 +43,7 @@ Description: C, C++ and Objective-C compiler
 Package: clang-tools-5.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, clang-5.0 (= ${binary:Version})
-Description: clang-based tools
+Description: clang-based tools for C/C++ developments
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
  GNU Compiler Collection (GCC).
diff --git a/debian/patches/series b/debian/patches/series
index 7f58c36b..8901ea8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ declare_clear_cache.diff
 clang-format-version.diff
 unwind-chain-inclusion.diff
 hurd-pathmax.diff
+use-deb-json.diff
 silent-gold-test.diff
 atomic_library_1.diff
 atomic_library_2.diff
@@ -41,12 +42,22 @@ clang-fix-cmpxchg8-detection-on-i386.patch
 lldb-addversion-suffix-to-llvm-server-exec.patch
 lldb-missing-install.diff
 silent-test-failing-codeverage.diff
-disable-path-test-failing.diff
-silent-amd-tet.diff
-disable-error-xray.diff
-lldb-disable-swig-error.diff
+silent-amdgpu-test-failing.diff
+pthread-link.diff
+add_symbols_versioning.patch
+ftfbs-gcc.diff
+pr81066.diff
+armhf-bitfield.diff
+# rust LLVM PR84, LLVM PR32488
+# This is actually Rust's backport of upstream RL305193 (which doesn't apply cleanly to LLVM 4)
+# https://github.com/rust-lang/llvm/commit/2b622a393ce
+rL305193-backport.diff
+# rust LLVM PR90, LLVM PR32902, PR31142
+rL298540.diff
+rL306267.diff
+rL306353.diff
+rL306358.diff
+rL306379.diff
+sparc64-fix-stack-alignment.diff
 update-cuda-search-path.patch
-
-test-keep-alive.diff
-libfuzzer-path.diff
 sparc64-add-missing-tls-get-addr.diff