diff --git a/debian/changelog b/debian/changelog
index ed736b82..67d2d558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-snapshot (1:4.0~svn291557-1~exp1) experimental; urgency=medium
+
+  * New snapshot release
+  * d/p/lldb-server-link-issue.patch removed, merged upstream
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 10 Jan 2017 12:01:20 +0100
+
 llvm-toolchain-snapshot (1:4.0~svn291344-1) unstable; urgency=medium
 
   * New snapshot release
diff --git a/debian/patches/clang-fix-cmpxchg8-detection-on-i386.patch b/debian/patches/clang-fix-cmpxchg8-detection-on-i386.patch
index 961afccf..0f642e4b 100644
--- a/debian/patches/clang-fix-cmpxchg8-detection-on-i386.patch
+++ b/debian/patches/clang-fix-cmpxchg8-detection-on-i386.patch
@@ -9,11 +9,11 @@ can't tell program if libatomic is always lock free.
 
 Related bug: https://llvm.org/bugs/show_bug.cgi?id=19355
 
-Index: llvm-toolchain-3.9-3.9/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_4.0~svn291557/clang/lib/Basic/Targets.cpp
 ===================================================================
---- llvm-toolchain-3.9-3.9.orig/clang/lib/Basic/Targets.cpp
-+++ llvm-toolchain-3.9-3.9/clang/lib/Basic/Targets.cpp
-@@ -2609,7 +2609,10 @@ class X86TargetInfo : public TargetInfo
+--- llvm-toolchain-snapshot_4.0~svn291557.orig/clang/lib/Basic/Targets.cpp
++++ llvm-toolchain-snapshot_4.0~svn291557/clang/lib/Basic/Targets.cpp
+@@ -2761,7 +2761,10 @@ class X86TargetInfo : public TargetInfo
      FP_SSE,
      FP_387
    } FPMath = FP_Default;
@@ -25,7 +25,7 @@ Index: llvm-toolchain-3.9-3.9/clang/lib/Basic/Targets.cpp
  public:
    X86TargetInfo(const llvm::Triple &Triple, const TargetOptions &)
        : TargetInfo(Triple) {
-@@ -2701,6 +2704,8 @@ public:
+@@ -2882,6 +2885,8 @@ public:
      // acceptable.
      // FIXME: This results in terrible diagnostics. Clang just says the CPU is
      // invalid without explaining *why*.
@@ -34,7 +34,7 @@ Index: llvm-toolchain-3.9-3.9/clang/lib/Basic/Targets.cpp
      switch (CPU) {
      case CK_Generic:
        // No processor selected!
-@@ -3730,7 +3735,7 @@ void X86TargetInfo::getTargetDefines(con
+@@ -3949,7 +3954,7 @@ void X86TargetInfo::getTargetDefines(con
      Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2");
      Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4");
    }
@@ -43,7 +43,7 @@ Index: llvm-toolchain-3.9-3.9/clang/lib/Basic/Targets.cpp
      Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8");
  }
  
-@@ -4009,8 +4014,6 @@ public:
+@@ -4250,8 +4255,6 @@ public:
                               (1 << TargetInfo::LongDouble));
  
      // x86-32 has atomics up to 8 bytes
@@ -52,16 +52,3 @@ Index: llvm-toolchain-3.9-3.9/clang/lib/Basic/Targets.cpp
      MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 64;
    }
    BuiltinVaListKind getBuiltinVaListKind() const override {
-Index: llvm-toolchain-3.9-3.9/clang/test/Sema/atomic-ops.c
-===================================================================
---- llvm-toolchain-3.9-3.9.orig/clang/test/Sema/atomic-ops.c
-+++ llvm-toolchain-3.9-3.9/clang/test/Sema/atomic-ops.c
-@@ -14,7 +14,7 @@ _Static_assert(__GCC_ATOMIC_WCHAR_T_LOCK
- _Static_assert(__GCC_ATOMIC_SHORT_LOCK_FREE == 2, "");
- _Static_assert(__GCC_ATOMIC_INT_LOCK_FREE == 2, "");
- _Static_assert(__GCC_ATOMIC_LONG_LOCK_FREE == 2, "");
--#ifdef __i386__
-+#if defined(__i386__)
- _Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 1, "");
- #else
- _Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 2, "");
diff --git a/debian/patches/lldb-server-link-issue.patch b/debian/patches/lldb-server-link-issue.patch
deleted file mode 100644
index c6204d1e..00000000
--- a/debian/patches/lldb-server-link-issue.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: llvm-toolchain-snapshot_4.0~svn291432/lldb/tools/lldb-server/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_4.0~svn291432.orig/lldb/tools/lldb-server/CMakeLists.txt
-+++ llvm-toolchain-snapshot_4.0~svn291432/lldb/tools/lldb-server/CMakeLists.txt
-@@ -183,7 +183,13 @@ else()
-   target_link_libraries(lldb-server ${LLDB_USED_LIBS})
-   target_link_libraries(lldb-server ${CLANG_USED_LIBS})
- endif()
--llvm_config(lldb-server ${LLVM_LINK_COMPONENTS})
-+if(NOT LLVM_LINK_LLVM_DYLIB)
-+  # This is necessary in !LLVM_LINK_LLVM_DYLIB as LLDB's libs do not track their
-+  # dependencies properly. It is conditional because in a LLVM_LINK_LLVM_DYLIB
-+  # build it would introduce duplicate symbols (add_lldb_tool links to libLLVM,
-+  # and this would add the individual .a files as well).
-+  llvm_config(lldb-server ${LLVM_LINK_COMPONENTS})
-+endif()
- 
- target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})
- 
diff --git a/debian/patches/series b/debian/patches/series
index 701fb8d9..a2a5d940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,4 +43,3 @@ clang-fix-cmpxchg8-detection-on-i386.patch
 lldb-addversion-suffix-to-llvm-server-exec.patch
 lldb-missing-install.diff
 silent-test-failing-codeverage.diff
-lldb-server-link-issue.patch