diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
index ffba89a3..f3ab5c56 100644
--- a/debian/patches/0003-Debian-version-info-and-bugreport.patch
+++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain_3.3~svn179457/lib/Support/CommandLine.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/lib/Support/CommandLine.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/lib/Support/CommandLine.cpp	2013-03-10 00:29:37.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/lib/Support/CommandLine.cpp	2013-04-13 10:29:35.189932201 +0200
-@@ -1343,6 +1343,10 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/Support/CommandLine.cpp	2013-05-06 23:56:35.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/lib/Support/CommandLine.cpp	2013-05-08 20:26:00.000000000 +0200
+@@ -1513,6 +1513,10 @@
      OS << LLVM_VERSION_INFO;
  #endif
      OS << "\n  ";
diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch
index 67b20f37..7713e36a 100644
--- a/debian/patches/0021-shared-lib-debian.patch
+++ b/debian/patches/0021-shared-lib-debian.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile
+Index: llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/tools/llvm-shlib/Makefile	2012-08-06 22:52:18.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile	2013-04-13 10:29:38.697932065 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/tools/llvm-shlib/Makefile	2012-08-06 22:52:18.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile	2013-05-08 20:26:00.000000000 +0200
 @@ -39,6 +39,12 @@
  LLVMLibsPaths   := $(IncludeInLibLlvm)
  
diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch
index 61974399..dca82d63 100644
--- a/debian/patches/0023-link-libopagent.patch
+++ b/debian/patches/0023-link-libopagent.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain_3.3~svn179457/configure
+Index: llvm-toolchain-snapshot_3.3~svn181457/configure
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/configure	2013-03-25 14:13:33.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/configure	2013-04-13 10:29:39.953932017 +0200
-@@ -13571,7 +13571,7 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/configure	2013-05-07 22:31:28.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/configure	2013-05-08 20:26:01.000000000 +0200
+@@ -13699,7 +13699,7 @@
        case $llvm_cv_os_type in
          Linux)
            if test -n "$llvm_cv_oppath" ; then
@@ -11,7 +11,7 @@ Index: llvm-toolchain_3.3~svn179457/configure
                                                              { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5
  echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; }
  if test "${ac_cv_search_bfd_init+set}" = set; then
-@@ -13667,7 +13667,7 @@
+@@ -13795,7 +13795,7 @@
  echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; }
  ac_res=$ac_cv_search_bfd_init
  if test "$ac_res" != no; then
@@ -20,7 +20,7 @@ Index: llvm-toolchain_3.3~svn179457/configure
  
  fi
  
-@@ -13703,8 +13703,8 @@
+@@ -13831,8 +13831,8 @@
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index 5fbfea7e..465281a2 100644
--- a/debian/patches/0044-soname.diff
+++ b/debian/patches/0044-soname.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile
+Index: llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/tools/llvm-shlib/Makefile	2013-04-13 10:29:38.697932065 +0200
-+++ llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile	2013-04-13 10:29:40.997931976 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/tools/llvm-shlib/Makefile	2013-05-08 20:26:00.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile	2013-05-08 20:26:02.000000000 +0200
 @@ -77,7 +77,7 @@
  
  ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
diff --git a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch
index 3a8cfecf..311ae3e8 100644
--- a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch
+++ b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch
@@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
  test/DebugInfo/X86/ending-run.ll      |    6 ++----
  2 files changed, 4 insertions(+), 9 deletions(-)
 
-Index: llvm-toolchain_3.3~svn179457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-04-09 21:23:15.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-04-13 10:29:42.077931934 +0200
-@@ -1244,15 +1244,12 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-05-08 08:01:41.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-05-08 20:26:03.000000000 +0200
+@@ -1319,15 +1319,12 @@
    if (!MI->isDebugValue()) {
      DebugLoc DL = MI->getDebugLoc();
      if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
@@ -33,10 +33,10 @@ Index: llvm-toolchain_3.3~svn179457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
        if (!DL.isUnknown()) {
          const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
          recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
-Index: llvm-toolchain_3.3~svn179457/test/DebugInfo/X86/ending-run.ll
+Index: llvm-toolchain-snapshot_3.3~svn181457/test/DebugInfo/X86/ending-run.ll
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/test/DebugInfo/X86/ending-run.ll	2013-03-28 03:44:59.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/test/DebugInfo/X86/ending-run.ll	2013-04-13 10:29:42.081931934 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/test/DebugInfo/X86/ending-run.ll	2013-04-22 08:12:31.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/test/DebugInfo/X86/ending-run.ll	2013-05-08 20:26:03.000000000 +0200
 @@ -1,11 +1,9 @@
  ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
  ; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s
diff --git a/debian/patches/0047-version-name.diff b/debian/patches/0047-version-name.diff
index 03cd24f5..c371b170 100644
--- a/debian/patches/0047-version-name.diff
+++ b/debian/patches/0047-version-name.diff
@@ -1,28 +1,28 @@
-Index: llvm-toolchain_3.3~svn179457/autoconf/configure.ac
+Index: llvm-toolchain-snapshot_3.3~svn181457/autoconf/configure.ac
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/autoconf/configure.ac	2013-03-25 14:13:33.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/autoconf/configure.ac	2013-04-13 10:29:43.485931880 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/autoconf/configure.ac	2013-05-07 22:31:28.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/autoconf/configure.ac	2013-05-08 20:26:46.000000000 +0200
 @@ -31,7 +31,7 @@
  dnl===-----------------------------------------------------------------------===
  dnl Initialize autoconf and define the package name, version number and
  dnl address for reporting bugs.
--AC_INIT([LLVM],[3.3svn],[http://llvm.org/bugs/])
-+AC_INIT([LLVM],[3.3],[http://llvm.org/bugs/])
+-AC_INIT([LLVM],[3.4svn],[http://llvm.org/bugs/])
++AC_INIT([LLVM],[3.4],[http://llvm.org/bugs/])
  AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
- AC_DEFINE([LLVM_VERSION_MINOR], [3], [Minor version of the LLVM API])
+ AC_DEFINE([LLVM_VERSION_MINOR], [4], [Minor version of the LLVM API])
  
-Index: llvm-toolchain_3.3~svn179457/configure
+Index: llvm-toolchain-snapshot_3.3~svn181457/configure
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/configure	2013-04-13 10:29:39.953932017 +0200
-+++ llvm-toolchain_3.3~svn179457/configure	2013-04-13 10:29:43.493931880 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/configure	2013-05-08 20:26:01.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/configure	2013-05-08 20:26:55.000000000 +0200
 @@ -561,8 +561,8 @@
  # Identity of this package.
  PACKAGE_NAME='LLVM'
  PACKAGE_TARNAME='llvm'
--PACKAGE_VERSION='3.3svn'
--PACKAGE_STRING='LLVM 3.3svn'
-+PACKAGE_VERSION='3.3'
-+PACKAGE_STRING='LLVM 3.3'
+-PACKAGE_VERSION='3.4svn'
+-PACKAGE_STRING='LLVM 3.4svn'
++PACKAGE_VERSION='3.4'
++PACKAGE_STRING='LLVM 3.4'
  PACKAGE_BUGREPORT='http://llvm.org/bugs/'
  
  ac_unique_file="lib/IR/Module.cpp"
diff --git a/debian/patches/0050-powerpcspe-fp.diff b/debian/patches/0050-powerpcspe-fp.diff
index 7f98871b..ad57db05 100644
--- a/debian/patches/0050-powerpcspe-fp.diff
+++ b/debian/patches/0050-powerpcspe-fp.diff
@@ -1,10 +1,10 @@
  PPCJITInfo.cpp |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-Index: llvm-toolchain_3.3~svn179457/lib/Target/PowerPC/PPCJITInfo.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/lib/Target/PowerPC/PPCJITInfo.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/lib/Target/PowerPC/PPCJITInfo.cpp	2013-02-17 15:30:32.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/lib/Target/PowerPC/PPCJITInfo.cpp	2013-04-13 10:29:45.613931797 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/Target/PowerPC/PPCJITInfo.cpp	2013-02-17 15:30:32.000000000 +0100
++++ llvm-toolchain-snapshot_3.3~svn181457/lib/Target/PowerPC/PPCJITInfo.cpp	2013-05-08 20:27:19.000000000 +0200
 @@ -99,6 +99,7 @@
      "stw r8,  196(r1)\n"    "stw r7,  192(r1)\n"
      "stw r6,  188(r1)\n"    "stw r5,  184(r1)\n"
diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch
index 64a7c93b..f343e95d 100644
--- a/debian/patches/18-soname.patch
+++ b/debian/patches/18-soname.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn176083/clang/tools/libclang/Makefile
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/tools/libclang/Makefile
 ===================================================================
---- llvm-toolchain_3.3~svn176083.orig/clang/tools/libclang/Makefile	2013-02-13 20:44:17.000000000 +0100
-+++ llvm-toolchain_3.3~svn176083/clang/tools/libclang/Makefile	2013-02-26 14:09:14.000000000 +0100
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/tools/libclang/Makefile	2013-05-08 20:25:14.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/tools/libclang/Makefile	2013-05-08 20:25:20.000000000 +0200
 @@ -14,6 +14,7 @@
  
  LINK_LIBS_IN_SHARED = 1
diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch
index 8438696f..1e9397f6 100644
--- a/debian/patches/19-clang_debian_version.patch
+++ b/debian/patches/19-clang_debian_version.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Basic/Version.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Basic/Version.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Basic/Version.cpp	2013-03-26 00:16:38.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Basic/Version.cpp	2013-04-13 10:29:09.869933183 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Basic/Version.cpp	2013-05-08 20:25:13.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Basic/Version.cpp	2013-05-08 20:25:55.000000000 +0200
 @@ -15,6 +15,7 @@
  #include "clang/Basic/LLVM.h"
  #include "llvm/Config/config.h"
diff --git a/debian/patches/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff
index ff399c4f..4952af0f 100644
--- a/debian/patches/21-searchPathHeaders.diff
+++ b/debian/patches/21-searchPathHeaders.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/ToolChains.cpp	2013-04-12 00:55:55.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp	2013-04-13 10:29:16.117932941 +0200
-@@ -2254,6 +2254,11 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/ToolChains.cpp	2013-05-08 20:25:13.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.cpp	2013-05-08 20:25:56.000000000 +0200
+@@ -2404,6 +2404,11 @@
      addSystemInclude(DriverArgs, CC1Args, P.str());
    }
  
diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
index fc7012d4..28b3e5ed 100644
--- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff
+++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/clang/include/clang/Basic/Builtins.def
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/include/clang/Basic/Builtins.def
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/include/clang/Basic/Builtins.def	2013-01-18 00:46:04.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/clang/include/clang/Basic/Builtins.def	2013-04-13 10:29:23.869932640 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/include/clang/Basic/Builtins.def	2013-05-08 20:25:13.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/include/clang/Basic/Builtins.def	2013-05-08 20:25:56.000000000 +0200
 @@ -464,8 +464,8 @@
  BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
  BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
@@ -24,10 +24,10 @@ Index: llvm-toolchain_3.3~svn179457/clang/include/clang/Basic/Builtins.def
  //   id objc_msgSend(id, SEL, ...)
  LIBBUILTIN(objc_msgSend, "GGH.",   "f",     "objc/message.h", OBJC_LANG)
  // long double objc_msgSend_fpret(id self, SEL op, ...) 
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Sema/SemaChecking.cpp	2013-04-10 08:26:26.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Sema/SemaChecking.cpp	2013-04-13 10:29:23.873932640 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Sema/SemaChecking.cpp	2013-05-08 20:25:13.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Sema/SemaChecking.cpp	2013-05-08 20:25:56.000000000 +0200
 @@ -575,9 +575,10 @@
      return false;
  
@@ -42,11 +42,11 @@ Index: llvm-toolchain_3.3~svn179457/clang/lib/Sema/SemaChecking.cpp
      CheckStrncatArguments(TheCall, FnInfo);
    else
      CheckMemaccessArguments(TheCall, CMId, FnInfo);
-Index: llvm-toolchain_3.3~svn179457/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/AST/Decl.cpp	2013-04-04 06:40:17.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/AST/Decl.cpp	2013-04-13 10:29:23.873932640 +0200
-@@ -2681,10 +2681,10 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/AST/Decl.cpp	2013-05-08 20:25:13.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/AST/Decl.cpp	2013-05-08 20:25:56.000000000 +0200
+@@ -2719,10 +2719,10 @@
    case Builtin::BImemmove:
      return Builtin::BImemmove;
  
@@ -61,10 +61,10 @@ Index: llvm-toolchain_3.3~svn179457/clang/lib/AST/Decl.cpp
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain_3.3~svn179457/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-02-20 23:23:23.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-04-13 10:29:23.877932640 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-05-08 20:25:13.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-05-08 20:25:56.000000000 +0200
 @@ -238,9 +238,9 @@
      case Builtin::BIstrncpy:
      case Builtin::BIstrncat:
diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff
index 50e07d4f..add17ac5 100644
--- a/debian/patches/26-set-correct-float-abi.diff
+++ b/debian/patches/26-set-correct-float-abi.diff
@@ -18,11 +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>
 
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/Tools.cpp	2013-04-13 08:43:15.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp	2013-04-13 10:29:30.445932385 +0200
-@@ -666,7 +666,7 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/Tools.cpp	2013-05-08 04:12:03.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp	2013-05-08 20:25:58.000000000 +0200
+@@ -670,7 +670,7 @@
          FloatABI = "hard";
          break;
        case llvm::Triple::GNUEABI:
diff --git a/debian/patches/27-fix_clang_stdint.diff b/debian/patches/27-fix_clang_stdint.diff
index 8b1d9f1d..adfe2b81 100644
--- a/debian/patches/27-fix_clang_stdint.diff
+++ b/debian/patches/27-fix_clang_stdint.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Headers/stdint.h
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Headers/stdint.h
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Headers/stdint.h	2013-04-13 01:24:56.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Headers/stdint.h	2013-04-13 10:29:28.077932477 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Headers/stdint.h	2013-05-08 20:25:13.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Headers/stdint.h	2013-05-08 20:25:57.000000000 +0200
 @@ -22,8 +22,6 @@
   *
  \*===----------------------------------------------------------------------===*/
diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff
index fff4bb7d..b6696f36 100644
--- a/debian/patches/30-kfreebsd.diff
+++ b/debian/patches/30-kfreebsd.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.h
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.h
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/ToolChains.h	2013-04-09 06:35:11.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.h	2013-04-13 10:29:34.213932239 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/ToolChains.h	2013-04-30 03:21:43.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.h	2013-05-08 20:25:59.000000000 +0200
 @@ -125,6 +125,8 @@
    virtual bool isPICDefault() const;
    virtual bool isPIEDefault() const;
@@ -11,10 +11,10 @@ Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.h
  
  protected:
    virtual Tool *getTool(Action::ActionClass AC) const;
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/ToolChains.cpp	2013-04-13 10:29:16.117932941 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp	2013-04-13 10:29:34.217932239 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/ToolChains.cpp	2013-05-08 20:25:56.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.cpp	2013-05-08 20:25:59.000000000 +0200
 @@ -952,6 +952,13 @@
    return GoodVersion;
  }
diff --git a/debian/patches/31-powerpcspe.diff b/debian/patches/31-powerpcspe.diff
index fa2b8224..db9381eb 100644
--- a/debian/patches/31-powerpcspe.diff
+++ b/debian/patches/31-powerpcspe.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Lex/Makefile	2010-07-18 02:14:47.000000000 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile	2013-04-13 10:29:49.861931633 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Lex/Makefile	2010-07-18 02:14:47.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile	2013-05-08 20:27:20.000000000 +0200
 @@ -17,8 +17,10 @@
  LIBRARYNAME := clangLex
  
diff --git a/debian/patches/33-armhf-defaults.diff b/debian/patches/33-armhf-defaults.diff
index 5d6cf48a..5d36f0e2 100644
--- a/debian/patches/33-armhf-defaults.diff
+++ b/debian/patches/33-armhf-defaults.diff
@@ -18,11 +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>
 
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/Tools.cpp	2013-04-13 10:29:31.945932327 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp	2013-04-13 10:29:51.505931569 +0200
-@@ -489,6 +489,9 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/Tools.cpp	2013-05-08 20:25:58.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp	2013-05-08 20:27:21.000000000 +0200
+@@ -490,6 +490,9 @@
    if (Arg *A = Args.getLastArg(options::OPT_march_EQ)) {
      // Otherwise, if we have -march= choose the base CPU for that arch.
      MArch = A->getValue();
@@ -32,7 +32,7 @@ Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp
    } else {
      // Otherwise, use the Arch from the triple.
      MArch = Triple.getArchName();
-@@ -779,8 +782,19 @@
+@@ -783,8 +786,19 @@
    }
  
    // Honor -mfpu=.
diff --git a/debian/patches/34-powerpc-no-altivec.diff b/debian/patches/34-powerpc-no-altivec.diff
index 2f31f785..d8cd3069 100644
--- a/debian/patches/34-powerpc-no-altivec.diff
+++ b/debian/patches/34-powerpc-no-altivec.diff
@@ -6,10 +6,10 @@ Reviewed-By: Colin Watson <cjwatson@ubuntu.com>
 
 Last-Update: 2013-04-01
 
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Lex/Makefile	2013-04-13 10:29:49.861931633 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile	2013-04-13 10:29:57.785931326 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Lex/Makefile	2013-05-08 20:27:20.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile	2013-05-08 20:27:21.000000000 +0200
 @@ -16,11 +16,5 @@
  
  LIBRARYNAME := clangLex
diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff
index 9a127d5d..04062f3e 100644
--- a/debian/patches/declare_clear_cache.diff
+++ b/debian/patches/declare_clear_cache.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain_3.3~svn179457/lib/Support/Unix/Memory.inc
+Index: llvm-toolchain-snapshot_3.3~svn181457/lib/Support/Unix/Memory.inc
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/lib/Support/Unix/Memory.inc	2013-03-14 20:01:00.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/lib/Support/Unix/Memory.inc	2013-04-13 10:29:48.745931676 +0200
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/Support/Unix/Memory.inc	2013-05-04 20:52:44.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/lib/Support/Unix/Memory.inc	2013-05-08 20:27:20.000000000 +0200
 @@ -329,7 +329,7 @@
    // FIXME: Can we safely always call this for __GNUC__ everywhere?
    const char *Start = static_cast<const char *>(Addr);
diff --git a/debian/patches/profile_rt.diff b/debian/patches/profile_rt.diff
index fabe5be0..1517f205 100644
--- a/debian/patches/profile_rt.diff
+++ b/debian/patches/profile_rt.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/Tools.cpp	2013-04-13 10:29:30.445932385 +0200
-+++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp	2013-04-13 10:29:31.945932327 +0200
-@@ -33,6 +33,7 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/Tools.cpp	2013-05-08 20:25:58.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp	2013-05-08 20:25:58.000000000 +0200
+@@ -34,6 +34,7 @@
  #include "llvm/Support/Host.h"
  #include "llvm/Support/Process.h"
  #include "llvm/Support/raw_ostream.h"
@@ -10,7 +10,7 @@ Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp
  
  using namespace clang::driver;
  using namespace clang::driver::tools;
-@@ -216,7 +217,7 @@
+@@ -217,7 +218,7 @@
    // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
    // not supported by old linkers.
    std::string ProfileRT =
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 6ec06374..3f256ea4 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain_3.3~svn179457/clang/tools/scan-build/scan-build
+Index: llvm-toolchain-snapshot_3.3~svn181457/clang/tools/scan-build/scan-build
 ===================================================================
---- llvm-toolchain_3.3~svn179457.orig/clang/tools/scan-build/scan-build	2013-03-22 00:14:26.000000000 +0100
-+++ llvm-toolchain_3.3~svn179457/clang/tools/scan-build/scan-build	2013-04-13 10:29:44.525931840 +0200
-@@ -1522,7 +1522,7 @@
+--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/tools/scan-build/scan-build	2013-05-02 02:52:46.000000000 +0200
++++ llvm-toolchain-snapshot_3.3~svn181457/clang/tools/scan-build/scan-build	2013-05-08 20:27:18.000000000 +0200
+@@ -1524,7 +1524,7 @@
  
  # Find 'clang'
  if (!defined $AnalyzerDiscoveryMethod) {