diff --git a/qemu.changes b/qemu.changes
index 46e7c54d..bdf0c195 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep  3 18:07:21 CEST 2009 - uli@suse.de
+
+- disable S/390 target on 32-bit platforms
+
 -------------------------------------------------------------------
 Mon Aug 11 14:44:48 CEST 2009 - uli@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index a41141ba..cc655bf4 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -25,7 +25,7 @@ License:        BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later
 Group:          System/Emulators/PC
 Summary:        Universal CPU emulator
 Version:        0.11.0
-Release:        1
+Release:        2
 Source:         %name-0.11.0-rc1.tar.bz2
 Patch1:         0001-qemu-0.7.0-amd64.patch
 Patch2:         0002-qemu-0.9.0.cvs-binfmt.patch
@@ -101,7 +101,10 @@ Authors:
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%ifarch s390x ppc64 x86_64
+# s390 target only builds on 64-bit machines
 %patch22 -p1
+%endif
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1