diff --git a/eclipse.spec b/eclipse.spec
index e1885a8..f12d6cf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,5 +1,5 @@
 Epoch:	1
-ExclusiveArch: i386 x86_64 ppc
+ExclusiveArch: i386 x86_64 ppc s390 s390x
 
 %define pkg_summary     An open, extensible IDE
 %define section         free
@@ -34,7 +34,7 @@ ExclusiveArch: i386 x86_64 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M5.10
+Release:        0.M5.11
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -79,6 +79,12 @@ Patch10:	%{name}-icon.patch
 Patch11:	%{name}-libswt-mozilla.patch
 # Copy over the source files first
 Patch12:	%{name}-libswt-mozilla2.patch
+# We can't really commit to doing builds for these arches upstream, but we
+# need at least eclipse-ecj to run on them as it's our bytecode compiler for
+# Fedora.
+Patch13:	%{name}-s390ands390x.patch
+# Stupid spaces in directories ...
+Patch14:	%{name}-s390ands390x2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -203,6 +209,7 @@ SWT Library for GTK2.
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 %patch0 -p0
 %patch11 -p0
+%patch14 -p0
 popd
 %patch1 -p0
 %patch2 -p0
@@ -214,6 +221,7 @@ popd
 %patch9 -p0
 %patch10 -p0
 %patch12 -p0
+%patch13 -p1
 
 # Red Hat splash screen.
 pushd plugins/org.eclipse.platform
@@ -969,6 +977,9 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Mon Mar 07 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.11
+- Add s390 and s390x patches.
+
 * Fri Mar 04 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.10
 - Add proper mozilla version.
 - Don't build eclipseAdaptor.jar.so in order to work around plugin building