diff --git a/eclipse-buildswtnatives.patch b/eclipse-buildswtnatives.patch
new file mode 100644
index 0000000..981f156
--- /dev/null
+++ b/eclipse-buildswtnatives.patch
@@ -0,0 +1,119 @@
+diff -up ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
++++ ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml	2008-07-25 09:08:15.000000000 -0400
+@@ -272,6 +272,11 @@
+ 	</target>
+ 
+ 	<target name="build.cfiles" depends="build.jars">
++		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++		<!--compile swtools.jar in org.eclipse.swt.tools-->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
+ 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
+ 		<!-- assumes the swt.jar has already been built  -->
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+@@ -293,6 +298,7 @@
+ 			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library/"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
++++ ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml	2008-07-25 09:07:58.000000000 -0400
+@@ -141,6 +141,28 @@
+ 		<antcall target="@dot"/>
+ 	</target>
+ 
++	<target name="build.cfiles" depends="init">
++		<mkdir dir="${build.result.folder}/library"/>
++		<copy todir="${build.result.folder}/library">
++			<fileset dir="${plugindir}/Eclipse SWT/common/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
++		</copy>
++	</target>
++
++	<target name="build.nativeLibraries" depends="build.cfiles">
++		<exec dir="${build.result.folder}/library" executable="sh">
++			<env key="OUTPUT_DIR" value="${build.result.folder}"/>
++			<arg line="${build.result.folder}/library/build.sh"/>
++			<arg line="install"/>
++		</exec>
++	</target>
+ 	<target name="src.zip" depends="init" unless="src.zip">
+ 		<mkdir dir="${build.result.folder}/"/>
+ 		<zip zipfile="${build.result.folder}/src.zip">
+@@ -346,4 +368,4 @@
+ 			<mapper type="glob" from="*._properties" to="*.properties"/>
+ 		</move>
+ 	</target>
+-</project>
+\ No newline at end of file
++</project>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
++++ ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml	2008-07-25 09:07:58.000000000 -0400
+@@ -272,6 +272,11 @@
+ 	</target>
+ 
+ 	<target name="build.cfiles" depends="build.jars">
++		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++		<!--compile swtools.jar in org.eclipse.swt.tools-->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
+ 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
+ 		<!-- assumes the swt.jar has already been built  -->
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+@@ -294,6 +299,7 @@
+ 			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
++++ ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml	2008-07-25 09:07:58.000000000 -0400
+@@ -271,6 +271,11 @@
+ 	</target>
+ 
+ 	<target name="build.cfiles" depends="build.jars">
++		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++		<!--compile swtools.jar in org.eclipse.swt.tools-->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
+ 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
+ 		<!-- assumes the swt.jar has already been built  -->
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
++++ ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml	2008-07-25 09:07:58.000000000 -0400
+@@ -149,13 +149,14 @@
+ 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
+ 			<fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
+ 			<fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
+ 			<fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
+ 			<fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
+ 			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
+ 		</copy>
+ 	</target>
+ 
+-	<target name="build.jnilibs" depends="build.cfiles">
++	<target name="build.nativeLibraries" depends="build.cfiles">
+ 		<exec dir="${build.result.folder}/library" executable="sh">
+ 			<env key="OUTPUT_DIR" value="${build.result.folder}"/>
+ 			<arg line="${build.result.folder}/library/build.sh"/>
diff --git a/eclipse-compilelibs-64bit.patch b/eclipse-compilelibs-64bit.patch
deleted file mode 100644
index 9dedfd1..0000000
--- a/eclipse-compilelibs-64bit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up ./build.xml.swtx86_64 ./build.xml
---- ./build.xml.swtx86_64	2008-07-18 16:56:02.000000000 -0400
-+++ ./build.xml	2008-07-18 16:56:50.000000000 -0400
-@@ -72,26 +72,7 @@
- 	</target>
- 
- 	<target name="compilelibs" depends="init,clean,compile" if="libsconfig">
--		<property name="swtlibs" value="${buildDirectory}/swttmp" />
--		<mkdir dir="${swtlibs}" />
--
--		<!-- unzip swt zips -->
--		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="src.zip" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
--		<unzip dest="${swtlibs}">
--			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" >
--				<include name="src.zip" />
--			</fileset>
--		</unzip>
--		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
--			<arg line="build.sh" />
--		</exec>
--		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
--		<mkdir dir="${swtdir}" />
--		<move todir="${swtdir}/">
--			<fileset dir="${swtlibs}">
--				<include name="**/*.so" />
--			</fileset>
--		</move>
-+		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
- 	
- 		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
- 		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
diff --git a/eclipse-compilelibs.patch b/eclipse-compilelibs.patch
deleted file mode 100644
index 62169d6..0000000
--- a/eclipse-compilelibs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.releng.eclipsebuilder
-Index: eclipse/buildConfigs/sdk/srcBuild/build.xml
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v
-retrieving revision 1.21
-diff -u -r1.21 build.xml
---- eclipse/buildConfigs/sdk/srcBuild/build.xml	27 May 2008 19:41:03 -0000	1.21
-+++ eclipse/buildConfigs/sdk/srcBuild/build.xml	21 Jun 2008 23:43:37 -0000
-@@ -1,7 +1,7 @@
- <project name="Eclipse SDK Source Build" default="run" basedir=".">
- 
- 	<!--  default target that runs complete build  -->
--	<target name="run" depends="fetch,insertBuildId,compile,install" />
-+	<target name="run" depends="fetch,insertBuildId,compile,compilelibs,install" />
- 
- 	<!--  all features required to build eclipse sdk and javadoc  -->
- 	<target name="allElements">
-@@ -71,6 +71,53 @@
- 		<record name="compilelog.txt" action="stop" />
- 	</target>
- 
-+	<target name="compilelibs" depends="init,clean,compile" if="libsconfig">
-+		<property name="swtlibs" value="${buildDirectory}/swttmp" />
-+		<mkdir dir="${swtlibs}" />
-+
-+		<!-- unzip swt zips -->
-+		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="src.zip" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
-+		<unzip dest="${swtlibs}">
-+			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" >
-+				<include name="src.zip" />
-+			</fileset>
-+		</unzip>
-+		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
-+			<arg line="build.sh" />
-+		</exec>
-+		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
-+		<mkdir dir="${swtdir}" />
-+		<move todir="${swtdir}/">
-+			<fileset dir="${swtlibs}">
-+				<include name="**/*.so" />
-+			</fileset>
-+		</move>
-+	
-+		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
-+		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
-+			<arg line="build.sh" />
-+		</exec>
-+		<copy file="${launcherlibs}/library/${installWs}/eclipse" todir="${buildDirectory}/eclipse/" />
-+
-+		<property name="launcherfragment" value="org.eclipse.equinox.launcher.${installWs}.${installOs}.${installArch}" />
-+
-+		<copy file="${launcherlibs}/library/${installWs}/eclipse" todir="features/org.eclipse.equinox.executable/contributed/${installWs}/${installOs}/${installArch}/" />
-+		<copy todir="${buildDirectory}/plugins/${launcherfragment}">
-+			<fileset dir="${launcherlibs}/library/${installWs}">
-+				<include name="**/*.so" />
-+			</fileset>
-+		</copy>
-+
-+		<!-- build liblocalfile -->
-+		<exec dir="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}" executable="make" failonerror="true" />
-+		<move file="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.${installOs}.${installArch}/os/${installOs}/${installArch}">
-+		</move>
-+		<!-- build libupdate -->
-+		<ant dir="plugins/org.eclipse.update.core.${installOs}/src" antfile="build.xml" />
-+
-+	</target>
-+
-+
- 	<!--create an installable eclipse runtime-->
- 	<target name="install" depends="init">
- 		<echo message="Assembling..." />
-@@ -174,7 +221,7 @@
- 
- 	<target name="install.eclipse.zip">
- 		<exec dir="${buildDirectory}" executable="unzip" failonerror="true">
--			<arg line="-qq ${buildDirectory}/${buildLabel}/*.zip" />
-+			<arg line="-qq -o ${buildDirectory}/${buildLabel}/*.zip" />
- 		</exec>
- 	</target>
- 
diff --git a/eclipse.spec b/eclipse.spec
index 3aad8c3..0b9f96d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -24,7 +24,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        8%{?dist} 
+Release:        9%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -75,9 +75,14 @@ Source28:       %{name}-mv-Platform.sh
 # tar cjf eclipse-ecj-gcj.tar.bz2 eclipse-gcj
 Source29:       %{name}-ecj-gcj.tar.bz2
 
-# Build swttools.jar
+# Build swttools.jar before generation on 64-bit platforms.
+# Build SWT native libraries
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
-Patch4:         %{name}-swttools.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
+Patch4:         %{name}-buildswtnatives.patch
+Patch32:        %{name}-compilelibs.patch
+
 # This does two things:
 # 1. allows the launcher to be in /usr/bin and
 # 2. ensures that the OSGi configuration directory
@@ -107,12 +112,6 @@ Patch29:        %{name}-memorypermsizeandjvmcrash.patch
 
 Patch31:	%{name}-ia64-packaging.patch
 
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
-Patch32:        %{name}-compilelibs.patch
-# 64-bit systems need to generate the 64-bit JNI code first
-Patch38:        %{name}-compilelibs-64bit.patch
-
 # FIXME:  file these upstream
 # Upstream builds with a 1.4 (or lower) class library
 Patch33:	%{name}-pdeapicasting.patch
@@ -303,16 +302,10 @@ Eclipse Plugin Development Environment runtime plugin (org.eclipse.pde.runtime).
 %prep
 %setup -q -c
 
-%patch32 -p4
-%ifarch x86_64 ppc64 sparc64 ia64 s390x
-%patch38
-%endif
-
 sed --in-place "s/java5.home/java.home/" build.xml
-# Build swttools.jar
-pushd plugins/org.eclipse.swt.gtk.linux.x86_64
+# Build swttools.jar and native libraries
 %patch4 -p0
-popd
+%patch32 -p0
 
 # Use ECJ for GCJ's bytecode compiler
 tar jxf %{SOURCE29}
@@ -420,8 +413,10 @@ sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \
 
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace 
 # the s390x strings with ppc64, etc.
-%ifarch ppc64 sparc sparcv9 sparc64 alpha
+%ifnarch %{ix86} x86_64
   cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}}
+%endif
+%ifarch ppc64 sparc sparcv9 sparc64 alpha
   for f in $(find -name \*s390x\*); do
     tofile=$(echo $f | sed "s/s390x/%{_arch}/")
     cp -rp $f $tofile
@@ -1137,9 +1132,7 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/epl-v10.html
-%ifarch %{ix86} x86_64
 %{_libdir}/%{name}/about.html
-%endif
 %ifarch x86_64
 %{_libdir}/%{name}/about_files
 %endif
@@ -1380,6 +1373,10 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*
 
 %changelog
+* Fri Jul 25 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-9
+- Collapse patches to build SWT native bits into two
+- Copy about* from x86 to all non-x86{_64} platforms
+
 * Wed Jul 23 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-8
 - Don't build for arch/ws/os combos other than the one on which we're
   building