diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch
index 6e2145d..ef45ac3 100644
--- a/eclipse-debug-symbols.patch
+++ b/eclipse-debug-symbols.patch
@@ -10,14 +10,63 @@
  
  # Determine which OS we are on
  if [ "${OS}" = "" ]; then
---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig	2014-03-12 14:47:37.513191381 +0000
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	2014-03-12 14:47:45.672200015 +0000
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig	2019-03-20 10:22:21.420240101 +0000
++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	2019-03-20 10:53:53.375471427 +0000
 @@ -92,7 +92,7 @@
   -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
   -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
  LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
 -CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
-+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
++CFLAGS = ${M_CFLAGS} ${M_ARCH} -Wall\
  	-fpic \
  	-DLINUX \
  	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
+@@ -140,7 +140,7 @@
+ 
+ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+ 	$(info Linking and generating: $(EXEC))
+-	$(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
++	$(CC) -s ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ 
+ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+ 	$(info Linking and generating: $(DLL))
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile.orig	2019-03-19 22:40:23.145082352 +0000
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile	2019-03-20 09:29:20.370457348 +0000
+@@ -1,7 +1,8 @@
+ LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1`
+ LIBSECRET_LIBS = `pkg-config --libs libsecret-1`
+ 
+-CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux"
++CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS)
++LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS)
+ 
+ all: ../libkeystorelinuxnative.so
+ 
+@@ -9,10 +10,10 @@
+ 	rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o
+ 	
+ ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
+-	$(CC) $(CFLAGS) -o $@ $< $(LIBSECRET_LIBS)
++	$(CC) $(LDFLAGS) -o $@ $<
+ 	
+ ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
+-	$(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c
++	$(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c
+ 
+ ../target: 
+ 	mkdir -p ../target
+--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile.orig	2019-03-20 09:49:40.694899138 +0000
++++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile	2019-03-20 10:20:21.704664294 +0000
+@@ -25,10 +25,10 @@
+ OS_TYPE = linux
+ JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+ INCLUDE = `pkg-config --cflags gio-2.0`
+-COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT}
++COMPILER_FLAGS = $(CFLAGS) -fPIC -c ${TARGET_ENVIRONMENT}
+ 
+ LIBS := `pkg-config --libs gio-2.0`
+-LINKER_FLAGS= ${TARGET_ENVIRONMENT}
++LINKER_FLAGS = $(LDFLAGS) ${TARGET_ENVIRONMENT}
+ 
+ all: link
+ 
diff --git a/eclipse.spec b/eclipse.spec
index 3ad7565..144eadb 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -637,6 +637,12 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
 %mvn_package ":" __noinstall
 
 %build
+# Compiler/linker flags for native parts
+export CFLAGS="%{optflags}"
+export LDFLAGS="%{__global_ldflags}"
+export M_CFLAGS="$CFLAGS"
+export M_ARCH="$LDFLAGS"
+
 #This is the lowest value where the build succeeds. 512m is not enough.
 export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
 export JAVA_HOME=%{_jvmdir}/java
@@ -1039,7 +1045,6 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_datadir}/appdata/eclipse-jdt.metainfo.xml
 
 %files pde -f .mfiles-pde -f .mfiles-cvs -f .mfiles-sdk
-%{_eclipsedir}/droplets/eclipse-sdk/features/org.eclipse.equinox.executable_*
 %{_datadir}/appdata/eclipse-pde.metainfo.xml
 
 %files p2-discovery -f .mfiles-p2-discovery
@@ -1057,6 +1062,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Tue Mar 19 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-3
+- Pre-strip debuginfo from the launcher binary to avoid conflicts with other RCP
+  applications, which will use identical launcher binaries
+
 * Thu Mar 14 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-2
 - Full build