diff --git a/eclipse-addfragmentsforotherplatforms.patch b/eclipse-addfragmentsforotherplatforms.patch
new file mode 100644
index 0000000..75f0bea
--- /dev/null
+++ b/eclipse-addfragmentsforotherplatforms.patch
@@ -0,0 +1,33 @@
+--- assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2007-11-21 13:50:10.000000000 -0500
++++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2007-11-21 13:51:56.000000000 -0500
+@@ -122,6 +122,9 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.core" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
++		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.launcher.gtk.linux.ia64" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -281,6 +284,9 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.user" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
++		<ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.ia64" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.console" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -732,6 +738,10 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
++			<param name="elementName" value="org.eclipse.core.filesystem.linux.ia64_1.1.0.v20070416"/>
++		</antcall>
++		<antcall target="jarUp">
++			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.ui.console_3.2.1.v20070824_r331"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
diff --git a/eclipse.spec b/eclipse.spec
index f1298d5..6796863 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -19,7 +19,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        5%{?dist} 
+Release:        6%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -75,6 +75,7 @@ Patch7:         %{name}-tomcat55-build.patch
 Patch17:        %{name}-ecj-gcj.patch
 Patch24:        %{name}-add-ppc64-sparc64-s390-s390x.patch
 Patch28:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
+Patch30:        %{name}-addfragmentsforotherplatforms.patch
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=198840
 Patch25: 	%{name}-launcher-double-free-bug.patch
 #FIXME: file a bug upstream
@@ -169,6 +170,8 @@ Requires:           libgcj >= 4.0.2
 Requires(post):     java-gcj-compat >= 1.0.64
 Requires(postun):   java-gcj-compat >= 1.0.64
 %endif
+# %{_libdir}/java directory owned by jpackage-utils
+Requires:       jpackage-utils
 Requires:       gtk2
 Requires:       firefox
 Conflicts:      mozilla
@@ -530,28 +533,52 @@ sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gt
                                                       features/org.eclipse.rcp/build.xml
 %patch29
 
-## Nasty hack to get suppport for ppc64, sparc{,64} and alpha
+# Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
 %patch28
+%patch30
 # there is only partial support for ppc64 so we have to remove this 
-# partial support to get the replacemnt hack to work
+# partial support to get the replacement hack to work
 find -name \*ppc64\* | xargs rm -r
 # remove ppc64 support from features/org.eclipse.platform.source/feature.xml
 # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
 find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
 # remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq
-sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
+# FIXME:  do we still need this?
+#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 sparc{,64} or alpha dirs and replace 
+# FIXME:  do we still need this?
+#sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
+# Move all of the ia64 directories and files 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}/")
+  for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do
+    tofile=$(echo $f | sed "s/ia64/%{_arch}/")
+    mv $f $tofile
+#    sed --in-place "s/ia64/%{_arch}/g" $tofile
   done
-  find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \;
-  find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64/%{_arch}/g" "{}" \;
-  find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
+  OLDIFS=$IFS
+IFS='
+'
+  for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
+  -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
+  \*.exe -a ! -name \*.pm -a ! -name \*.jpg); do
+   sed -i -e "s/ia64_32/@eye-eh-64_32@/g" -e "s/ia64/%{_arch}/g" -e "s/@eye-eh-64_32@/ia64_32/g" $f
+  done
+  # Copy over the fragments for these arches
+  cp -pr plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}}
+  pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
+    for f in $(find -type f); do
+      sed -i -e "s/ppc/%{_arch}/g" $f
+    done
+  popd
+  cp -pr plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}}
+  pushd plugins/org.eclipse.core.filesystem.linux.%{_arch}
+    for f in $(find -type f); do
+      sed -i -e "s/ppc/%{_arch}/g" $f
+    done
+  popd
+  IFS=$OLDIFS
 %endif 
 
 # remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
@@ -747,7 +774,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
 cp eclipse/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
 %ifarch ppc64 sparc sparc64 alpha
-cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_datadir}/eclipse
+cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_libdir}/eclipse
 %endif
 
 # Install 1.6 plugins when building with IcedTea
@@ -1375,9 +1402,7 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
 %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform
 %{_datadir}/%{name}/features/org.fedoraproject.ide-feature
-%ifarch %{ix86} x86_64 ppc
 %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
-%endif
 %{_datadir}/%{name}/plugins/org.eclipse.core.net_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.resources_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
@@ -1586,6 +1611,12 @@ fi
 %endif
 
 %changelog
+* Mon Nov 19 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-6
+- Require jpackage-utils (courtesy Patrice Dumas).
+- Fix ppc64 (and hopefully other unsupported-by-upstream arches).
+- Move eclipse.ini to %%{_libdir}/eclipse where it gets read.
+- Resolves:  rhbz#394161.
+
 * Fri Nov 16 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-5
 - Remove extraneous build.index comment (from test build again).
 
@@ -1594,6 +1625,7 @@ fi
 
 * Fri Nov 16 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-3
 - Update tomcat patches.
+- Resolves:  rhbz#380121.
 
 * Wed Nov 14 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-2
 - Bump release to tag non-corrupted source zip.