diff --git a/debian/changelog b/debian/changelog
index d2bf41f8..5dcbefde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-llvm-toolchain-snapshot (1:3.5~svn195337-2) unstable; urgency=low
+llvm-toolchain-snapshot (1:3.5~svn195337-1) unstable; urgency=low
 
   * Make lldb 3.5 also conflict with 3.4 (Closes: #730163)
   * Make python-clang 3.5 also conflict with 3.4 (Closes: #730164)
+  * Fix a FTBFS with clang
+  * Refresh the /usr/include/clang mess
 
  --
 
diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff
deleted file mode 100644
index 882cbfdd..00000000
--- a/debian/patches/30-kfreebsd.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: llvm-toolchain-snapshot_3.5~svn195736/clang/lib/Driver/ToolChains.h
-===================================================================
---- llvm-toolchain-snapshot_3.5~svn195736.orig/clang/lib/Driver/ToolChains.h	2013-11-26 12:17:42.470529325 +0100
-+++ llvm-toolchain-snapshot_3.5~svn195736/clang/lib/Driver/ToolChains.h	2013-11-26 12:17:42.466529326 +0100
-@@ -366,6 +366,8 @@
-   virtual bool isPICDefault() const;
-   virtual bool isPIEDefault() const;
-   virtual bool isPICDefaultForced() const;
-+  virtual void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-+                                        llvm::opt::ArgStringList &CC1Args) const;
- 
-   virtual bool SupportsProfiling() const;
- 
-Index: llvm-toolchain-snapshot_3.5~svn195736/clang/lib/Driver/ToolChains.cpp
-===================================================================
---- llvm-toolchain-snapshot_3.5~svn195736.orig/clang/lib/Driver/ToolChains.cpp	2013-11-26 12:17:42.470529325 +0100
-+++ llvm-toolchain-snapshot_3.5~svn195736/clang/lib/Driver/ToolChains.cpp	2013-11-26 12:17:42.470529325 +0100
-@@ -967,6 +967,13 @@
-   return GoodVersion;
- }
- 
-+void Generic_GCC::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-+                                      llvm::opt::ArgStringList &CC1Args) const {
-+  // Under Debian, clang headers are installed into
-+  // '/usr/include/clang/VERSION/include/'
-+  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
-+}
-+
- /// \brief Less-than for GCCVersion, implementing a Strict Weak Ordering.
- bool Generic_GCC::GCCVersion::isOlderThan(int RHSMajor, int RHSMinor,
-                                           int RHSPatch,
diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff
new file mode 100644
index 00000000..901e7a77
--- /dev/null
+++ b/debian/patches/fix-clang-path-and-build.diff
@@ -0,0 +1,26 @@
+Index: llvm-toolchain-snapshot-3.5~svn195337/clang/lib/Driver/ToolChains.cpp
+===================================================================
+--- llvm-toolchain-snapshot-3.5~svn195337.orig/clang/lib/Driver/ToolChains.cpp	2013-11-28 19:53:40.000000000 +0100
++++ llvm-toolchain-snapshot-3.5~svn195337/clang/lib/Driver/ToolChains.cpp	2013-11-28 19:55:05.799323368 +0100
+@@ -134,6 +134,12 @@
+     .Default(0);
+ }
+ 
++
+++void Darwin::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
++                                           ArgStringList &CC1Args) const {
++}
++
++
+ StringRef Darwin::getDarwinArchName(const ArgList &Args) const {
+   switch (getTriple().getArch()) {
+   default:
+@@ -1981,6 +1987,8 @@
+       DriverArgs.hasArg(options::OPT_nostdincxx))
+     return;
+ 
++  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
++
+   switch (GetCXXStdlibType(DriverArgs)) {
+   case ToolChain::CST_Libcxx:
+     addSystemInclude(DriverArgs, CC1Args,
diff --git a/debian/patches/series b/debian/patches/series
index c8420e6e..c116b54e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
 27-fix_clang_stdint.diff
 26-set-correct-float-abi.diff
 profile_rt.diff
-30-kfreebsd.diff
 0003-Debian-version-info-and-bugreport.patch
 0021-shared-lib-debian.patch
 0023-link-libopagent.patch
@@ -27,3 +26,4 @@ atomic_library_1.diff
 atomic_library_2.diff
 python-clangpath.diff
 removeduplicatedeclaration.diff
+fix-clang-path-and-build.diff