diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch
index 2d541ed..4bb57f9 100644
--- a/eclipse-cdt-config-ini.patch
+++ b/eclipse-cdt-config-ini.patch
@@ -1,28 +1,27 @@
---- debug/org.eclipse.cdt.debug.application.product/debug.product.orig	2018-12-11 12:11:30.000000000 +0000
-+++ debug/org.eclipse.cdt.debug.application.product/debug.product	2019-01-07 13:50:03.610741483 +0000
-@@ -176,16 +176,14 @@
-    <plugins>
+diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
+index 71ffdc66..094df401 100644
+--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
++++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
+@@ -175,15 +175,14 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="com.google.gson"/>
        <plugin id="com.ibm.icu"/>
--      <plugin id="com.sun.xml.bind"/>
+       <plugin id="com.sun.xml.bind"/>
 -      <plugin id="javax.activation"/>
--      <plugin id="javax.annotation"/>
++      <plugin id="com.sun.el.javax.el"/>
+       <plugin id="javax.annotation"/>
 -      <plugin id="javax.el"/>
-+      <plugin id="com.sun.el.javax.el"/><plugin id="com.sun.xml.bind.jaxb-impl"/>
-+      <plugin id="javax.annotation"/>
 +      <plugin id="javax.el-api"/>
        <plugin id="javax.inject"/>
 -      <plugin id="javax.servlet"/>
 +      <plugin id="javax.servlet-api"/>
        <plugin id="javax.servlet.jsp"/>
        <plugin id="javax.xml"/>
--      <plugin id="javax.xml.bind"/>
+       <plugin id="javax.xml.bind"/>
 -      <plugin id="javax.xml.stream"/>
-+      <plugin id="jaxb-api"/>
        <plugin id="org.apache.batik.constants"/>
        <plugin id="org.apache.batik.css"/>
        <plugin id="org.apache.batik.i18n"/>
-@@ -197,7 +195,7 @@
+@@ -195,7 +194,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.apache.felix.scr"/>
        <plugin id="org.apache.httpcomponents.httpclient"/>
        <plugin id="org.apache.httpcomponents.httpcore"/>
@@ -31,7 +30,7 @@
        <plugin id="org.apache.lucene.analyzers-common"/>
        <plugin id="org.apache.lucene.analyzers-smartcn"/>
        <plugin id="org.apache.lucene.core"/>
-@@ -205,10 +203,7 @@
+@@ -203,10 +202,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.cdt.core"/>
        <plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
        <plugin id="org.eclipse.cdt.core.linux.x86_64" fragment="true"/>
@@ -42,7 +41,7 @@
        <plugin id="org.eclipse.cdt.debug.application"/>
        <plugin id="org.eclipse.cdt.debug.application.doc"/>
        <plugin id="org.eclipse.cdt.debug.core"/>
-@@ -240,12 +235,9 @@
+@@ -239,12 +235,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.core.filebuffers"/>
        <plugin id="org.eclipse.core.filesystem"/>
        <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
@@ -55,7 +54,7 @@
        <plugin id="org.eclipse.core.resources"/>
        <plugin id="org.eclipse.core.runtime"/>
        <plugin id="org.eclipse.core.variables"/>
-@@ -270,7 +262,6 @@
+@@ -271,7 +264,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.e4.ui.workbench"/>
        <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
        <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
@@ -63,7 +62,7 @@
        <plugin id="org.eclipse.e4.ui.workbench.swt"/>
        <plugin id="org.eclipse.e4.ui.workbench3"/>
        <plugin id="org.eclipse.ecf"/>
-@@ -299,9 +290,7 @@
+@@ -298,9 +290,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.equinox.jsp.jasper"/>
        <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
        <plugin id="org.eclipse.equinox.launcher"/>
@@ -73,7 +72,7 @@
        <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
        <plugin id="org.eclipse.equinox.p2.core"/>
        <plugin id="org.eclipse.equinox.p2.director"/>
-@@ -320,7 +309,6 @@
+@@ -319,7 +309,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.equinox.preferences"/>
        <plugin id="org.eclipse.equinox.registry"/>
        <plugin id="org.eclipse.equinox.security"/>
@@ -81,7 +80,7 @@
        <plugin id="org.eclipse.equinox.security.ui"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-@@ -348,9 +336,7 @@
+@@ -346,9 +335,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.osgi.util"/>
        <plugin id="org.eclipse.search"/>
        <plugin id="org.eclipse.swt"/>
@@ -91,7 +90,7 @@
        <plugin id="org.eclipse.team.core"/>
        <plugin id="org.eclipse.team.ui"/>
        <plugin id="org.eclipse.text"/>
-@@ -359,7 +345,6 @@
+@@ -357,7 +344,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.tools.templates.freemarker"/>
        <plugin id="org.eclipse.tools.templates.ui"/>
        <plugin id="org.eclipse.ui"/>
@@ -99,7 +98,7 @@
        <plugin id="org.eclipse.ui.console"/>
        <plugin id="org.eclipse.ui.editors"/>
        <plugin id="org.eclipse.ui.forms"/>
-@@ -374,14 +359,13 @@
+@@ -372,14 +358,13 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.ui.workbench"/>
        <plugin id="org.eclipse.ui.workbench.texteditor"/>
        <plugin id="org.eclipse.update.configurator"/>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 238ddd8..2da948a 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:
@@ -36,14 +36,16 @@ Epoch: 2
 # Glassfish EE APIs that moved to jakarta namespace
 %if 0%{?fedora} >= 33
 %global _jakarta_annotations jakarta.annotation-api
+%global _jakarta_jaxb jakarta.xml.bind-api
 %else
 %global _jakarta_annotations javax.annotation-api
+%global _jakarta_jaxb jaxb-api
 %endif
 
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.11.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        EPL-2.0 and CPL
 URL:            https://www.eclipse.org/cdt
 
@@ -193,7 +195,7 @@ mkdir man
 cp %{SOURCE4} man
 
 %patch1 -p0
-%patch2 -p0
+%patch2 -p1
 %patch3 -p1
 
 # Fix tycho target environment
@@ -380,18 +382,18 @@ sed -i -e 's/>javax.annotation</>%{_jakarta_annotations}</' -e 's/"javax.annotat
   doc/org.eclipse.cdt.doc.isv/pom.xml \
   debug/org.eclipse.cdt.debug.application.product/debug.product
 
+# Fix jaxb dep javax -> jakarta
+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 \
+  debug/org.eclipse.cdt.debug.application.product/debug.product
+sed -i -e 's/javax.xml.bind/%{_jakarta_jaxb}/' \
+  tools.templates/org.eclipse.tools.templates.freemarker/build.properties \
+  debug/org.eclipse.cdt.debug.application.product/debug.product
+
 # Relax the version constraint of the gson dep
 sed -i -e '/com.google.gson/s/;\(bundle-\)\?version=".*"//' \
   jtag/org.eclipse.cdt.debug.dap.gdbjtag/META-INF/MANIFEST.MF build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
 
-# 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
 %mvn_package :*.sdk sdk
@@ -425,6 +427,9 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +%Y%m%d%H%M)
 %install
 %mvn_install
 
+# Avoid unnecessary dep on java-headless 11 due to Java 11 specific fragment
+sed -i 's/>11</>1.8</' %{buildroot}/%{_datadir}/maven-metadata/*.xml
+
 %if %{_enable_remote_support}
 # We don't build the standalone debugger in bootstrap mode
 
@@ -516,6 +521,10 @@ install -D -m 644 man/cdtdebug.man %{buildroot}/%{_mandir}/man1/cdtdebug.1
 %endif
 
 %changelog
+* Fri Aug 14 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.1-7
+- Fix unnecessary Java 11 dep from this package due to Java 11 specific bundle
+  fragment
+
 * 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