diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
index 534fdd54..6c8a1d53 100644
--- a/debian/patches/0003-Debian-version-info-and-bugreport.patch
+++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch
@@ -2,9 +2,11 @@
  lib/Support/CommandLine.cpp |    4 ++++
  1 file changed, 4 insertions(+)
 
---- a/lib/Support/CommandLine.cpp
-+++ b/lib/Support/CommandLine.cpp
-@@ -2046,6 +2046,10 @@ public:
+Index: llvm-toolchain-snapshot_5.0~svn296106/lib/Support/CommandLine.cpp
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn296106.orig/lib/Support/CommandLine.cpp
++++ llvm-toolchain-snapshot_5.0~svn296106/lib/Support/CommandLine.cpp
+@@ -2064,6 +2064,10 @@ public:
      OS << " " << LLVM_VERSION_INFO;
  #endif
      OS << "\n  ";
diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff
index b9cb0cca..b4090930 100644
--- a/debian/patches/26-set-correct-float-abi.diff
+++ b/debian/patches/26-set-correct-float-abi.diff
@@ -18,13 +18,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
----
- clang/lib/Driver/Tools.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/clang/lib/Driver/Tools.cpp
-+++ b/clang/lib/Driver/Tools.cpp
-@@ -973,7 +973,7 @@ arm::FloatABI arm::getARMFloatABI(const
+Index: llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/ARM.cpp
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn296106.orig/clang/lib/Driver/Arch/ARM.cpp
++++ llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/ARM.cpp
+@@ -202,7 +202,7 @@ arm::FloatABI arm::getARMFloatABI(const
        case llvm::Triple::MuslEABI:
        case llvm::Triple::EABI:
          // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
diff --git a/debian/patches/mips-fpxx-enable.diff b/debian/patches/mips-fpxx-enable.diff
index e170df77..654054a4 100644
--- a/debian/patches/mips-fpxx-enable.diff
+++ b/debian/patches/mips-fpxx-enable.diff
@@ -2,9 +2,11 @@
  clang/lib/Driver/Tools.cpp |    5 -----
  1 file changed, 5 deletions(-)
 
---- a/clang/lib/Driver/Tools.cpp
-+++ b/clang/lib/Driver/Tools.cpp
-@@ -7876,11 +7876,6 @@ bool mips::isFP64ADefault(const llvm::Tr
+Index: llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/Mips.cpp
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn296106.orig/clang/lib/Driver/Arch/Mips.cpp
++++ llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/Mips.cpp
+@@ -362,10 +362,6 @@ bool mips::isFP64ADefault(const llvm::Tr
  
  bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
                           StringRef ABIName, mips::FloatABI FloatABI) {
@@ -12,7 +14,6 @@
 -      Triple.getVendor() != llvm::Triple::MipsTechnologies &&
 -      !Triple.isAndroid())
 -    return false;
--
+ 
    if (ABIName != "32")
      return false;
-