diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 9c07915..f19b187 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -2,7 +2,7 @@
 
 %global _build_id_links alldebug
 
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 # Change following to 0 to default to no remote support when building
 # for the first time in a buildroot -- this is needed to build:
@@ -34,7 +34,7 @@ Epoch: 2
 %global app_exec %{?app_exec_prefix} cdtdebug
 
 # Glassfish EE APIs that moved to jakarta namespace
-%if 0%{?fedora}
+%if 0%{?fedora} >= 33
 %global _jakarta_annotations jakarta.annotation-api
 %else
 %global _jakarta_annotations javax.annotation-api
@@ -43,7 +43,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.11.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL-2.0 and CPL
 URL:            https://www.eclipse.org/cdt
 
@@ -66,6 +66,7 @@ Patch3: eclipse-cdt-cdtdebug-readme.patch
 # Upstream Eclipse no longer supports non-64bit arches
 ExcludeArch: s390 %{arm} %{ix86}
 
+BuildRequires: java-11-openjdk-devel
 BuildRequires: make
 BuildRequires: rsync
 BuildRequires: gcc-c++
@@ -73,8 +74,13 @@ BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: desktop-file-utils
 BuildRequires: google-gson
+%if 0%{?fedora} >= 33
+BuildRequires: jaxb-api
+BuildRequires: jaxb-impl
+%else
 BuildRequires: glassfish-jaxb-api
-BuildRequires: glassfish-jaxb-runtime >= 2.2.11-14
+BuildRequires: glassfish-jaxb-runtime
+%endif
 BuildRequires: eclipse-egit
 BuildRequires: eclipse-license2
 BuildRequires: eclipse-platform
@@ -380,7 +386,11 @@ sed -i -e '/com.google.gson/s/;\(bundle-\)\?version=".*"//' \
 
 # Fix jaxb deps
 sed -i -e 's/com.sun.xml.bind/com.sun.xml.bind.jaxb-impl/' tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
+%if 0%{?fedora} >= 33
+sed -i -e 's/javax.xml.bind/jakarta.xml.bind-api/' tools.templates/org.eclipse.tools.templates.freemarker/build.properties
+%else
 sed -i -e 's/javax.xml.bind/jaxb-api/' tools.templates/org.eclipse.tools.templates.freemarker/build.properties
+%endif
 
 %mvn_package "::pom::" __noinstall
 %mvn_package "::jar:sources{,-feature}:" sdk
@@ -399,8 +409,7 @@ sed -i -e 's/javax.xml.bind/jaxb-api/' tools.templates/org.eclipse.tools.templat
 %mvn_package :org.eclipse.launchbar*
 
 %build
-
-export JAVA_HOME=%{_jvmdir}/java
+export JAVA_HOME=%{_jvmdir}/java-11
 
 export CFLAGS="${CFLAGS:-%__global_cflags}"
 export LDFLAGS="${LDFLAGS:-%__global_ldflags}"
@@ -507,6 +516,10 @@ install -D -m 644 man/cdtdebug.man %{buildroot}/%{_mandir}/man1/cdtdebug.1
 %endif
 
 %changelog
+* Tue Aug 11 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.1-6
+- Fix build against updated jaxb packages
+- Force build against Java 11
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.11.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild