diff --git a/eclipse.spec b/eclipse.spec
index 61f7de8..97121d8 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -556,20 +556,6 @@ 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
 
-# remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
-for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
-  version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
-  sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
-  linenum=$(grep -no $plugin features/org.eclipse.jdt/build.xml | cut -d : -f 1)
-  sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
-  linenum=$(grep -no $plugin features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
-  sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
-  linenum=$(grep -no "dir=\"plugins/org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
-  sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
-  linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
-  sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
-done
-
 # we don't have ant 1.7 right now
 sed --in-place "s|\(initialValue = request.getDefaultValue\)|// \1|" \
   plugins/org.eclipse.ant.ui/Ant\ Runner\ Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java
@@ -599,6 +585,20 @@ sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
   find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
 %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
+for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
+  version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
+  sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
+  linenum=$(grep -no $plugin features/org.eclipse.jdt/build.xml | cut -d : -f 1)
+  sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
+  linenum=$(grep -no $plugin features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
+  sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
+  linenum=$(grep -no "dir=\"plugins/org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+  sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+  linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+  sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+done
+
 # link to the jsch jar
 rm plugins/com.jcraft.jsch_0.1.31.jar
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
@@ -704,7 +704,7 @@ pushd build/plugins/org.eclipse.equinox.initializer
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
      -Duser.home=$homedir                              \
       org.eclipse.core.launcher.Main \
-     -debug -application org.eclipse.ant.core.antRunner       \
+     -application org.eclipse.ant.core.antRunner       \
      -f build.xml build.update.jar
 popd
 popd
@@ -726,6 +726,9 @@ 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
+%ifarch ppc64 s390 s390x sparc sparc64
+cp launchertmp/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
+%endif
 
 # Add a compatibility symlink to startup.jar
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}