diff --git a/eclipse.spec b/eclipse.spec
index d03f4ad..518ecf5 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,5 +1,5 @@
 Epoch:	1
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 
 %define pkg_summary     An open, extensible IDE
 %define section         free
@@ -15,17 +15,26 @@ ExclusiveArch: i386 x86_64
 %ifarch %{ix86}
 %define eclipse_arch    x86
 %endif
-%ifarch ppc64pseries
+%ifarch x86_64
+%define eclipse_arch	x86_64
+%endif
+%ifarch ia64
+%define eclipse_arch	ia64
+%endif
+%ifarch ppc
+%define eclipse_arch	ppc
+%endif
+%ifarch ppc64
 %define eclipse_arch	ppc64
 %endif
-%ifarch x86_64
-%define eclipse_arch	amd64
+%ifarch ppc64pseries
+%define eclipse_arch	ppc64
 %endif
 
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M5.7
+Release:        0.M5.8
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -64,6 +73,7 @@ Patch7:		%{name}-nobootstrapbuild.patch
 Patch8:		%{name}-antsecuritymanager.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=86571
 Patch9:		%{name}-pdebuildtarargs.patch
+Patch10:	%{name}-icon.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -72,8 +82,8 @@ BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  glib2-devel
-BuildRequires:	gcc4-java >= 4.0.0-0.27
-BuildRequires:	java-1.4.2-gcj4-compat-devel >= 1.4.2.0-2jpp
+BuildRequires:	gcc-java >= 4.0.0-0.30
+BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_1rh
 
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 #BuildRequires: ant-apache-bsf ant-commons-net ant-jsch lucene 
@@ -94,7 +104,7 @@ Summary:        Eclipse Compiler for Java
 Group:          Development/Languages
 Obsoletes:	ecj
 Provides:	ecj
-Requires:	gcc4-java >= 4.0.0-0.27
+Requires:	gcc-java >= 4.0.0-0.30
 
 %description    ecj
 Eclipse compiler for Java.
@@ -109,7 +119,7 @@ Provides:       %{name}-ui = %{epoch}:%{version}-%{release}
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:	java >= 1.4.2
 Requires:       /usr/bin/perl
-Requires:	gcc4-java >= 4.0.0-0.27
+Requires:	gcc-java >= 4.0.0-0.30
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:       /usr/bin/mozilla
 
@@ -138,7 +148,7 @@ Summary:        Eclipse Java development tools
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-ecj = %{epoch}:%{version}-%{release}
-Requires:	gcc4-java >= 4.0.0-0.27
+Requires:	gcc-java >= 4.0.0-0.30
 
 %description    jdt
 Eclipse Java developments tools.
@@ -156,7 +166,7 @@ Summary:        Eclipse PDE
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-platform-devel = %{epoch}:%{version}-%{release}
-Requires:	gcc4-java >= 4.0.0-0.27
+Requires:	gcc-java >= 4.0.0-0.30
 
 %package        pde-devel
 Summary:        Eclipse PDE Source
@@ -194,6 +204,7 @@ popd
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p0
 
 # Red Hat splash screen.
 pushd plugins/org.eclipse.platform
@@ -305,17 +316,23 @@ ln -sf %{_javadir}/junit.jar plugins/org.junit/junit.jar
 %build
 
 export CLASSPATH=jdtcore.jar:jdtCompilerAdapter.jar:$CLASSPATH
+gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+  -o jdtcore.jar.so jdtcore.jar
+ln -s jdtcore.jar.so lib-org-eclipse-jdt-core.so
+ln -s jdtcore.jar.so lib-org-eclipse-jdt-internal-compiler.so
+export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
+
 # Build jdtcore.jar and jdtCompilerAdapter.jar
 ant \
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
   bootstrap
 
 # Build a native ecj
-gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
   -o jdtcore.jar.so jdtcore.jar
-gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
   -o jdtCompilerAdapter.jar.so jdtCompilerAdapter.jar
-gcj4 -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
   jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
 ln -s jdtcore.jar.so lib-org-eclipse-jdt.so
 
@@ -341,14 +358,14 @@ for j in `find -name \*.jar`; do
     d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
     mkdir -p $d;
     s=`echo $j | sed "s:\./::"`;
-    gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
       -o $d/`basename $j`.so $j;
 done
 
 ## Remove ecj binary and re-build it
 #rm ../../ecj
 #pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
-#  gcj4 -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+#  gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
 #    -Wl,-R,%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 \
 #    jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
 #popd
@@ -395,7 +412,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings
 
 ## Rebuild ecj binary
 ## FIXME:  is this the best place for this?
-#gcj4 -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+#gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
 #  $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtCompilerAdapter.jar.so \
 #  $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar.so \
 #  -o $RPM_BUILD_ROOT%{_bindir}/ecj
@@ -575,14 +592,14 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar
 ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
 
 # Create the main gcj db
-gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.db 80000
+gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.db 80000
 
 # Create the gcj dbs for libswt, ecj, platform, jdt, and pde
-gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/libswt3-gtk2.db 80000
-gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/ecj.db 80000
-gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/platform.db 80000
-gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/jdt.db 80000
-gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/pde.db 80000
+gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/libswt3-gtk2.db 80000
+gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/ecj.db 80000
+gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/platform.db 80000
+gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/jdt.db 80000
+gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/pde.db 80000
 
 # Copy these file lists for use at install time
 install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -599,75 +616,75 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclip
 rm -rf $RPM_BUILD_ROOT
 
 %post ecj
-gcj-dbtool4 -a %{_libdir}/%{name}/mappings/ecj.db \
+gcj-dbtool -a %{_libdir}/%{name}/mappings/ecj.db \
   %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
   %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar.so
-gcj-dbtool4 -a %{_libdir}/%{name}/mappings/ecj.db \
+gcj-dbtool -a %{_libdir}/%{name}/mappings/ecj.db \
   %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar \
   %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar.so
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %post jdt
 for j in `cat %{_libdir}/%{name}/%{name}-jdt.jarswithnativelibs`; do
-    gcj-dbtool4 -a %{_libdir}/%{name}/mappings/jdt.db \
+    gcj-dbtool -a %{_libdir}/%{name}/mappings/jdt.db \
       $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
 done
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %post pde
 for j in `cat %{_libdir}/%{name}/%{name}-pde.jarswithnativelibs`; do
-    gcj-dbtool4 -a %{_libdir}/%{name}/mappings/pde.db \
+    gcj-dbtool -a %{_libdir}/%{name}/mappings/pde.db \
       $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
 done
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %post platform
 for j in `cat %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs`; do
-    gcj-dbtool4 -a %{_libdir}/%{name}/mappings/platform.db \
+    gcj-dbtool -a %{_libdir}/%{name}/mappings/platform.db \
       $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
 done
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %post -n %{libname}-gtk2
 for j in `cat %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs`; do
-    gcj-dbtool4 -a %{_libdir}/%{name}/mappings/libswt3-gtk2.db \
+    gcj-dbtool -a %{_libdir}/%{name}/mappings/libswt3-gtk2.db \
       $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
 done
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %postun ecj
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %postun jdt
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %postun pde
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %postun platform
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 %postun -n %{libname}-gtk2
 if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
+    gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
 fi
 
 # FIXME:  add the native directories to these lists
@@ -915,6 +932,12 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Tue Mar 01 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.8
+- Add ia64, ppc, and ppc64.
+- Add patch to copy over icon for unsupported (upstream) platforms but don't
+  include the source for the launcher.
+- gcc4 -> gcc changes.
+
 * Fri Feb 25 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.7
 - Add tar args patch (e.o #86571).
 - New build bootstrapping patches.