diff --git a/debian/changelog b/debian/changelog
index 90afcb6f..9dafb873 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ llvm-toolchain-3.3 (1:3.3-6) unstable; urgency=low
   * Fix the FTBFS under hurd and KFreeBSD
   * Do not remove all *.o in tests. Some of them are from upstream source
     tarball. Thanks to Maarten Lankhorst for the fix.
+  * Also apply unwind-chain-inclusion.diff from the snapshot branch to make sure
+    we can build the package locally even if libclang-dev is installed
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 18 Aug 2013 16:45:53 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 63b1f5bf..26bfa0a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ mipsel-ftbfs.diff
 patch-bug-16511.diff
 kfreebsd-lldb.diff
 disable-execinfo-usage.diff
+unwind-chain-inclusion.diff
diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff
new file mode 100644
index 00000000..a2854130
--- /dev/null
+++ b/debian/patches/unwind-chain-inclusion.diff
@@ -0,0 +1,39 @@
+# Without this patch, the first local include of unwind.h might, with the 
+# __has_include_next, try to include the one from the system.
+# It might be /usr/include/clang/3.4/include/unwind.h
+# Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration
+# from the system. 
+
+Index: llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Headers/unwind.h
+===================================================================
+--- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/lib/Headers/unwind.h	2013-08-11 10:01:40.960734544 +0200
++++ llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Headers/unwind.h	2013-08-11 10:01:40.956734544 +0200
+@@ -23,9 +23,6 @@
+ 
+ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
+ 
+-#ifndef __CLANG_UNWIND_H
+-#define __CLANG_UNWIND_H
+-
+ #if __has_include_next(<unwind.h>)
+ /* Darwin and libunwind provide an unwind.h. If that's available, use
+  * it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
+@@ -53,6 +50,9 @@
+ # endif
+ #else
+ 
++#ifndef __CLANG_UNWIND_H
++#define __CLANG_UNWIND_H
++
+ #include <stdint.h>
+ 
+ #ifdef __cplusplus
+@@ -128,6 +128,7 @@
+ }
+ #endif
+ 
++#endif /* __CLANG_UNWIND_H */
++
+ #endif
+ 
+-#endif /* __CLANG_UNWIND_H */