diff --git a/eclipse.spec b/eclipse.spec
index 0d8ff97..6695829 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,6 +1,10 @@
 Epoch:  1
 
+%ifarch %{ix86} x86_64
+%define gcj_support     0
+%else
 %define gcj_support     1
+%endif
 %define tomcatsharedir  %{_datadir}/tomcat5
 %define tomcatlibdir    %{_var}/lib/tomcat5
 %define eclipse_major   3
@@ -548,11 +552,17 @@ ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 # /usr/lib -> /usr/lib64
 sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
+%ifarch x86_64
+sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/amd64:" make_linux.mak
+%else
 sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
+%endif
 popd
 
+%if %{gcj_support}
 # FIXME: figure out what's going on with build.index. 
 find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
+%endif
 
 # the swt version is set to HEAD on ia64 but shouldn't be
 # get swt version
@@ -565,7 +575,7 @@ sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gt
                                                       assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
                                                       features/org.eclipse.rcp/build.xml
 
-## Nasty hack to get suppport for ppc64, s390{,x}, sparc{,64} and alpha
+## Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
 # there is only partial support for ppc64 so we have to remove this 
 # partial support to get the replacemnt hack to work
@@ -577,9 +587,9 @@ find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\
 sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
 # replace final occurances with an existing arch
 sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
-# Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} or alpha dirs and replace 
-# the ia64 strings with ppc64 or s390(x)
-%ifarch ppc64 s390 s390x sparc sparc64 alpha
+# Move all of the ia64 directories to ppc64 or sparc{,64} or alpha dirs and replace 
+# the ia64 strings with ppc64 etc.
+%ifarch ppc64 sparc sparc64 alpha
   for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do 
     mv $f $(echo $f | sed "s/ia64/%{_arch}/")
   done
@@ -758,7 +768,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/features
 # Explode the resulting SDK tarball
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
 cp launchertmp/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
-%ifarch ppc64 s390 s390x sparc sparc64 alpha
+%ifarch ppc64 sparc sparc64 alpha
 cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_datadir}/eclipse
 %endif
 
@@ -812,7 +822,7 @@ PDEDOCUSERVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep pde.doc
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_$PDEDOCUSERVERSION \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
-# Adding support for ppc64, s390{x} and sparc{64} makes the rcp feature 
+# Adding support for ppc64 and sparc{64} makes the rcp feature 
 # have multilib conflicts
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.rcp_* \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/features
@@ -1611,6 +1621,8 @@ fi
 %changelog
 * Tue Aug 28 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-11
 - Require mylyn on all archs except ppc64 alpha.
+- Use IcedTea on x86_64 and x86.
+- Remove hacks for s390{,x} as they are now included in upstream build.
 
 * Tue Aug 28 2007 Andrew Overholt <overholt@redhat.com> 3.3.0-11
 - Symlink to jetty.