diff --git a/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch b/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
new file mode 100644
index 0000000..6b6af48
--- /dev/null
+++ b/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
@@ -0,0 +1,23 @@
+Index: customBuildCallbacks.xml
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.isv/customBuildCallbacks.xml,v
+retrieving revision 1.5
+diff -u -r1.5 customBuildCallbacks.xml
+--- customBuildCallbacks.xml	14 Dec 2005 00:07:22 -0000	1.5
++++ customBuildCallbacks.xml	5 Jun 2006 01:18:34 -0000
+@@ -80,6 +80,15 @@
+ 	</target>
+ 	
+ 	<!-- ===================================================================== -->
++        <!-- Steps to do before the target gather.bin.parts                        -->
++        <!-- Available parameters :                                                -->
++        <!--  destination.temp.folder - the directory plugins will be collected to -->
++        <!--  feature.directory - the directory containing the resulting feature   -->
++        <!-- ===================================================================== -->
++        <target name="pre.gather.bin.parts">
++        </target>
++
++	<!-- ===================================================================== -->
+ 	<!-- Steps to do after the target gather.bin.parts                         -->
+ 	<!-- Available parameters :                                                -->
+ 	<!--   base.dir - root of the project                                      -->
diff --git a/eclipse.spec b/eclipse.spec
index a7261c2..9c0bab0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -45,7 +45,7 @@ Source0:	http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC7-2006060213
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
-Source11:	%{name}-fedora-splash-3.2rc6.png
+Source11:	%{name}-fedora-splash-3.2rc7.png
 Source16:       %{name}-copy-platform.sh
 Source17:       %{name}-efj-wrapper.sh
 %if %{redhat}
@@ -127,9 +127,14 @@ Patch54:	%{name}-swt-rm-ON_TOP.patch
 # We need to disable junit4 and apt until GCJ can handle Java5 code
 Patch55: 	%{name}-disable-junit4-apt.patch
 
+# these patches should be in 3.2 final
+Patch60:	customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
+Patch61:	org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch
+
+
 
 %if %{gcj_support}
-ExcludeArch: ppc64 s390 s390x
+ExcludeArch: s390 s390x ppc64
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
@@ -368,6 +373,14 @@ Source for RCP for use within Eclipse.
 %prep
 %setup -q -c
 
+pushd plugins/org.eclipse.platform.doc.isv
+%patch60 -p0
+%patch61 -p0 
+popd 
+pushd plugins/org.eclipse.platform.doc.user
+%patch60 -p0
+popd
+
 # I hate spaces in paths with patch!
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 %patch0 -p0
@@ -640,11 +653,23 @@ popd
 #  fi
 #done
 
-
 %build
 env
 ORIGCLASSPATH=$CLASSPATH
 
+# nasty hack to get these arches suppport
+%ifarch ppc4 s390 s390x
+  for f in $(find -name \*x86_64\*); do
+    mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
+  done
+  for f in $(find -name \*x86_64\*); do
+    mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
+  done
+  find -type f -exec sed --in-place "s/x86_64/%{_arch}/g" "{}" \;
+%endif 
+
+exit 1
+
 # Bootstrapping is 3 parts:
 # 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
 # 2. Build ecj with gcj-built ecj ("javac")