diff --git a/llvm.changes b/llvm.changes
index dbdd061..41b449d 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 29 13:23:32 UTC 2011 - idoenmez@suse.de
+
+- Use %{_lib} macro instead of checking for x86_64
+
 -------------------------------------------------------------------
 Wed Nov 16 14:28:17 UTC 2011 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 4b4a280..d67809c 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -133,7 +133,7 @@ This package contains vim plugins for LLVM like syntax highlighting.
 sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 
 # Nasty hardcoded path
-%ifarch x86_64 
+%if "%{_lib}" == "lib64"
 sed -i s,/lib/LLVMgold.so,/lib64/LLVMgold.so, tools/clang/lib/Driver/Tools.cpp
 %endif
 
@@ -183,8 +183,8 @@ cd stage2
 %makeinstall
 cd ..
 
-# Fixup libdir for x86-64
-%ifarch x86_64
+# Fixup libdir
+%if "%{_lib}" == "lib64"
 sed -i s,ABS_RUN_DIR/lib,ABS_RUN_DIR/lib64, %{buildroot}/%{_bindir}/llvm-config
 %endif