diff --git a/eclipse.spec b/eclipse.spec
index 27d9f15..a009f7b 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -115,9 +115,9 @@ Patch47:	%{name}-launcher-link.patch
 Patch48:	%{name}-javadoclinks.patch
 
 %if %{gcj_support}
-ExcludeArch: ppc64
+ExcludeArch: ppc64 s390 s390x
 %else
-ExclusiveArch: %{ix86} x86_64 ppc ia64 s390 s390x
+ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -1267,7 +1267,7 @@ fi
 * Wed Jan 04 2006 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_15fc
 - Update s390{,x} patches.
 - Use natively-compiled ecj during build.
-- Attempt build on ia64, s390, and s390x.
+- Attempt build on ia64.
 
 * Fri Dec 23 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_14fc
 - Rebuild again.