diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index be3afba..e540c72 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -1,7 +1,5 @@
 %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
@@ -9,8 +7,8 @@
 #  * eclipse-tm-terminal
 #  * eclipse-launchbar
 # which all make circular dependencies on cdt
-%global _enable_container_and_remote_support 0
-%global _enable_container_support 0
+%global _enable_container_and_remote_support 1
+%global _enable_container_support 1
 
 Epoch: 2
 
@@ -44,7 +42,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.5.3
-Release:        4.2%{?dist}
+Release:        5%{?dist}
 License:        EPL-1.0 and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -593,7 +591,7 @@ popd
 
 # Symlink cdtdebug binary
 pushd %{buildroot}%{_bindir}
-    ln -s %{_cdtstandlonedir}/cdtdebug
+    ln -s %{_cdtstandalonedir}/cdtdebug
 popd
 
 echo %{eclipse_base}/droplets/cdt/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar >> .mfiles
@@ -707,8 +705,8 @@ fi
 %endif
 
 %changelog
-* Tue Oct 16 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-4.2
-- Bootstrap build removing provides/requires from standalone debugger
+* Wed Oct 17 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-5
+- Remove provides/requires from CDT 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