diff --git a/eclipse.spec b/eclipse.spec
index ef9298b..3ca7c3e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -12,25 +12,6 @@ ExclusiveArch: i386 x86_64 ppc s390x
 %define libname         libswt3
 %define build_id        I20050219-1500
 
-%ifarch %{ix86}
-%define eclipse_arch    x86
-%endif
-%ifarch x86_64
-%define eclipse_arch	x86_64
-%endif
-%ifarch ia64
-%define eclipse_arch	ia64
-%endif
-%ifarch ppc
-%define eclipse_arch	ppc
-%endif
-%ifarch ppc64
-%define eclipse_arch	ppc64
-%endif
-%ifarch ppc64pseries
-%define eclipse_arch	ppc64
-%endif
-
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
@@ -341,7 +322,7 @@ export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
 
 # Build jdtcore.jar and jdtCompilerAdapter.jar
 ant \
-  -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
+  -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{_arch} \
   bootstrap
 
 # Build a native ecj
@@ -366,13 +347,13 @@ export CLASSPATH=jdtcore.jar:jdtCompilerAdapter.jar:$CLASSPATH
 
 ant \
   -Dnobootstrap=true \
-  -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
+  -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{_arch} \
   -Dlibsconfig=true
 
 pushd result
 # De-compress resulting tarball ... yeah, it's a .zip but actually a .tar.gz
 # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
-tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
+tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{_arch}.zip
 
 pushd eclipse
 
@@ -420,7 +401,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
-  result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
+  result/org.eclipse.sdk-%{build_id}-linux.gtk.%{_arch}.zip
 
 # Binaries, libraries, and natively-built shared libraries
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -453,15 +434,15 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 ln -sf %{_libdir}/%{name}/eclipse eclipse
 
 # JNI libraries
-cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libupdate.so \
+cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{_arch}/libupdate.so \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libcore_*.so \
+cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{_arch}/libcore_*.so \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/
 suff=
 %ifarch alpha ia64 ppc64 sparc64 x86_64
 suff=64
 %endif
-cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \
+cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{_arch}/libswt*.so \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/
 popd
 
@@ -980,6 +961,7 @@ fi
 * Mon Mar 07 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.11
 - Add s390 and s390x patches.
 - Don't build for s390, though, due to gcc bug.
+- Change %{eclipse_arch} to %{_arch} as the names all line up now.
 
 * Fri Mar 04 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.10
 - Add proper mozilla version.