diff --git a/ebz543299-gtk2-warning.patch b/ebz543299-gtk2-warning.patch
new file mode 100644
index 0000000..5666970
--- /dev/null
+++ b/ebz543299-gtk2-warning.patch
@@ -0,0 +1,30 @@
+From 99938437f44d0186076d5aa9a7eca7626e186ed7 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Wed, 9 Jan 2019 10:39:05 +0000
+Subject: [PATCH] Bug 543299 - Standalone debugger gives GTK+ 2 warning on
+ startup
+
+Remove the GTK version parameter from the product definition.
+
+Change-Id: I923d757d94c791f4f0a5f40a1f16ef810896ac97
+Signed-off-by: Mat Booth <mat.booth@redhat.com>
+---
+ debug/org.eclipse.cdt.debug.application.product/debug.product | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
+index 3e042c33b3..e6e57d2b75 100644
+--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
++++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
+@@ -16,8 +16,6 @@
+    <launcherArgs>
+       <programArgs>-data @noDefault
+       </programArgs>
+-      <programArgsLin>--launcher.GTK_version 2
+-      </programArgsLin>
+       <vmArgsLin>-Xms100m -Xmx512m  -Dosgi.requiredJavaVersion=1.8
+       </vmArgsLin>
+       <vmArgsMac>-Xms100m -Xmx512m  -XstartOnFirstThread -Dosgi.requiredJavaVersion=1.8 -Dorg.eclipse.swt.internal.carbon.smallFonts
+-- 
+2.20.1
+
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 8cf6fd3..25322da 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -41,7 +41,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL-2.0 and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -70,6 +70,9 @@ Patch3: eclipse-cdt-cdtdebug-readme.patch
 # Fixes error in QT testrunner
 Patch4: eclipse-cdt-qt-npe.patch
 
+# Don't try to start standalone debugger on GTK2
+Patch5: ebz543299-gtk2-warning.patch
+
 BuildRequires: make
 BuildRequires: rsync
 BuildRequires: gcc-c++
@@ -220,6 +223,7 @@ cp %{SOURCE4} man
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Fix tycho target environment
 TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></environment>"
@@ -589,6 +593,15 @@ popd
 
 echo %{eclipse_base}/droplets/cdt/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar >> .mfiles
 
+# Use distro-specific working dir to avoid clashing with upstream
+%if 0%{?rhel}
+sed -i -e '/-data/i-configuration' -e '/-data/i@user.home\/rhcdtdebugger' \
+       -e 's/@noDefault/@user.home\/workspace-rhcdtdebug/' %{buildroot}%{_cdtstandalonedir}/cdtdebug.ini
+%else
+sed -i -e '/-data/i-configuration' -e '/-data/i@user.home\/fcdtdebugger' \
+       -e 's/@noDefault/@user.home\/workspace-fcdtdebug/' %{buildroot}%{_cdtstandalonedir}/cdtdebug.ini
+%endif
+
 %endif
 
 # Install icons
@@ -687,6 +700,10 @@ fi
 %endif
 
 %changelog
+* Wed Jan 09 2019 Mat Booth <mat.booth@redhat.com> - 2:9.6.0-4
+- Patch to avoid requesting GTK2 as SWT backend
+- Fix unexpected workspace directory change
+
 * Tue Jan 08 2019 Mat Booth <mat.booth@redhat.com> - 2:9.6.0-3
 - Ensure the native subpackage brings in the Eclipse Platform package