diff --git a/piglit.changes b/piglit.changes
index e300354..29d4505 100644
--- a/piglit.changes
+++ b/piglit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 16 10:03:19 UTC 2017 - mpluskal@suse.com
+
+- Build only on 64 bit architectures
+
 -------------------------------------------------------------------
 Wed Feb 08 09:55:33 UTC 2017 - mimi.vx@gmail.com
 
diff --git a/piglit.spec b/piglit.spec
index c027c93..d123bfb 100644
--- a/piglit.spec
+++ b/piglit.spec
@@ -56,7 +56,7 @@ Requires:       python3-Mako
 Requires:       python3-numpy
 Requires:       python3-six
 Requires:       python3-xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Excludearch:    %{ix86} %{arm} ppc
 
 %description
 OpenGL driver testing framework
@@ -80,15 +80,11 @@ OpenGL driver testing framework
 # Note: Overwriting CMAKE_SKIP_RPATH to be off,  but enabling
 # CMAKE_BUILD_WITH_INSTALL_RPATH so the individual test binaries in
 # /usr/lib64/piglit/bin/* can find the libraries in /usr/lib64/piglit/lib
-%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
-    -DCMAKE_SKIP_RPATH:BOOL=OFF -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-
-# Test: Disabled smp flags to try to prevent out of memory on i586 build machines in buildservice.
-%ifarch %{ix86}
+%cmake \
+  -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
+  -DCMAKE_SKIP_RPATH:BOOL=OFF \
+  -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
 make %{?_smp_mflags}
-%else
-make %{?_smp_mflags}
-%endif
 
 %install
 %cmake_install