diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index e1e00a7..e5fa70f 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -21,7 +21,7 @@ Epoch: 1
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_2fc
+Release: 	1jpp_3fc
 License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
 Group: 		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.eclipse.org/cdt
@@ -125,7 +125,7 @@ java -cp  $SDK/startup.jar \
     -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
     -DdontFetchAnything=true 
 
-if ! [ -e $(pwd)/org.eclipse.cdt.releng/results/org.eclipse.cdt-*-linux.%{eclipse_arch}* ]; then
+if ! [ -e $(pwd)/org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}* ]; then
      buildArch="x86"
 else
      buildArch=%{eclipse_arch}
@@ -137,7 +137,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
 
-if ! [ -e $(pwd)/org.eclipse.cdt.releng/results/org.eclipse.cdt-*-linux.%{eclipse_arch}* ]; then
+if ! [ -e $(pwd)/org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}* ]; then
      buildArch="x86"
 else
      buildArch=%{eclipse_arch}
@@ -187,8 +187,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{eclipse_base}/features/org.eclipse.cdt*
 %{eclipse_base}/plugins/org.eclipse.cdt*
-%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.x86_%{version}/os/linux/x86/libpty.so
-%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.x86_%{version}/os/linux/x86/libspawner.so
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_%{version}/os/linux/%{eclipse_arch}
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
@@ -232,6 +231,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Dec 30 2005 Andrew Overholt <overholt@redhat.com> 3.0.1-1jpp_3fc
+- Fix %%files section to not be x86-specific.
+
 * Fri Dec 16 2005 Andrew Overholt <overholt@redhat.com> 3.0.1-1jpp_2fc
 - Build against gcc 4.1.