diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 6ba3165..5bc7efa 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -1,5 +1,7 @@
 %global _eclipsedir %{_prefix}/lib/eclipse
 
+%global debug_package %{nil}
+
 # Change following to 0 to default to no container/remote support when building
 # for the first time in a buildroot -- this is needed to build:
 #  * eclipse-linuxtools-docker
@@ -7,8 +9,8 @@
 #  * eclipse-tm-terminal
 #  * eclipse-launchbar
 # which all make circular dependencies on cdt
-%global _enable_container_and_remote_support 1
-%global _enable_container_support 1
+%global _enable_container_and_remote_support 0
+%global _enable_container_support 0
 
 Epoch: 2
 
@@ -42,7 +44,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.5.3
-Release:        5%{?dist}
+Release:        4.1%{?dist}
 License:        EPL-1.0 and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -74,6 +76,7 @@ Patch4: eclipse-cdt-cdtdebug.patch2
 # Remove invalid configurations used when building standalone debugger
 Patch5: eclipse-cdt-standalone.patch
 
+%if 0
 BuildRequires: make
 BuildRequires: rsync
 BuildRequires: gcc-c++
@@ -100,6 +103,7 @@ BuildRequires: eclipse-linuxtools-docker >= 5.3.0
 BuildRequires: eclipse-remote >= 2.1.0
 BuildRequires: eclipse-tm-terminal-connectors >= 4.3.0
 %endif
+%endif
 
 Requires:      gdb make gcc-c++
 Requires:      hamcrest
@@ -123,6 +127,7 @@ Summary:        Eclipse C/C++ Development Tools (CDT) Natives
 %description native
 Architecture specific parts of CDT.
 
+%if 0
 %package parsers
 Summary:        Eclipse C/C++ Development Tools (CDT) Optional Parsers
 Requires:       %{name} = %{epoch}:%{version}-%{release}
@@ -206,6 +211,7 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description sdk
 Source for Eclipse CDT for use within Eclipse.
+%endif
 
 %prep
 %setup -q -n %{cdt_snapshot}
@@ -218,6 +224,7 @@ cp %{SOURCE3} desktop
 mkdir man
 cp %{SOURCE4} man
 
+%if 0
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
@@ -424,8 +431,11 @@ find core/org.eclipse.cdt.core.tests/resources -name *.a -delete
 %mvn_package :org.eclipse.cdt.cmake* qt
 %mvn_package :org.eclipse.cdt*
 
+%endif
 
 %build
+
+%if 0
 export JAVA_HOME=%{_jvmdir}/java
 
 export CFLAGS="${CFLAGS:-%__global_cflags}"
@@ -439,8 +449,10 @@ 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 -Dnative=linux.%{eclipse_arch} -Pbuild-standalone-debugger-rcp
+%endif
 
 %install
+%if 0
 %mvn_install
 
 binInstallDir=${RPM_BUILD_ROOT}/%{_bindir}
@@ -546,10 +558,12 @@ sed -i -e 's|Name=Eclipse.*|Name=%{app_name}|g' desktop/eclipse-cdt.desktop
 sed -i -e "s|Icon=eclipse|Icon=%{name}|g" desktop/eclipse-cdt.desktop
 install -D desktop/eclipse-cdt.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
 desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
+%endif
 
 # Install man page
 install -D -m 644 man/cdtdebug.man $RPM_BUILD_ROOT/%{_mandir}/man1/cdtdebug.1
 
+%if 0
 # Remove uneeded extra symlinks that are optional deps of log4j:
 sed -i -e '/mail/d' .mfiles* %{buildroot}/%{_datadir}/eclipse/droplets/*/fragment.info %{buildroot}/%{_datadir}/java/*/fragment.info
 rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail* %{buildroot}/%{_datadir}/java/*/plugins/*mail*
@@ -568,13 +582,18 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
 fi
 %endif
 
-%files -f .mfiles
+%endif
+
+%files
+%if 0
 %{_bindir}/cdtdebug
 %{_cdtstandalonedir}/*
 /usr/share/applications/*
 /usr/share/pixmaps/*
 /usr/share/icons/*/*/apps/*
+%endif
 %{_mandir}/man1/cdtdebug.1*
+%if 0
 %doc releng/org.eclipse.cdt.sdk/epl-v10.html
 %doc releng/org.eclipse.cdt.sdk/notice.html
 
@@ -620,9 +639,11 @@ fi
 %endif
 %endif
 
+%endif
+
 %changelog
-* Mon Oct 15 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-5
-- Filter out all provides/requires from the CDT standalone debugger install
+* Tue Oct 16 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-4.1
+- Bootstrap build removing provides/requires from standalone debugger
 
 * Tue Oct 09 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-4
 - Build the CDT standalone debugger as an RCP application and package