diff --git a/eclipse.spec b/eclipse.spec
index 5738872..0330472 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -339,19 +339,20 @@ pushd features/org.eclipse.equinox.executable
 zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
 popd
 
-# use our system-installed javadocs
-sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
+# Use our system-installed javadocs, reference only what we built, and
+# don't like to osgi.org docs (FIXME:  maybe we should package them?)
+sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
+   -e "/osgi\.org/d" \
    plugins/org.eclipse.platform.doc.isv/platformOptions.txt
-sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \
-   plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt                     \
+sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \
+   -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
+   plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt \
    plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
-sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
-   plugins/org.eclipse.pde.doc.user/pdeOptions.txt                       \
+sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
+   -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
    plugins/org.eclipse.pde.doc.user/pdeOptions
 
-# FIXME:  package these?
-grep -rl bundles.osgi.org * | xargs sed -i "/bundles.osgi.org/d"
-
 #%patch14 -p0
 
 pushd plugins/org.eclipse.pde.build
@@ -420,6 +421,7 @@ sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \
 # Move 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
+  cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}}
   for f in $(find -name \*s390x\*); do
     tofile=$(echo $f | sed "s/s390x/%{_arch}/")
     for g in $(find -type f $f); do
@@ -455,17 +457,15 @@ IFS='
     done
   popd
   IFS=$OLDIFS
-%endif 
 
-# libsconfig on the platform on which we're building
-sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml
+%endif 
 
 # Don't build for non-linux,gtk,%%{_arch} targets
 pushd features
 for f in */build.xml; do
-    for platform in win32 macosx hpux solaris aix qnx motif; do
+    for platform in win32 macosx carbon hpux solaris aix qnx motif; do
       sed -i "/<ant antfile=\"build.xml\" dir=.*$platform.*target=\"/,/<\/ant>/ d" $f
-      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Iv\-]\+,//g" $f
+      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Ivf\-]\+,//g" $f
     done
 done
 popd
@@ -474,14 +474,14 @@ arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
   features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
   '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
 
-arches=$(echo $arches | sed s/%{_arch}//)
+arches=$(echo $arches | sed s/%{eclipse_arch}//)
 
 # Don't build for arches other than the one on which we're building
 pushd features
 for f in */build.xml; do
     for arch in $arches; do
-      sed -i "/<ant antfile=\"build.xml\" dir=.*$arch.*target=\"/,/<\/ant>/ d" $f
-      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9I\.v\-]\+,//g" $f
+      sed -i "/<ant antfile=\"build.xml\" dir=.*$arch\" target=\"/,/<\/ant>/ d" $f
+      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch:0.0.0,[0-9I\.vf\-]\+,//g" $f
     done
 done
 popd