diff --git a/.gitignore b/.gitignore
index 565b966..6c530f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,5 @@ eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
 /org.eclipse.linuxtools-2.1.0.tar.bz2
 /CDT_8_3_0.tar.bz2
 /org.eclipse.linuxtools-2.2.1.tar.bz2
+/org.eclipse.cdt-962e01188674a376a2ca36f2fa9ce8a4ec68c544.tar.bz2
+/org.eclipse.linuxtools-e866fae2d8a67985051ef8afba50ed37b4eea105.tar.bz2
diff --git a/eclipse-cdt-linuxtools-disable-jacoco.patch b/eclipse-cdt-linuxtools-disable-jacoco.patch
index 1fc2f0d..ec74719 100644
--- a/eclipse-cdt-linuxtools-disable-jacoco.patch
+++ b/eclipse-cdt-linuxtools-disable-jacoco.patch
@@ -1,14 +1,14 @@
 diff -up ./pom.xml.orig ./pom.xml
---- ./pom.xml.orig	2014-03-05 15:37:30.394631537 -0500
-+++ ./pom.xml	2014-03-05 15:39:53.777840638 -0500
-@@ -296,34 +296,6 @@
+--- ./pom.xml.orig	2014-05-09 16:20:42.839477199 -0400
++++ ./pom.xml	2014-05-09 16:22:41.975417839 -0400
+@@ -305,34 +305,6 @@
              </execution>
            </executions>
          </plugin>
 -       <plugin>
 -        <groupId>org.jacoco</groupId>
 -        <artifactId>jacoco-maven-plugin</artifactId>
--        <version>0.6.3.201306030806</version>
+-        <version>0.7.0.201403182114</version>
 -        <executions>
 -          <execution>
 -           <id>pre-test</id>
@@ -17,7 +17,7 @@ diff -up ./pom.xml.orig ./pom.xml
 -           </goals>
 -	   <configuration>
 -              <!-- Where to put jacoco coverage report -->
--              <destFile>${sonar.jacoco.reportPath}</destFile> 
+-              <destFile>${sonar.jacoco.reportPath}</destFile>
 -              <includes>
 -                <include>org.eclipse.linuxtools.*</include>
 -              </includes>
diff --git a/eclipse-cdt-linuxtools-features.patch b/eclipse-cdt-linuxtools-features.patch
index 3311fec..dda82fd 100644
--- a/eclipse-cdt-linuxtools-features.patch
+++ b/eclipse-cdt-linuxtools-features.patch
@@ -1,7 +1,7 @@
-diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig ./releng/org.eclipse.linuxtools.releng-site/category.xml
---- ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig	2014-03-05 15:29:30.971290375 -0500
-+++ ./releng/org.eclipse.linuxtools.releng-site/category.xml	2014-03-05 15:36:05.461322301 -0500
-@@ -7,87 +7,9 @@
+diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix ./releng/org.eclipse.linuxtools.releng-site/category.xml
+--- ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix	2014-05-09 16:27:15.156867734 -0400
++++ ./releng/org.eclipse.linuxtools.releng-site/category.xml	2014-05-09 16:28:25.630015691 -0400
+@@ -7,178 +7,22 @@
     <feature url="features/org.eclipse.linuxtools.cdt.libhover.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.feature" version="0.0.0">
        <category name="Linux Tools"/>
     </feature>
@@ -38,15 +38,9 @@ diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig ./releng/
 -   <feature url="features/org.eclipse.linuxtools.profiling_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling" version="0.0.0">
 -      <category name="Linux Tools"/>
 -   </feature>
--   <feature url="features/org.eclipse.linuxtools.tools.launch_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tools.launch" version="0.0.0">
--      <category name="Linux Tools"/>
--   </feature>
 -   <feature url="features/org.eclipse.linuxtools.rpm_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.rpm" version="0.0.0">
 -      <category name="Linux Tools"/>
 -   </feature>
--   <feature url="features/org.eclipse.linuxtools.rpmstubby.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.rpmstubby.feature" version="0.0.0">
--      <category name="Linux Tools"/>
--   </feature>
 -   <feature url="features/org.eclipse.linuxtools.systemtap_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.systemtap" version="0.0.0">
 -      <category name="Linux Tools"/>
 -   </feature>
@@ -59,7 +53,7 @@ diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig ./releng/
 -   <feature url="features/org.eclipse.linuxtools.gcov_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gcov" version="0.0.0">
 -      <category name="Linux Tools"/>
 -   </feature>
--   <feature url="features/org.eclipse.linuxtools.lttng2_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2" version="0.0.0">
+-   <feature url="features/org.eclipse.linuxtools.lttng2.control_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.control" version="0.0.0">
 -      <category name="Linux Tools"/>
 -   </feature>
 -   <feature url="features/org.eclipse.linuxtools.lttng2.kernel_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.kernel" version="0.0.0">
@@ -87,9 +81,21 @@ diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig ./releng/
 -      <category name="Linux Tools"/>
 -   </feature>
     <!-- Orbit Dependencies -->
-    <iu id="org.swtchart" version="0.0.0">
+-   <iu id="org.swtchart" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </iu>
+    <iu id="org.cyberneko.html" version="0.0.0">
+       <category name="Linux Tools"/>
+    </iu>
+    <iu id="org.apache.xerces" version="0.0.0">
        <category name="Linux Tools"/>
-@@ -95,87 +17,9 @@
+    </iu>
+-   <feature url="features/org.eclipse.linuxtools.tracing.rcp_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp" version="0.0.0">
+-      <category name="Linux Tools LTTng RCP"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.tracing.rcp.branding.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.branding.feature" version="0.0.0">
+-      <category name="Linux Tools LTTng RCP"/>
+-   </feature>
     <feature url="features/org.eclipse.linuxtools.cdt.libhover.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.feature.source" version="0.0.0">
        <category name="Linux Tools Sources"/>
     </feature>
@@ -126,15 +132,9 @@ diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig ./releng/
 -   <feature url="features/org.eclipse.linuxtools.profiling.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling.source" version="0.0.0">
 -      <category name="Linux Tools Sources"/>
 -   </feature>
--   <feature url="features/org.eclipse.linuxtools.tools.launch.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tools.launch.source" version="0.0.0">
--      <category name="Linux Tools Sources"/>
--   </feature>
 -   <feature url="features/org.eclipse.linuxtools.rpm.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.rpm.source" version="0.0.0">
 -      <category name="Linux Tools Sources"/>
 -   </feature>
--   <feature url="features/org.eclipse.linuxtools.rpmstubby.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.rpmstubby.feature.source" version="0.0.0">
--      <category name="Linux Tools Sources"/>
--   </feature>
 -   <feature url="features/org.eclipse.linuxtools.systemtap.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.systemtap.source" version="0.0.0">
 -      <category name="Linux Tools Sources"/>
 -   </feature>
@@ -144,7 +144,7 @@ diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig ./releng/
 -   <feature url="features/org.eclipse.linuxtools.valgrind.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind.source" version="0.0.0">
 -      <category name="Linux Tools Sources"/>
 -   </feature>
--   <feature url="features/org.eclipse.linuxtools.lttng2.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.source" version="0.0.0">
+-   <feature url="features/org.eclipse.linuxtools.lttng2.control.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.control.source" version="0.0.0">
 -      <category name="Linux Tools Sources"/>
 -   </feature>
 -   <feature url="features/org.eclipse.linuxtools.lttng2.kernel.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.kernel.source" version="0.0.0">
@@ -174,6 +174,19 @@ diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig ./releng/
 -   <feature url="features/org.eclipse.linuxtools.gdbtrace.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gdbtrace.source" version="0.0.0">
 -      <category name="Linux Tools Sources"/>
 -   </feature>
+-   <feature url="features/org.eclipse.linuxtools.tracing.rcp.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
     <category-def name="Linux Tools" label="Linux Tools">
        <description>
           Eclipse Linux Tools
+@@ -194,9 +38,4 @@
+          Eclipse Linux Tools source features and bundles
+       </description>
+    </category-def>
+-   <category-def name="Linux Tools LTTng RCP" label="Linux Tools LTTng RCP">
+-      <description>
+-         Optional LTTng features
+-      </description>
+-   </category-def>
+ </site>
diff --git a/eclipse-cdt-linuxtools-libhover-tests.patch b/eclipse-cdt-linuxtools-libhover-tests.patch
new file mode 100644
index 0000000..3f3ac28
--- /dev/null
+++ b/eclipse-cdt-linuxtools-libhover-tests.patch
@@ -0,0 +1,12 @@
+diff -up ./libhover/org.eclipse.linuxtools.cdt.libhover.tests/META-INF/MANIFEST.MF.fix ./libhover/org.eclipse.linuxtools.cdt.libhover.tests/META-INF/MANIFEST.MF
+--- ./libhover/org.eclipse.linuxtools.cdt.libhover.tests/META-INF/MANIFEST.MF.fix	2014-05-12 17:38:40.942056875 -0400
++++ ./libhover/org.eclipse.linuxtools.cdt.libhover.tests/META-INF/MANIFEST.MF	2014-05-12 17:38:49.804204358 -0400
+@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.cdt.core;bun
+  org.eclipse.core.runtime;bundle-version="3.10.0",
+  org.eclipse.ui;bundle-version="3.106.0",
+  org.eclipse.cdt.ui;bundle-version="5.8.0",
+- org.junit;bundle-version="4.11.0",
++ org.junit;bundle-version="4.10.0",
+  org.eclipse.jface.text;bundle-version="3.9.0",
+  org.eclipse.ui.ide;bundle-version="3.10.0",
+  org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0",
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 749c825..4cc19d2 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -1,14 +1,21 @@
+%{?scl:%scl_package eclipse-linuxtools}
+%{!?scl:%global pkg_name %{name}}
+
 %global debug_package %{nil}
+%global _enable_debug_packages 0
 
 Epoch: 1
 
+%global cdt_sha			962e01188674a376a2ca36f2fa9ce8a4ec68c544
+%global linuxtools_sha		e866fae2d8a67985051ef8afba50ed37b4eea105
+
 %define major                   8
-%define minor                   3       
+%define minor                   4       
 %define majmin                  %{major}.%{minor}
 %define micro                   0
 %define eclipse_base            %{_libdir}/eclipse
-%define cdt_snapshot		CDT_8_3_0
-%define linuxtools_snapshot	org.eclipse.linuxtools-2.2.1
+%define cdt_snapshot		org.eclipse.cdt-%{cdt_sha}
+%define linuxtools_snapshot	org.eclipse.linuxtools-%{linuxtools_sha}
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -22,17 +29,17 @@ Epoch: 1
 %endif
 
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
-Name:           eclipse-cdt
+Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        0.1.git20140506%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
 Requires:       eclipse-platform
 
-Source0: http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/CDT_8_3_0.tar.bz2
+Source0: http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-%{cdt_sha}.tar.bz2
 
-Source2: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-2.2.1.tar.bz2
+Source2: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{linuxtools_sha}.tar.bz2
 
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
@@ -65,20 +72,27 @@ Patch7: %{name}-linuxtools-disable-jacoco.patch
 # Following fixes up CDT top-level pom
 Patch8: %{name}-disable-jacoco.patch
 
+# Following fixes problem with junit OSGI bundle version
+Patch9: %{name}-linuxtools-libhover-tests.patch
+
 BuildRequires: tycho
 BuildRequires: tycho-extras
-BuildRequires: eclipse-pde >= 1:4.3.0
-BuildRequires: eclipse-rse >= 3.4
+BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0
+BuildRequires: %{?scl_prefix}eclipse-rse >= 3.4
+BuildRequires: %{?scl_prefix}eclipse-remote
+BuildRequires: eclipse-license
 BuildRequires: maven-local
 BuildRequires: java-devel >= 1:1.7.0
 BuildRequires: lpg-java-compat
-BuildRequires: eclipse-platform >= 1:4.3.0
-BuildRequires: eclipse-tests >= 1:4.3.0
+BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.3.0
+BuildRequires: %{?scl_prefix}eclipse-tests >= 1:4.3.0
+BuildRequires: nekohtml >= 1.9.14
 BuildRequires: exec-maven-plugin
 
 Requires:       gdb make gcc-c++ autoconf automake libtool
-Requires:       eclipse-platform >= 1:4.3.0
-Requires:	eclipse-rse >= 3.4
+Requires:       %{?scl_prefix}eclipse-platform >= 1:4.3.0
+Requires:	%{?scl_prefix}eclipse-rse >= 3.4
+Requires: 	nekohtml >= 1.9.14
 
 %if 0%{?rhel} >= 6
 ExclusiveArch: %{ix86} x86_64
@@ -114,7 +128,7 @@ Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       %{name}-llvm = %{epoch}:%{version}-%{release}
 Requires:       %{name}-parsers = %{epoch}:%{version}-%{release}
-Requires:       eclipse-tests
+Requires:       %{?scl_prefix}eclipse-tests
 
 %description tests
 Test plugins for the CDT.
@@ -174,10 +188,10 @@ pushd %{linuxtools_snapshot}
 
 %patch5 -p0
 %patch7 -p0
+%patch9 -p0
 
 %pom_disable_module changelog
 %pom_disable_module profiling
-%pom_disable_module rpmstubby
 %pom_disable_module lttng
 %pom_disable_module valgrind
 %pom_disable_module gcov
@@ -186,6 +200,8 @@ pushd %{linuxtools_snapshot}
 %pom_disable_module systemtap
 %pom_disable_module perf
 %pom_disable_module rpm
+mkdir -p .m2/p2/repo-sdk/features/
+cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/
 popd
 pushd %{linuxtools_snapshot}/libhover
 # newlib libhover is an optional feature...remove it from CDT base
@@ -203,6 +219,7 @@ popd
 popd
 
 %build
+%{?scl:%scl_maven_opts}
 export JAVA_HOME=%{java_home}
 
 # Exclude EquinoxResolver to avoid NPE occuring on arm
@@ -238,6 +255,7 @@ mkdir -p .m2/p2/repo-sdk/features
 mkdir -p .m2/p2/repo-sdk/plugins
 cp -d  $SDK/features/*.jar .m2/p2/repo-sdk/features
 cp -d $SDK/plugins/*.jar .m2/p2/repo-sdk/plugins
+cp -r %{_javadir}/neko*.jar .m2/p2/repo-sdk/plugins/
 
 mvn-rpmbuild -DskipTychoVersionCheck -Dmaven.test.skip=true -fae clean install
 
@@ -311,7 +329,7 @@ mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins
 pushd $parsersInstallDir/eclipse/plugins
-ln -s ../../../../../../share/java/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
+ln -s /usr/share/java/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 popd
 
 # Move llvm plugins/features to llvm install area.
@@ -361,6 +379,10 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Tue May 13 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.1.git20140506
+- Update CDT to 8.4.0 Luna M7 build
+- Update Libhover to Linux Tools 3.0 Luna M7 build
+
 * Wed Mar 05 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.3.0-1
 - Update CDT to 8.3.0 (Kepler SR2)
 - Update Libhover to Linux Tools 2.2.1 (Kepler SR2)
diff --git a/sources b/sources
index 09fda10..6582ac7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
-b48f724a12bf190e1e3f208f60e2f140  CDT_8_3_0.tar.bz2
-4336a32702a504d2026994c5ee1b62bc  org.eclipse.linuxtools-2.2.1.tar.bz2
+187c7408daa9999710d28ef36dfa8458  org.eclipse.cdt-962e01188674a376a2ca36f2fa9ce8a4ec68c544.tar.bz2
+9d2ecc68449e35b046e3b85580604a77  org.eclipse.linuxtools-e866fae2d8a67985051ef8afba50ed37b4eea105.tar.bz2