diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index baf77b28..35941059 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 21 17:26:36 UTC 2016 - afaerber@suse.de
+
+- Build with spice on all archs. (boo#1009438, michals)
+
 -------------------------------------------------------------------
 Sat Nov 19 15:24:03 UTC 2016 - brogers@suse.com
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index 5ac06402..659c8857 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -66,6 +66,10 @@
 %define with_seccomp 1
 %endif
 
+%if 0%{?suse_version} >= 1140
+%define with_spice 1
+%endif
+
 Name:           qemu-testsuite
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
@@ -262,6 +266,9 @@ BuildRequires:  librdmacm-devel
 %if 0%{?with_seccomp}
 BuildRequires:  libseccomp-devel
 %endif
+%if 0%{?with_spice}
+BuildRequires:  libspice-server-devel
+%endif
 %if 0%{?suse_version} > 1140
 BuildRequires:  libssh2-devel
 %endif
@@ -285,6 +292,9 @@ BuildRequires:  python
 %if 0%{?suse_version} >= 1310
 BuildRequires:  snappy-devel
 %endif
+%if 0%{?with_spice}
+BuildRequires:  spice-protocol-devel
+%endif
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %{?systemd_requires}
@@ -319,12 +329,6 @@ BuildRequires:  xfsprogs-devel
 BuildRequires:  xz-devel
 %endif
 BuildRequires:  zlib-devel
-%if 0%{?suse_version} >= 1140
-%ifarch %ix86 x86_64
-BuildRequires:  libspice-server-devel
-BuildRequires:  spice-protocol-devel
-%endif
-%endif
 %if "%{name}" == "qemu-testsuite"
 BuildRequires:  bc
 BuildRequires:  qemu-arm   = %version
@@ -956,12 +960,8 @@ echo '%{version}' > roms/seabios/.version
 %else
 	--disable-snappy \
 %endif
-%if 0%{?suse_version} >= 1140
-%ifarch %ix86 x86_64
+%if 0%{?with_spice}
 	--enable-spice \
-%else
-	--disable-spice \
-%endif
 %else
 	--disable-spice \
 %endif
diff --git a/qemu.changes b/qemu.changes
index baf77b28..35941059 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 21 17:26:36 UTC 2016 - afaerber@suse.de
+
+- Build with spice on all archs. (boo#1009438, michals)
+
 -------------------------------------------------------------------
 Sat Nov 19 15:24:03 UTC 2016 - brogers@suse.com
 
diff --git a/qemu.spec b/qemu.spec
index 483b882f..e0ea57ef 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -66,6 +66,10 @@
 %define with_seccomp 1
 %endif
 
+%if 0%{?suse_version} >= 1140
+%define with_spice 1
+%endif
+
 Name:           qemu
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
@@ -262,6 +266,9 @@ BuildRequires:  librdmacm-devel
 %if 0%{?with_seccomp}
 BuildRequires:  libseccomp-devel
 %endif
+%if 0%{?with_spice}
+BuildRequires:  libspice-server-devel
+%endif
 %if 0%{?suse_version} > 1140
 BuildRequires:  libssh2-devel
 %endif
@@ -285,6 +292,9 @@ BuildRequires:  python
 %if 0%{?suse_version} >= 1310
 BuildRequires:  snappy-devel
 %endif
+%if 0%{?with_spice}
+BuildRequires:  spice-protocol-devel
+%endif
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %{?systemd_requires}
@@ -319,12 +329,6 @@ BuildRequires:  xfsprogs-devel
 BuildRequires:  xz-devel
 %endif
 BuildRequires:  zlib-devel
-%if 0%{?suse_version} >= 1140
-%ifarch %ix86 x86_64
-BuildRequires:  libspice-server-devel
-BuildRequires:  spice-protocol-devel
-%endif
-%endif
 %if "%{name}" == "qemu-testsuite"
 BuildRequires:  bc
 BuildRequires:  qemu-arm   = %version
@@ -956,12 +960,8 @@ echo '%{version}' > roms/seabios/.version
 %else
 	--disable-snappy \
 %endif
-%if 0%{?suse_version} >= 1140
-%ifarch %ix86 x86_64
+%if 0%{?with_spice}
 	--enable-spice \
-%else
-	--disable-spice \
-%endif
 %else
 	--disable-spice \
 %endif
diff --git a/qemu.spec.in b/qemu.spec.in
index 978a01be..c9e5ccf2 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -66,6 +66,10 @@
 %define with_seccomp 1
 %endif
 
+%if 0%{?suse_version} >= 1140
+%define with_spice 1
+%endif
+
 Name:           qemu
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
@@ -194,6 +198,9 @@ BuildRequires:  librdmacm-devel
 %if 0%{?with_seccomp}
 BuildRequires:  libseccomp-devel
 %endif
+%if 0%{?with_spice}
+BuildRequires:  libspice-server-devel
+%endif
 %if 0%{?suse_version} > 1140
 BuildRequires:  libssh2-devel
 %endif
@@ -217,6 +224,9 @@ BuildRequires:  python
 %if 0%{?suse_version} >= 1310
 BuildRequires:  snappy-devel
 %endif
+%if 0%{?with_spice}
+BuildRequires:  spice-protocol-devel
+%endif
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %{?systemd_requires}
@@ -251,12 +261,6 @@ BuildRequires:  xfsprogs-devel
 BuildRequires:  xz-devel
 %endif
 BuildRequires:  zlib-devel
-%if 0%{?suse_version} >= 1140
-%ifarch %ix86 x86_64
-BuildRequires:  libspice-server-devel
-BuildRequires:  spice-protocol-devel
-%endif
-%endif
 %if "%{name}" == "qemu-testsuite"
 BuildRequires:  bc
 BuildRequires:  qemu-arm   = %version
@@ -820,12 +824,8 @@ echo '%{version}' > roms/seabios/.version
 %else
 	--disable-snappy \
 %endif
-%if 0%{?suse_version} >= 1140
-%ifarch %ix86 x86_64
+%if 0%{?with_spice}
 	--enable-spice \
-%else
-	--disable-spice \
-%endif
 %else
 	--disable-spice \
 %endif