diff --git a/pixman.changes b/pixman.changes
index ed06c14..34967da 100644
--- a/pixman.changes
+++ b/pixman.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Aug  6 16:26:03 UTC 2009 - jansimon.moeller@opensuse.org
+
+- Add separate ifarch for armv5 and armv7 to be able to switch 
+  neon on v7 lateron.
+
+-------------------------------------------------------------------
+Sun Aug  2 10:11:42 UTC 2009 - jansimon.moeller@opensuse.org
+
+- add ifarch's for ARM, disabling neon usage atm for both v5 and v7.
+
 -------------------------------------------------------------------
 Sat Jul 25 00:25:34 CEST 2009 - captain.magnus@opensuse.org
 
diff --git a/pixman.spec b/pixman.spec
index 001bcc6..93c2484 100644
--- a/pixman.spec
+++ b/pixman.spec
@@ -20,7 +20,7 @@
 
 Name:           pixman
 Version:        0.15.18
-Release:        1
+Release:        2
 License:        MIT License (or similar)
 BuildRequires:  pkgconfig
 Url:            http://xorg.freedesktop.org/
@@ -72,7 +72,18 @@ Authors:
 
 %build
 #autoreconf -fi
-%configure --disable-static
+#
+#Note about the ifarchs for arm: armv5 has no neon (like mmx on x86), but on armv7 neon is available on most boards.
+# Thus make it possible to switch it on for v7 on its own.
+# For now: disable neon on both
+%configure \
+%ifarch armv5el armv5tel
+       --disable-arm-neon \
+%endif
+%ifarch armv7el armv7l
+       --disable-arm-neon \
+%endif
+       --disable-static
 make %{?jobs:-j%jobs}
 
 %install