diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 4e013eab..8e885e8e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -72,10 +72,10 @@ fi
 
 if test -n "$RCRELEASE"; then
     VERSION=$MAJOR_VERSION"+"$REVISION # WAS TAG
-    FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION
+    FULL_VERSION="llvm-toolchain"$MAJOR_VERSION"_"$VERSION
 else
     VERSION=$MAJOR_VERSION"~svn"$REVISION
-    FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION
+    FULL_VERSION="llvm-toolchain-snapshot_"$VERSION
 fi
 
 # LLVM
diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
index 5c530539..38921e00 100644
--- a/debian/patches/0003-Debian-version-info-and-bugreport.patch
+++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch
@@ -1,9 +1,9 @@
-Index: llvm-toolchain-snapshot_3.5~svn200375/lib/Support/CommandLine.cpp
+Index: llvm-toolchain-snapshot_3.5~svn211104/lib/Support/CommandLine.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn200375.orig/lib/Support/CommandLine.cpp	2014-01-29 07:45:46.092720538 -0800
-+++ llvm-toolchain-snapshot_3.5~svn200375/lib/Support/CommandLine.cpp	2014-01-29 07:45:46.092720538 -0800
-@@ -1691,6 +1691,10 @@
-     OS << LLVM_VERSION_INFO;
+--- llvm-toolchain-snapshot_3.5~svn211104.orig/lib/Support/CommandLine.cpp
++++ llvm-toolchain-snapshot_3.5~svn211104/lib/Support/CommandLine.cpp
+@@ -1702,6 +1702,10 @@ public:
+     OS << " " << LLVM_VERSION_INFO;
  #endif
      OS << "\n  ";
 +#ifdef LLVM_DEBIAN_INFO
diff --git a/debian/patches/force-link-pass.o.diff b/debian/patches/force-link-pass.o.diff
new file mode 100644
index 00000000..f56b840b
--- /dev/null
+++ b/debian/patches/force-link-pass.o.diff
@@ -0,0 +1,28 @@
+Index: llvm-toolchain-snapshot_3.5~svn211089/tools/bugpoint/Makefile
+===================================================================
+--- llvm-toolchain-snapshot_3.5~svn211089.orig/tools/bugpoint/Makefile
++++ llvm-toolchain-snapshot_3.5~svn211089/tools/bugpoint/Makefile
+@@ -12,6 +12,9 @@ TOOLNAME := bugpoint
+ LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \
+                    bitwriter irreader vectorize objcarcopts codegen
+ 
++# Crappy workaround to make sure it links correctly.
++LLVMLibsOptions := ../../lib/IR/Release/Pass.o
++
+ # Support plugins.
+ NO_DEAD_STRIP := 1
+ 
+Index: llvm-toolchain-snapshot_3.5~svn211089/tools/opt/Makefile
+===================================================================
+--- llvm-toolchain-snapshot_3.5~svn211089.orig/tools/opt/Makefile
++++ llvm-toolchain-snapshot_3.5~svn211089/tools/opt/Makefile
+@@ -10,7 +10,9 @@
+ LEVEL := ../..
+ TOOLNAME := opt
+ LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen
++# Crappy workaround to make sure it links correctly.
+ 
++LLVMLibsOptions := ../../lib/IR/Release/Pass.o
+ # Support plugins.
+ NO_DEAD_STRIP := 1
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e5b9e233..2f3905fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,6 +36,6 @@ disable-display-PASS-UNSUPPORTED-XFAIL.diff
 lldb-link-atomic.diff
 fix-llvm-config-obj-src-root.patch
 suffixsvn.diff
-scan-build-fix-clang-detection.diff
 compiler-rt-path.diff
 lldb-soname.diff
+force-link-pass.o.diff