diff --git a/clang-fix-mips-test.patch b/clang-fix-mips-test.patch
deleted file mode 100644
index 55ef9ca..0000000
--- a/clang-fix-mips-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: llvm/tools/clang/test/Driver/linux-ld.c
-===================================================================
---- llvm.orig/tools/clang/test/Driver/linux-ld.c
-+++ llvm/tools/clang/test/Driver/linux-ld.c
-@@ -194,14 +194,14 @@
- // RUN:   | FileCheck --check-prefix=CHECK-MIPS %s
- // CHECK-MIPS: "{{.*}}ld{{(.exe)?}}"
- // CHECK-MIPS: "-m" "elf32btsmip"
--// CHECK-MIPS: "-dynamic-linker" "{{.*}}/lib/ld.so.1"
-+// CHECK-MIPS: "-dynamic-linker" "{{.*}}/lib64/ld.so.1"
- // CHECK-MIPS-NOT: "--hash-style={{gnu|both}}"
- // RUN: %clang %s -### -o %t.o 2>&1 \
- // RUN:     -target mipsel-linux-gnu -ccc-clang-archs mipsel \
- // RUN:   | FileCheck --check-prefix=CHECK-MIPSEL %s
- // CHECK-MIPSEL: "{{.*}}ld{{(.exe)?}}"
- // CHECK-MIPSEL: "-m" "elf32ltsmip"
--// CHECK-MIPSEL: "-dynamic-linker" "{{.*}}/lib/ld.so.1"
-+// CHECK-MIPSEL: "-dynamic-linker" "{{.*}}/lib64/ld.so.1"
- // CHECK-MIPSEL-NOT: "--hash-style={{gnu|both}}"
- // RUN: %clang %s -### -o %t.o 2>&1 \
- // RUN:     -target mips64-linux-gnu -ccc-clang-archs mips64 \
diff --git a/llvm.changes b/llvm.changes
index bbb9826..967c8b7 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -25,6 +25,7 @@ Mon Nov 12 08:05:08 UTC 2012 - idonmez@suse.com
   * pr13141.patch
   * pr13303.patch
   * rewrite-includes.patch
+  * clang-fix-mips-test.patch (fixed differently in spec file)
 
 -------------------------------------------------------------------
 Sat Oct 27 06:01:06 UTC 2012 - coolo@suse.com
diff --git a/llvm.spec b/llvm.spec
index f183cc9..627ef28 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -37,7 +37,6 @@ Patch2:         assume-opensuse.patch
 Patch3:         clang-disable-ada-extension.patch
 # PATCH-FIX-OPENSUSE default-to-i586.patch -- Use i586 as default target for 32bit
 Patch4:         default-to-i586.patch
-Patch5:         clang-fix-mips-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -127,13 +126,15 @@ This package contains vim plugins for LLVM like syntax highlighting.
 %endif
 %patch3 -p1
 %patch4 -p1
-%ifarch x86_64
-%patch5 -p1
-%endif
 
 # We hardcode i586
 rm tools/clang/test/Driver/x86_features.c
 
+# lib64 related problems on 64bit
+%if "%{_lib}" == "lib64"
+rm tools/clang/test/Driver/linux-ld.c
+%endif
+
 sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp