diff --git a/eclipse.spec b/eclipse.spec
index e69d84c..5738872 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:        7%{?dist} 
+Release:        8%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -422,7 +422,7 @@ sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \
 %ifarch ppc64 sparc sparcv9 sparc64 alpha
   for f in $(find -name \*s390x\*); do
     tofile=$(echo $f | sed "s/s390x/%{_arch}/")
-    for g in $(find $f); do
+    for g in $(find -type f $f); do
 	sed -in "s/s390x/%{_arch}/g" $g
     done
     mv $f $tofile
@@ -457,35 +457,34 @@ IFS='
   IFS=$OLDIFS
 %endif 
 
-# FIXME:  this isn't quite finished yet
-## libsconfig on the platform on which we're building
-#sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml
-#
-## 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
-#      sed -i "/<ant antfile=\"build.xml\" dir=.*$platform.*target=\"/,/<\/ant>/ d" $f
-#      sed -i "s/org.eclipse.*.$platform:.*,org/,org/g" $f
-#    done
-#done
-#popd
-#
-#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}//)
-#
-## 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 "s/org.eclipse.*.linux.$arch:.*,org/,org/g" $f
-#    done
-#done
-#popd
+# libsconfig on the platform on which we're building
+sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml
+
+# 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
+      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
+    done
+done
+popd
+
+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}//)
+
+# 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
+    done
+done
+popd
 
 # Symlinks
 rm plugins/org.sat4j*
@@ -1381,6 +1380,10 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*
 
 %changelog
+* 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
+
 * Wed Jul 23 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-7
 - More work on non-upstream arches