diff --git a/arm-remove-xfails.diff b/arm-remove-xfails.diff
new file mode 100644
index 0000000..2cfc1dd
--- /dev/null
+++ b/arm-remove-xfails.diff
@@ -0,0 +1,29 @@
+Those tests do not fail anymore, and unexpected passes
+actually cause make check to fail. (dmueller@suse.com)
+
+--- test/ExecutionEngine/2003-05-06-LivenessClobber.ll
++++ test/ExecutionEngine/2003-05-06-LivenessClobber.ll
+@@ -1,7 +1,6 @@
+ ; This testcase should return with an exit code of 1.
+ ;
+ ; RUN: not %lli %s
+-; XFAIL: arm
+ 
+ @test = global i64 0		; <i64*> [#uses=1]
+ 
+--- test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
++++ test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
+@@ -1,5 +1,4 @@
+ ; RUN: %lli %s > /dev/null
+-; XFAIL: arm
+ 
+ ; This testcase failed to work because two variable sized allocas confused the
+ ; local register allocator.
+--- test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
++++ test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
+@@ -1,5 +1,4 @@
+ ; RUN: %lli %s > /dev/null
+-; XFAIL: arm
+ 
+ ; This testcase exposes a bug in the local register allocator where it runs out
+ ; of registers (due to too many overlapping live ranges), but then attempts to
diff --git a/llvm.changes b/llvm.changes
index 440c3cb..12e6d02 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct  9 11:16:08 UTC 2013 - dmueller@suse.com
+
+- use %arm, not arm in arch conditions 
+- add arm-remove-xfails.diff: remove XFAILs in testsuite
+  that pass and thereby make check fail
+
 -------------------------------------------------------------------
 Fri Sep 27 15:15:58 UTC 2013 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 0f5000b..197512f 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -21,7 +21,7 @@
 %define _supported_archs "AArch64;ARM;PowerPC;X86"
 %define _experimental_archs "R600"
 
-%ifarch arm
+%ifarch %arm
 %define _supported_archs "ARM"
 %endif
 
@@ -62,6 +62,7 @@ Patch9:         aarch64-suse-support.patch
 Patch10:        llvm-no-visibility.patch
 # PATCH-FIX-OPENSUSE llvm-disable-pretty-stack-trace.patch -- https://bugs.freedesktop.org/show_bug.cgi?id=60929
 Patch11:        llvm-disable-pretty-stack-trace.patch
+Patch12:        arm-remove-xfails.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -174,6 +175,7 @@ This package contains vim plugins for LLVM like syntax highlighting.
 %patch10 -p1
 %endif
 %patch11 -p1
+%patch12
 
 # We hardcode i586
 rm tools/clang/test/Driver/x86_features.c
@@ -193,11 +195,11 @@ sed -i s,/lib/,/%{_lib}/,g tools/clang/lib/Driver/Tools.cpp  \
 %endif
 
 # Only enable target archs otherwise llvm-config is messed up
-%ifnarch arm ppc64 s390x
+%ifnarch %arm ppc64 s390x
 sed -i s,"subdirectories = .*","subdirectories = AArch64 ARM PowerPC R600 X86", lib/Target/LLVMBuild.txt
 %endif
 
-%ifarch arm
+%ifarch %arm
 sed -i s,"subdirectories = .*","subdirectories = ARM", lib/Target/LLVMBuild.txt
 %endif
 
@@ -292,7 +294,7 @@ cmake -G "Unix Makefiles" \
       -DLLVM_BINUTILS_INCDIR=/usr/include \
 %endif
       -DLLVM_TARGETS_TO_BUILD=%{_supported_archs} \
-%ifnarch arm ppc64 s390x
+%ifnarch %arm ppc64 s390x
       -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{_experimental_archs} \
 %endif
       -DLLVM_BUILD_TESTS=OFF \