diff --git a/eclipse-cdt-cdtdebug.patch b/eclipse-cdt-cdtdebug.patch
index 4f18e8b..203deec 100644
--- a/eclipse-cdt-cdtdebug.patch
+++ b/eclipse-cdt-cdtdebug.patch
@@ -26,14 +26,27 @@
  ECLIPSE_EXEC="$ECLIPSE_HOME/eclipse"
  
  # On macOS, the application layout is a bit different (Eclipse.app)
-@@ -92,7 +102,8 @@
+@@ -90,9 +100,20 @@
+ PLUGIN_DIR="$ECLIPSE_HOME/plugins"
+ OSGI_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.osgi_*.jar' -not -name '*source*' -exec basename {} \; | tail -1`
  
++DROPLET_NOARCH="$(cd $ECLIPSE_HOME/../../share/eclipse/droplets && pwd)"
++DROPLET_ARCHFUL="$ECLIPSE_HOME/droplets"
++
++LAUNCHBAR_CORE_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.launchbar.core_*.jar' -not -name '*source*'`
++LAUNCHBAR_UI_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.launchbar.ui_*.jar' -not -name '*source*'`
++TERM_CONTROL_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.tm.terminal.control_*.jar' -not -name '*source*'`
++UI_VIEWS_LOG_JAR=`find $DROPLET_NOARCH -maxdepth 5 -name 'org.eclipse.ui.views.log_*.jar' -not -name '*source*'`
++
++
  # Run eclipse with the Stand-alone Debugger product specified
  "$ECLIPSE_EXEC" -clean -product org.eclipse.cdt.debug.application.product \
 -                        -data "$HOME/workspace-cdtdebug" -configuration file\:"$HOME/cdtdebugger" \
 -                        -dev file\:"$HOME/cdtdebugger/dev.properties" $options \
+-                        -vmargs -Dosgi.jar=$OSGI_JAR -Declipse.home="$ECLIPSE_HOME"
 +                        -application org.eclipse.cdt.debug.application.app \
 +                        -data "$HOME/$workspace" -configuration file\:"$HOME/$configdir" \
 +                        -dev file\:"$HOME/$configdir/dev.properties" $options \
-                         -vmargs -Dosgi.jar=$OSGI_JAR -Declipse.home="$ECLIPSE_HOME"
++                        -vmargs -Dosgi.jar=$OSGI_JAR -Declipse.home="$ECLIPSE_HOME" \
++                        -Dlaunchbar.core=$LAUNCHBAR_CORE_JAR -Dlaunchbar.ui=$LAUNCHBAR_UI_JAR -Dui.views.log=$UI_VIEWS_LOG_JAR -Dtm.terminal.control=$TERM_CONTROL_JAR
  
diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch
index 00f3713..a7880fa 100644
--- a/eclipse-cdt-config-ini.patch
+++ b/eclipse-cdt-config-ini.patch
@@ -1,5 +1,5 @@
---- ./debug/org.eclipse.cdt.debug.application.product/debug.product.orig	2017-06-26 10:38:53.179468917 +0100
-+++ ./debug/org.eclipse.cdt.debug.application.product/debug.product	2017-06-26 10:52:50.985256677 +0100
+--- ./debug/org.eclipse.cdt.debug.application.product/debug.product.orig	2017-06-12 19:35:48.000000000 +0100
++++ ./debug/org.eclipse.cdt.debug.application.product/debug.product	2017-07-04 13:24:22.641783719 +0100
 @@ -176,12 +176,11 @@
     <plugins>
        <plugin id="com.google.gson"/>
@@ -76,7 +76,15 @@
        <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
        <plugin id="org.eclipse.equinox.p2.core"/>
        <plugin id="org.eclipse.equinox.p2.director"/>
-@@ -349,11 +331,7 @@
+@@ -321,7 +303,6 @@
+       <plugin id="org.eclipse.equinox.preferences"/>
+       <plugin id="org.eclipse.equinox.registry"/>
+       <plugin id="org.eclipse.equinox.security"/>
+-      <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
+       <plugin id="org.eclipse.equinox.security.ui"/>
+       <plugin id="org.eclipse.equinox.simpleconfigurator"/>
+       <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
+@@ -349,11 +330,7 @@
        <plugin id="org.eclipse.osgi.util"/>
        <plugin id="org.eclipse.search"/>
        <plugin id="org.eclipse.swt"/>
@@ -88,14 +96,24 @@
        <plugin id="org.eclipse.team.core"/>
        <plugin id="org.eclipse.team.ui"/>
        <plugin id="org.eclipse.text"/>
-@@ -381,8 +359,9 @@
+@@ -361,7 +338,6 @@
+       <plugin id="org.eclipse.tools.templates.core"/>
+       <plugin id="org.eclipse.tools.templates.ui"/>
+       <plugin id="org.eclipse.ui"/>
+-      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>
+       <plugin id="org.eclipse.ui.console"/>
+       <plugin id="org.eclipse.ui.editors"/>
+       <plugin id="org.eclipse.ui.forms"/>
+@@ -380,9 +356,10 @@
+       <plugin id="org.sat4j.pb"/>
        <plugin id="org.tukaani.xz"/>
        <plugin id="org.w3c.css.sac"/>
-       <plugin id="org.w3c.dom.events"/>
+-      <plugin id="org.w3c.dom.events"/>
 -      <plugin id="org.w3c.dom.smil"/>
        <plugin id="org.w3c.dom.svg"/>
 +      <plugin id="org.kxml2"/>
 +      <plugin id="org.xmlpull"/>
++      <plugin id="org.eclipse.jdt.core.compiler.batch"/>
     </plugins>
  
     <configurations>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index c3fa639..94f874c 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -36,7 +36,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.3.0
-Release:        0.2.gitbfe45e8%{?dist}
+Release:        0.3.gitbfe45e8%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -212,6 +212,7 @@ TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></
 
 # Add secondary arch support if we are building there
 %ifarch %{arm} s390x aarch64
+sed -i -e 's/linux.x86"/linux.%{eclipse_arch}"/g' pom.xml
 pushd core
 sed -i -e 's/linux.x86 /linux.%{eclipse_arch} /g' org.eclipse.cdt.core.native/plugin.properties
 sed -i -e 's/\\(x86\\)/(%{eclipse_arch})/g' org.eclipse.cdt.core.native/plugin.properties
@@ -356,7 +357,7 @@ popd
 # Exclude EquinoxResolver to avoid NPE occuring on arm and increase memory for s390
 export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
 
-%mvn_build -j -f -- -Dtycho.local.keepTarget -Dskip-ppc64le -Dnative=linux.%{eclipse_arch}
+%mvn_build -j -f -- -Dtycho.local.keepTarget -Dnative=linux.%{eclipse_arch}
 
 %install
 %mvn_install
@@ -414,6 +415,9 @@ $(cd %{buildroot}%{_eclipsedir}/droplets/cdt-native/eclipse/plugins && ls . | gr
 $(cd %{buildroot}%{_eclipsedir}/droplets/cdt-native/eclipse/plugins && ls . | grep org.eclipse.cdt.core.native_) ; do
   sed -i -e "s,${PLUGIN%_*}\,,file\\\\:%{_eclipsedir}/droplets/cdt-native/eclipse/plugins/$PLUGIN\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini
 done
+for PLUGIN in launchbar.ui launchbar.core tm.terminal.control ui.views.log ; do
+  sed -i -e "s/org.eclipse.$PLUGIN/\$$PLUGIN\$/" org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini
+done
 
 sed -i -e "s,org.eclipse.cdt.debug.application\,,file\\\\:%{eclipse_base}/droplets/cdt/eclipse/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar\,," org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini
 
@@ -514,6 +518,10 @@ fi
 %endif
 
 %changelog
+* Tue Jul 04 2017 Mat Booth <mat.booth@redhat.com> - 1:9.3.0-0.3.gitbfe45e8
+- Fix build on alternative arches
+- Fix standalone debugger startup
+
 * Mon Jun 19 2017 Mat Booth <mat.booth@redhat.com> - 1:9.3.0-0.2.gitbfe45e8
 - Allow boostrap modes to build against launchbar and tm-terminal when those
   packages are also bootstrapped