diff --git a/debian/changelog b/debian/changelog
index 61a04990..213c708f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
 llvm-toolchain-6.0 (1:6.0~+rc2-2) UNRELEASED; urgency=medium
 
+  * Move the VCS to git.
+    Many thanks to James Clarke for doing the conversion
+
   [ John Paul Adrian Glaubitz ]
   * Add proposed upstream patch by James Clarke to add the
     missing __tls_get_addr symbol to the symbol table for
     TLS calls on SPARC (Closes: #890401)
 
- -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 14 Feb 2018 21:23:31 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 23 Feb 2018 19:54:21 +0100
 
 llvm-toolchain-6.0 (1:6.0~+rc2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2212bfe5..b6a04969 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
 Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
 Standards-Version: 4.1.1
 Homepage: http://www.llvm.org/
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-llvm/llvm-toolchain/branches/6.0/
-Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/6.0/
+Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 6.0
+Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/6.0
 
 # ------------- clang -------------
 
@@ -41,7 +41,7 @@ Description: C, C++ and Objective-C compiler
 Package: clang-tools-6.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, clang-6.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/libfuzzer-path.diff b/debian/patches/libfuzzer-path.diff
new file mode 100644
index 00000000..6b2c7ef4
--- /dev/null
+++ b/debian/patches/libfuzzer-path.diff
@@ -0,0 +1,16 @@
+Index: llvm-toolchain-5.0-5.0.1/clang/lib/Driver/ToolChains/CommonArgs.cpp
+===================================================================
+--- llvm-toolchain-5.0-5.0.1.orig/clang/lib/Driver/ToolChains/CommonArgs.cpp
++++ llvm-toolchain-5.0-5.0.1/clang/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -600,9 +600,8 @@ collectSanitizerRuntimes(const ToolChain
+ static void addLibFuzzerRuntime(const ToolChain &TC,
+                                 const ArgList &Args,
+                                 ArgStringList &CmdArgs) {
+-    StringRef ParentDir = llvm::sys::path::parent_path(TC.getDriver().InstalledDir);
+-    SmallString<128> P(ParentDir);
+-    llvm::sys::path::append(P, "lib", "libLLVMFuzzer.a");
++    SmallString<128> P;
++    llvm::sys::path::append(P, TC.getDriver().Dir, "/../lib" CLANG_LIBDIR_SUFFIX, "libFuzzer.a");
+     CmdArgs.push_back(Args.MakeArgString(P));
+     TC.AddCXXStdlibLibArgs(Args, CmdArgs);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9970a8d4..7437ba7f 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
 python-clangpath.diff