diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 2720ad2..a89b621 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -48,7 +48,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL-2.0 and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -79,11 +79,12 @@ BuildRequires: rsync
 BuildRequires: gcc-c++
 BuildRequires: tycho
 BuildRequires: tycho-extras
-BuildRequires: eclipse-license2
 BuildRequires: desktop-file-utils
 BuildRequires: google-gson
 BuildRequires: glassfish-jaxb-api
 BuildRequires: glassfish-jaxb-runtime >= 2.2.11-14
+BuildRequires: eclipse-launchbar >= 1:2.2.2
+BuildRequires: eclipse-license2
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-tm-terminal
@@ -94,7 +95,6 @@ BuildRequires: freemarker
 %if %{_enable_container_support}
 BuildRequires: eclipse-linuxtools-docker >= 5.3.0
 %endif
-BuildRequires: eclipse-launchbar >= 1:2.2.2
 BuildRequires: eclipse-remote >= 2.1.0
 BuildRequires: eclipse-tm-terminal-connectors >= 4.3.0
 %endif
@@ -139,7 +139,7 @@ Optional llvm parsers for the CDT.
 
 %if %{_enable_container_and_remote_support}
 
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora}
 %package arduino
 Summary:        Arduino C++ Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
@@ -309,43 +309,15 @@ sed -i -e '/<module>xlc\//d' pom.xml
 %pom_disable_module build/org.eclipse.cdt.cmake-feature
 %pom_disable_module build/org.eclipse.cdt.make.ui
 %pom_disable_module build/org.eclipse.cdt.managedbuilder.ui
-%pom_disable_module debug/org.eclipse.cdt.debug.core
-%pom_disable_module debug/org.eclipse.cdt.debug.ui
-%pom_disable_module debug/org.eclipse.cdt.gdb.ui
-%pom_disable_module debug/org.eclipse.cdt.gdb-feature
-%pom_disable_module debug/org.eclipse.cdt.gnu.debug-feature
 %pom_disable_module debug/org.eclipse.cdt.debug.application
 %pom_disable_module debug/org.eclipse.cdt.debug.application.product
 %pom_disable_module debug/org.eclipse.cdt.debug.standalone-feature
-%pom_disable_module dsf/org.eclipse.cdt.dsf
-%pom_disable_module dsf/org.eclipse.cdt.dsf.ui
-%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb
-%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb.ui
-%pom_disable_module dsf-gdb/org.eclipse.cdt.gnu.dsf-feature
-%pom_disable_module dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature
-%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui
-%pom_disable_module llvm/org.eclipse.cdt.llvm.dsf.lldb.core
-%pom_disable_module llvm/org.eclipse.cdt.llvm.dsf.lldb-feature
-%pom_disable_module llvm/org.eclipse.cdt.llvm.dsf.lldb.ui
-%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag
-%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag.core
-%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag.ui
-%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag-feature
-%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory-feature
-%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.floatingpoint
-%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.memorybrowser
-%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.search
-%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.traditional
-%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.transport
 %pom_disable_module testsrunner/org.eclipse.cdt.testsrunner
 %pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.qttest
 %pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.boost
 %pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.tap
 %pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.feature
 %pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.gtest
-%pom_disable_module visualizer/org.eclipse.cdt.visualizer.core
-%pom_disable_module visualizer/org.eclipse.cdt.visualizer.ui
-%pom_disable_module visualizer/org.eclipse.cdt.visualizer-feature
 %pom_disable_module cross/org.eclipse.cdt.build.crossgcc-feature
 %pom_disable_module cross/org.eclipse.cdt.build.crossgcc
 %pom_disable_module cross/org.eclipse.cdt.launch.remote
@@ -353,7 +325,6 @@ sed -i -e '/<module>xlc\//d' pom.xml
 %pom_disable_module cross/org.eclipse.cdt.launch.serial.core
 %pom_disable_module cross/org.eclipse.cdt.launch.serial.ui
 %pom_disable_module cross/org.eclipse.cdt.launch.serial-feature
-%pom_disable_module launch/org.eclipse.cdt.launch
 %pom_disable_module remote/org.eclipse.cdt.remote.core
 %pom_disable_module qt/org.eclipse.cdt.qt.core
 %pom_disable_module qt/org.eclipse.cdt.qt.ui
@@ -372,7 +343,7 @@ sed -i -e '/<module>xlc\//d' pom.xml
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature
 %endif
 # Always disable arduino support on rhel
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if ! 0%{?fedora}
 %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.core
 %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.ui
 %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino-feature
@@ -557,7 +528,7 @@ rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail*
 %files qt -f .mfiles-qt
 %license releng/org.eclipse.cdt.sdk/epl-v20.html
 
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora}
 %files arduino -f .mfiles-arduino
 %license releng/org.eclipse.cdt.sdk/epl-v20.html
 %endif
@@ -571,6 +542,9 @@ rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail*
 %endif
 
 %changelog
+* Sat Jun 08 2019 Mat Booth <mbooth@apache.org> - 2:9.7.0-4
+- Allow building debug bundles in bootstrap mode
+
 * Wed Jun 05 2019 Mat Booth <mat.booth@redhat.com> - 2:9.7.0-3
 - Drop support for parsers for compilers that are not shipped by Fedora