diff --git a/debian/changelog b/debian/changelog
index b803c678..a0cc2e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+llvm-toolchain-snapshot (1:5.0~svn298810-1~exp1) experimental; urgency=medium
+
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 26 Mar 2017 18:48:30 +0200
+
+llvm-toolchain-snapshot (1:5.0~svn298773-1~exp1) experimental; urgency=medium
+
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 25 Mar 2017 16:16:14 +0100
+
 llvm-toolchain-snapshot (1:5.0~svn294583-1~exp1) experimental; urgency=medium
 
   * New snapshot release
diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index 57fbf0bd..364b9122 100644
--- a/debian/patches/0044-soname.diff
+++ b/debian/patches/0044-soname.diff
@@ -3,9 +3,11 @@
  tools/llvm-shlib/CMakeLists.txt     |    1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
---- a/clang/tools/libclang/CMakeLists.txt
-+++ b/clang/tools/libclang/CMakeLists.txt
-@@ -83,7 +83,7 @@ else()
+Index: llvm-toolchain-snapshot_5.0~svn298810/clang/tools/libclang/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn298810.orig/clang/tools/libclang/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn298810/clang/tools/libclang/CMakeLists.txt
+@@ -84,7 +84,7 @@ else()
    set(output_name "clang")
  endif()
  
@@ -14,8 +16,10 @@
    OUTPUT_NAME ${output_name}
    ${SOURCES}
    DEPENDS clang-headers
---- a/tools/llvm-shlib/CMakeLists.txt
-+++ b/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-shlib/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn298810.orig/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-shlib/CMakeLists.txt
 @@ -35,6 +35,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
  endif()
  
@@ -23,4 +27,4 @@
 +set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
  
  list(REMOVE_DUPLICATES LIB_NAMES)
- if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf"
+ if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch
index 3ded6617..bc1e679d 100644
--- a/debian/patches/fix-llvm-config-obj-src-root.patch
+++ b/debian/patches/fix-llvm-config-obj-src-root.patch
@@ -2,11 +2,11 @@
  tools/llvm-config/llvm-config.cpp |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_4.0~svn289826/tools/llvm-config/llvm-config.cpp
+Index: llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-config/llvm-config.cpp
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn289826.orig/tools/llvm-config/llvm-config.cpp
-+++ llvm-toolchain-snapshot_4.0~svn289826/tools/llvm-config/llvm-config.cpp
-@@ -547,9 +547,9 @@ int main(int argc, char **argv) {
+--- llvm-toolchain-snapshot_5.0~svn298810.orig/tools/llvm-config/llvm-config.cpp
++++ llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-config/llvm-config.cpp
+@@ -555,9 +555,9 @@ int main(int argc, char **argv) {
        } else if (Arg == "--shared-mode") {
          PrintSharedMode = true;
        } else if (Arg == "--obj-root") {