diff --git a/eclipse.spec b/eclipse.spec
index fe6aa8b..c743fb7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -49,7 +49,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -675,7 +675,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/o
 export JAVA_HOME=%{_jvmdir}/java-11
 
 # TODO: Fix bug in the tycho installation
-xmvn -o install:install-file -Dfile=/usr/share/java/tycho/tycho-lib-detector.jar -DpomFile=/usr/share/maven-poms/tycho/tycho-lib-detector.pom
+xmvn -o install:install-file -Dtycho.mode=maven -Dfile=%{_javadir}/tycho/tycho-lib-detector.jar -DpomFile=%{_mavenpomdir}/tycho/tycho-lib-detector.pom
 
 # Pre-build agent jar needed for AdvancedSourceLookupSupport
 sed -i -e '/createSourcesJar/d' -e 's/8\.0\.1/7.0/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml
@@ -750,7 +750,6 @@ EOF
 popd #eclipse
 
 %install
-export JAVA_HOME=%{_jvmdir}/java-11
 %mvn_install
 
 # Some directories we need
@@ -1073,6 +1072,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Tue Jun 23 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-3
+- Make a bit more portable and fix bootstrap mode
+
 * Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-2
 - Non-bootstrap build