diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index e3509c0..2720ad2 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:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL-2.0 and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -81,7 +81,6 @@ BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: eclipse-license2
 BuildRequires: desktop-file-utils
-BuildRequires: lpg-java-compat
 BuildRequires: google-gson
 BuildRequires: glassfish-jaxb-api
 BuildRequires: glassfish-jaxb-runtime >= 2.2.11-14
@@ -110,7 +109,8 @@ Requires:      eclipse-tm-terminal-connectors >= 4.3.0
 %endif
 
 # Added in F31
-Obsoletes:     %{name}-tests < %{epoch}:%{version}-%{release}
+Obsoletes:     %{name}-tests < 2:9.7.0-4
+Obsoletes:     %{name}-parsers < 2:9.7.0-4
 
 Recommends:    eclipse-linuxtools-libhover
 Recommends:    eclipse-cdt-llvm
@@ -126,18 +126,9 @@ Requires:       eclipse-platform
 %description native
 Architecture specific parts of CDT.
 
-%package parsers
-Summary:        Eclipse C/C++ Development Tools (CDT) Optional Parsers
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       lpg-java-compat
-
-%description parsers
-Optional language-variant parsers for the CDT.
-
 %package llvm
 Summary:        Eclipse C/C++ Development Tools (CDT) LLVM
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       lpg-java-compat
 %if 0%{?fedora} || 0%{?rhel} > 7
 Requires:       clang
 Requires:       lldb
@@ -277,6 +268,11 @@ mkdir -p native/org.eclipse.cdt.native.serial/os/linux/%{eclipse_arch} \
 # Unnecessary plugins for RPM builds
 %pom_remove_plugin org.jacoco:jacoco-maven-plugin
 
+# Disable unneeded additional parsers
+sed -i -e '/<module>upc\//d' pom.xml
+sed -i -e '/<module>lrparser\//d' pom.xml
+sed -i -e '/<module>xlc\//d' pom.xml
+
 # Don't build and ship test bundles
 %pom_disable_module build/org.eclipse.cdt.autotools.tests
 %pom_disable_module build/org.eclipse.cdt.autotools.ui.tests
@@ -297,7 +293,6 @@ mkdir -p native/org.eclipse.cdt.native.serial/os/linux/%{eclipse_arch} \
 %pom_disable_module lsp/org.eclipse.cdt.lsp.core.tests
 %pom_disable_module qt/org.eclipse.cdt.qt.ui.tests
 %pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.tests
-%pom_disable_module xlc/org.eclipse.cdt.errorparsers.xlc.tests
 %pom_disable_module releng/org.eclipse.cdt.testing
 %pom_disable_module releng/org.eclipse.cdt.testing-feature
 
@@ -366,14 +361,6 @@ mkdir -p native/org.eclipse.cdt.native.serial/os/linux/%{eclipse_arch} \
 %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
-%pom_disable_module xlc/org.eclipse.cdt.xlc.feature
-%pom_disable_module xlc/org.eclipse.cdt.xlc.sdk-feature
-%pom_disable_module xlc/org.eclipse.cdt.make.xlc.core
-%pom_disable_module xlc/org.eclipse.cdt.core.lrparser.xlc
-%pom_disable_module xlc/org.eclipse.cdt.errorparsers.xlc
-%pom_disable_module xlc/org.eclipse.cdt.managedbuilder.xlc.ui
-%pom_disable_module xlc/org.eclipse.cdt.managedbuilder.xlc.core
-%pom_disable_module xlc/org.eclipse.cdt.managedbuilder.xlupc.ui
 %pom_disable_module releng/org.eclipse.cdt
 %pom_disable_module releng/org.eclipse.cdt.platform-feature
 %pom_disable_module releng/org.eclipse.cdt-feature
@@ -449,8 +436,6 @@ sed -i -e 's/javax.xml.bind/jaxb-api/' bundles/org.eclipse.tools.templates.freem
 %mvn_package ":org.eclipse.cdt.core{,.native,.linux,.linux.%{eclipse_arch}}" native
 %mvn_package ":org.eclipse.cdt.native{,.serial}" native
 %mvn_package ":*.testsrunner*"
-%mvn_package :*parser* parsers
-%mvn_package ":org.eclipse.cdt.*{xlc,xlupc,bupc}*" parsers
 %mvn_package :org.eclipse.tools.templates.*
 %mvn_package :org.eclipse.cdt.arduino* arduino
 %mvn_package :org.eclipse.cdt.docker* docker
@@ -564,9 +549,6 @@ rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail*
 %files sdk -f .mfiles-sdk
 %license releng/org.eclipse.cdt.sdk/epl-v20.html
 
-%files parsers -f .mfiles-parsers
-%license releng/org.eclipse.cdt.sdk/epl-v20.html
-
 %files llvm -f .mfiles-llvm
 %license releng/org.eclipse.cdt.sdk/epl-v20.html
 
@@ -589,6 +571,9 @@ rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail*
 %endif
 
 %changelog
+* 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
+
 * Fri May 10 2019 Mat Booth <mat.booth@redhat.com> - 2:9.7.0-2
 - Don't build and ship test bundles
 - Use proper jaxb implementation