diff --git a/eclipse.spec b/eclipse.spec
index e30b10e..bb2e18b 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -57,7 +57,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL-2.0
 URL:            https://www.eclipse.org/
 
@@ -510,7 +510,7 @@ done
 TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></environment>"
 %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent
 %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk
-for b in `ls eclipse.platform.swt.binaries/bundles | grep 'org.eclipse.swt' | grep -v 'gtk\.linux\.%{eclipse_arch}'` ; do
+for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
   module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :)
   if [ -n "$module" ] ; then
     %pom_disable_module bundles/$b eclipse.platform.swt.binaries
@@ -548,6 +548,8 @@ done
 %pom_disable_module org.eclipse.ui.win32 eclipse.platform.ui/bundles
 %pom_disable_module org.eclipse.e4.ui.swt.win32 eclipse.platform.ui/bundles
 %pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.swt.browser.chromium eclipse.platform.swt
+%pom_xpath_remove -f "plugin[@id='org.eclipse.swt.browser.chromium.gtk.linux.x86_64']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
 for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
          eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \
          eclipse.platform.releng/features/org.eclipse.rcp/feature.xml \
@@ -848,7 +850,6 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %files swt -f .mfiles-swt
 %{_eclipsedir}/plugins/org.eclipse.swt_*
 %{_eclipsedir}/plugins/org.eclipse.swt.gtk.linux.*
-%{_eclipsedir}/plugins/org.eclipse.swt.browser.chromium.gtk.linux.*
 %{_eclipsedir}/swt.jar
 %{_jnidir}/swt.jar
 
@@ -1061,6 +1062,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Fri Nov  6 2020 Mat Booth <mat.booth@redhat.com> - 1:4.17-2
+- Fix build on non-intel arches
+
 * Wed Oct 28 2020 Mat Booth - 1:4.17-1
 - Update to latest upstream release