diff --git a/debian/patches/bug783205.patch b/debian/patches/bug783205.patch
index 33e00859..463e984b 100644
--- a/debian/patches/bug783205.patch
+++ b/debian/patches/bug783205.patch
@@ -2,46 +2,46 @@ From: Steven Chamberlain <steven@pyro.eu.org>
 Date: Sun, 10 May 2015 19:46:59 +0100
 Subject: support Debian s390x multiarch paths
 
---- a/clang/lib/Driver/ToolChains.cpp
-+++ b/clang/lib/Driver/ToolChains.cpp
-@@ -2877,6 +2881,10 @@ static std::string getMultiarchTriple(co
-     if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc64le-linux-gnu"))
-       return "powerpc64le-linux-gnu";
-     return TargetTriple.str();
+--- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/ToolChains.cpp
++++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/ToolChains.cpp
+@@ -3092,6 +3092,10 @@ static std::string getMultiarchTriple(co
+     if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu"))
+       return "sparc64-linux-gnu";
+     break;
 +  case llvm::Triple::systemz:
 +    if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu"))
 +      return "s390x-linux-gnu";
-+    return TargetTriple.str();
++    break;
    }
+   return TargetTriple.str();
  }
- 
-@@ -3230,6 +3238,9 @@ void Linux::AddClangSystemIncludeArgs(co
-   const StringRef PPC64LEMultiarchIncludeDirs[] = {
-     "/usr/include/powerpc64le-linux-gnu"
-   };
+@@ -3435,6 +3439,8 @@ void Linux::AddClangSystemIncludeArgs(co
+       "/usr/include/sparc-linux-gnu"};
+   const StringRef Sparc64MultiarchIncludeDirs[] = {
+       "/usr/include/sparc64-linux-gnu"};
 +  const StringRef SYSTEMZMultiarchIncludeDirs[] = {
-+    "/usr/include/s390x-linux-gnu"
-+  };
++      "/usr/include/s390x-linux-gnu"};
    ArrayRef<StringRef> MultiarchIncludeDirs;
-   if (getTriple().getArch() == llvm::Triple::x86_64) {
-     MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
-@@ -3257,6 +3268,8 @@ void Linux::AddClangSystemIncludeArgs(co
-     MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
-   } else if (getTriple().getArch() == llvm::Triple::ppc64le) {
-     MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs;
-+  } else if (getTriple().getArch() == llvm::Triple::systemz) {
+   switch (getTriple().getArch()) {
+   case llvm::Triple::x86_64:
+@@ -3480,6 +3486,9 @@ void Linux::AddClangSystemIncludeArgs(co
+   case llvm::Triple::sparcv9:
+     MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs;
+     break;
++  case llvm::Triple::systemz:
 +    MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs;
++    break;
+   default:
+     break;
    }
-   for (StringRef Dir : MultiarchIncludeDirs) {
-     if (llvm::sys::fs::exists(SysRoot + Dir)) {
---- a/clang/lib/Driver/Tools.cpp
-+++ b/clang/lib/Driver/Tools.cpp
-@@ -7333,7 +7333,7 @@ static std::string getLinuxDynamicLinker
+--- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/Tools.cpp
++++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/Tools.cpp
+@@ -8058,7 +8058,7 @@ static std::string getLinuxDynamicLinker
        return "/lib64/ld64.so.1";
      return "/lib64/ld64.so.2";
-   } else if (ToolChain.getArch() == llvm::Triple::systemz)
+   } else if (Arch == llvm::Triple::systemz)
 -    return "/lib64/ld64.so.1";
 +    return "/lib/ld64.so.1";
-   else if (ToolChain.getArch() == llvm::Triple::sparcv9)
+   else if (Arch == llvm::Triple::sparcv9)
      return "/lib64/ld-linux.so.2";
-   else if (ToolChain.getArch() == llvm::Triple::x86_64 &&
+   else if (Arch == llvm::Triple::x86_64 &&
diff --git a/debian/patches/series b/debian/patches/series
index 16ed90c3..ea89a4c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,4 +40,4 @@ compiler-rt-i586.diff
 clang-analyzer-force-version.diff
 locale-issue-ld.diff
 CVE-2015-2305.patch
-#bug783205.patch
+bug783205.patch