diff --git a/.gitignore b/.gitignore
index 65df61c..33d52e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,87 +1,23 @@
-eclipse-cdt-autotools-0.9.0.tar.gz
-eclipse-cdt-autotools-0.9.1.tar.gz
-eclipse-cdt-fetched-src-4_0_0.tar.bz2
-eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
-eclipse-cdt-fetched-src-CDT_4_0_1.tar.bz2
-eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
-eclipse-cdt-fetched-src-v200709241202.tar.bz2
-eclipse-cdt-fetched-src-autotools-0_9_5.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_5_1.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_5_3.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
-eclipse-cdt-fetched-src-cdt_5_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
-eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
-eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz
-eclipse-cdt-fetched-src-autotools-20081106.tar.gz
-eclipse-cdt-fetched-src-libhover-20081106.tar.gz
-eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
-eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
-eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
-eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
-eclipse-cdt-fetched-src-v200906161748.tar.bz2
-eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz
-eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
+eclipse-cdt-autotools-*.tar.gz
+eclipse-cdt-fetched-src-CDT_*.tar.bz2
+eclipse-cdt-fetched-src-autotools-*.tar.gz
+eclipse-cdt-fetched-src-libhover-*.tar.gz
+eclipse-cdt-fetched-src-*.tar.bz2
 libstdc++-v3.libhover
 glibc-2.7-2.libhover
-eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
-eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
-eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
 acmacros-2.13.xml
 acmacros-2.59.xml
 acmacros-2.61.xml
 ammacros-1.4-p6.xml
 ammacros-1.9.5.xml
 ammacros-1.9.6.xml
-eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
-eclipse-cdt-fetched-src-v201002161416.tar.bz2
-eclipse-cdt-fetched-src-autotools-R0_5_0.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_5_0.tar.gz
-eclipse-cdt-fetched-src-autotools-R0_5_1.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_5_1.tar.gz
-eclipse-cdt-fetched-src-CDT_7_0_0.tar.bz2
-eclipse-cdt-fetched-src-libhover-R0_6_0.tar.gz
-eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
-/eclipse-cdt-fetched-src-cdt_7_0_1.tar.bz2
-/eclipse-cdt-fetched-src-autotools-R0_6_1.tar.gz
-/eclipse-cdt-fetched-src-libhover-R0_6_1.tar.gz
-/eclipse-cdt-fetched-src-v201106081058.tar.bz2
-/eclipse-cdt-fetched-src-autotools-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
-/eclipse-cdt-fetched-src-libhover-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
-/eclipse-cdt-fetched-src-CDT_8_0_1.tar.bz2
-/eclipse-cdt-fetched-src-libhover-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz
-/eclipse-cdt-fetched-src-autotools-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz
-/eclipse-cdt-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz
-/org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b.tar.gz
-/org.eclipse.cdt-be41120c4e91cb1807dc5709ded503e397ba2ac2.tar.gz
-/linuxtools-libhover-parent-1.0.0-src.tar.bz2
-/org.eclipse.cdt-CDT_8_1_0.tar.bz2
-/org.eclipse.cdt-CDT_8_1_1.tar.bz2
-/linuxtools-libhover-parent-1.1.1-src.tar.bz2
-/org.eclipse.cdt-CDT_8_1_2.tar.bz2
-/linuxtools-libhover-parent-1.2.1-src.tar.bz2
-/org.eclipse.cdt-4d70fc3fd4c20efd657602e8ce65d51d0ffce2a6.tar.gz
-/org.eclipse.linuxtools-95aacfe82466cb691f5adf09aae33c361335935b.tar.bz2
-/org.eclipse.cdt-fa9cd1cecdd7a31efb13dc93f3511891f8b4712f.tar.gz
-/org.eclipse.cdt-67425186a2c74e1215670c6a1edd2162b474819d.tar.gz
-/org.eclipse.linuxtools-bbc44749038c54855ded76edb489054dda678d87.tar.bz2
-/org.eclipse.cdt-3336cd19e6db3d1c509d99f6138b8c12546d4096.tar.gz
-/org.eclipse.linuxtools-2.0.0.tar.bz2
-/org.eclipse.linuxtools-2.1.0.tar.bz2
-/org.eclipse.linuxtools-2.2.1.tar.bz2
-/org.eclipse.cdt-962e01188674a376a2ca36f2fa9ce8a4ec68c544.tar.bz2
-/org.eclipse.linuxtools-e866fae2d8a67985051ef8afba50ed37b4eea105.tar.bz2
+/org.eclipse.cdt-*.tar.gz
+/linuxtools-libhover-parent-*-src.tar.bz2
+/org.eclipse.cdt-CDT_*.tar.bz2
+/org.eclipse.cdt-*.tar.gz
+/org.eclipse.linuxtools-*.tar.bz2
 /eclipse-cdt.desktop
-/org.eclipse.linuxtools-3.0.0.tar.bz2
 /*.src.rpm
 /.project
 /CDT_*.tar.bz2
 /eclipse-cdt-*/
-/org.eclipse.linuxtools-3.1.0b.tar.bz2
diff --git a/eclipse-cdt-cdtdebug-readme.patch b/eclipse-cdt-cdtdebug-readme.patch
index 0af57d9..8b7dfb3 100644
--- a/eclipse-cdt-cdtdebug-readme.patch
+++ b/eclipse-cdt-cdtdebug-readme.patch
@@ -1,6 +1,8 @@
---- ./debug/org.eclipse.cdt.debug.application/scripts/README.orig	2014-10-06 16:33:21.416058105 +0100
-+++ ./debug/org.eclipse.cdt.debug.application/scripts/README	2014-10-06 16:40:19.099193769 +0100
-@@ -3,15 +3,11 @@
+diff --git a/debug/org.eclipse.cdt.debug.application/scripts/README b/debug/org.eclipse.cdt.debug.application/scripts/README
+index 0bed384..b761e30 100644
+--- a/debug/org.eclipse.cdt.debug.application/scripts/README
++++ b/debug/org.eclipse.cdt.debug.application/scripts/README
+@@ -3,15 +3,11 @@ is needed of the CDT plug-ins to debug a C/C++ executable.  Build is not support
  Editing is allowed, but you will need to rebuild outside the Stand-alone Debugger for
  those changes to manifest in your debugging session.
  
@@ -20,13 +22,13 @@
  
  The script takes a few options which are mentioned below:
  
-@@ -39,8 +35,5 @@
+@@ -55,8 +51,5 @@ If no -a or -e option is specified, the last executable debugged via -e will be
  debugging.  Otherwise, if this is the first time, a dialog will be presented to enter
  an executable, build log, and program arguments.
  
--  e.g. ~/cdtdebugger/cdtdebug.sh -b ~/build.log ~/myproject/bin/a.out arg1 arg2
+-  e.g. ~/cdtdebugger/cdtdebug.sh -b ~/build.log -e ~/myproject/bin/a.out arg1 arg2
 -
 -The cdtdebug.sh script that is found in the plug-in can also be run directly, but cannot
 -be moved.  The one installed in the cdtdebugger directory on the other hand, can be moved.
-+  e.g. cdtdebug -b ~/build.log ~/myproject/bin/a.out arg1 arg2
++    e.g. cdtdebug -b ~/build.log ~/myproject/bin/a.out arg1 arg2
  
diff --git a/eclipse-cdt-disable-jacoco.patch b/eclipse-cdt-disable-jacoco.patch
index e06ae72..c87e74f 100644
--- a/eclipse-cdt-disable-jacoco.patch
+++ b/eclipse-cdt-disable-jacoco.patch
@@ -1,14 +1,14 @@
 diff -up ./pom.xml.fix ./pom.xml
 --- ./pom.xml.fix	2014-03-05 17:26:37.417268725 -0500
 +++ ./pom.xml	2014-03-05 17:26:54.337527088 -0500
-@@ -397,27 +397,6 @@
+@@ -505,27 +505,6 @@
  					</execution>
  				</executions>
  			</plugin>
 -			<plugin>
 -				<groupId>org.jacoco</groupId>
 -				<artifactId>jacoco-maven-plugin</artifactId>
--				<version>0.6.2.201302030002</version>
+-				<version>0.7.1.201405082137</version>
 -				<executions>
 -					<execution>
 -						<id>pre-test</id>
diff --git a/eclipse-cdt-linuxtools-features.patch b/eclipse-cdt-linuxtools-features.patch
index 8fadd1c..981b1a8 100644
--- a/eclipse-cdt-linuxtools-features.patch
+++ b/eclipse-cdt-linuxtools-features.patch
@@ -1,6 +1,8 @@
---- ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig	2014-09-17 17:48:49.000000000 +0100
-+++ ./releng/org.eclipse.linuxtools.releng-site/category.xml	2014-10-09 16:01:48.156786963 +0100
-@@ -7,184 +7,22 @@
+diff --git releng/org.eclipse.linuxtools.releng-site/category.xml releng/org.eclipse.linuxtools.releng-site/category.xml
+index 6235b53..51628cf 100644
+--- releng/org.eclipse.linuxtools.releng-site/category.xml
++++ releng/org.eclipse.linuxtools.releng-site/category.xml
+@@ -7,190 +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>
@@ -98,6 +100,9 @@
 -   <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.lttng.testing_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.testing" 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>
@@ -182,10 +187,13 @@
 -   <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>
+-   <feature url="features/org.eclipse.linuxtools.lttng.testing.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.testing.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
     <category-def name="Linux Tools" label="Linux Tools">
        <description>
           Eclipse Linux Tools
-@@ -200,9 +38,4 @@
+@@ -206,9 +38,4 @@
           Eclipse Linux Tools source features and bundles
        </description>
     </category-def>
diff --git a/eclipse-cdt-remove-launchbar.patch b/eclipse-cdt-remove-launchbar.patch
deleted file mode 100644
index 672b65e..0000000
--- a/eclipse-cdt-remove-launchbar.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix	2014-09-18 18:03:05.718999013 -0400
-+++ ./pom.xml	2014-09-18 18:05:39.233561691 -0400
-@@ -208,13 +208,13 @@
- 		<module>remote/org.eclipse.cdt.remote.core</module>
- 		<module>remote/org.eclipse.cdt.remote-feature</module>
- 		
-+<!-- 
- 		<module>launch/org.eclipse.cdt.launchbar.core</module>
- 		<module>launch/org.eclipse.cdt.launchbar.ui</module>
- 		<module>launch/org.eclipse.cdt.launchbar.cdt.core</module>
- 		<module>launch/org.eclipse.cdt.launchbar-feature</module>
- 	    <module>launch/org.eclipse.cdt.launchbar.core.tests</module>
- 
--<!-- 
- 		<module>lrparser/org.eclipse.cdt.core.lrparser.tests</module>
- 		<module>upc/org.eclipse.cdt.core.parser.upc.tests</module>
- 		<module>xlc/org.eclipse.cdt.core.lrparser.xlc.tests</module>
-diff -up ./releng/org.eclipse.cdt.testing-feature/feature.xml.fix ./releng/org.eclipse.cdt.testing-feature/feature.xml
---- ./releng/org.eclipse.cdt.testing-feature/feature.xml.fix	2014-09-18 18:26:48.912765297 -0400
-+++ ./releng/org.eclipse.cdt.testing-feature/feature.xml	2014-09-18 18:27:02.023991362 -0400
-@@ -70,13 +70,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.cdt.launchbar.core.tests"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.cdt.tests.dsf.gdb"
-          download-size="0"
-          install-size="0"
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 4a9c159..f0b1abd 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -7,12 +7,12 @@
 Epoch: 1
 
 %define major                   8
-%define minor                   5
+%define minor                   6
 %define majmin                  %{major}.%{minor}
 %define micro                   0
 %define eclipse_base            %{_libdir}/eclipse
-%define cdt_snapshot		CDT_8_5_0
-%define linuxtools_snapshot	org.eclipse.linuxtools-3.1.0b
+%define cdt_snapshot		CDT_8_6_0
+%define linuxtools_snapshot	org.eclipse.linuxtools-3.2.0
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -28,7 +28,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -81,9 +81,6 @@ Patch9: %{pkg_name}-cdtdebug-readme.patch
 # Following fixes jetty reqs in CDT target
 Patch10: %{pkg_name}-target.patch
 
-# Following removes experimental launchbar feature from build
-Patch11: %{pkg_name}-remove-launchbar.patch
-
 BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0
@@ -96,6 +93,7 @@ BuildRequires: java-devel >= 1:1.7.0
 BuildRequires: %{?scl_prefix}lpg-java-compat
 BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.3.0
 BuildRequires: %{?scl_prefix}eclipse-tests >= 1:4.3.0
+BuildRequires: %{?scl_prefix}eclipse-swtbot
 BuildRequires: nekohtml >= 1.9.21-3
 BuildRequires: exec-maven-plugin
 
@@ -165,7 +163,6 @@ pushd %{cdt_snapshot}
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Add secondary arch support if we are building there
 %ifarch %{arm} s390 s390x aarch64
@@ -199,6 +196,10 @@ sed -i -e"/<module>core\/org.eclipse.cdt.core.linux.x86<\/module>/ a\ \t\t<modul
 pushd core/org.eclipse.cdt.core.linux.%{eclipse_arch}
 sed -i -e"/Bundle-Localization: plugin/ aEclipse-BundleShape: dir" META-INF/MANIFEST.MF
 popd
+
+# Disable the jgit provider and force default packaging
+%pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin
+
 popd
 
 ## Libhover stuff
@@ -262,7 +263,7 @@ make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
 popd
 
 %{?scl:scl enable %{scl} - <<"EOF"}
-xmvn -o -Dtycho.local.keepTarget -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install
+xmvn -o -Dtycho.local.keepTarget -Dskip-ppc64le -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install
 %{?scl:EOF}
 
 ## Libhover has dependencies on CDT so we must add these to the SDK directory
@@ -486,6 +487,9 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Thu Feb 26 2015 Roland Grunberg <rgrunber@redhat.com> - 1:8.6.0-1
+- Update to Luna SR2 release 8.6.0.
+
 * Thu Oct 09 2014 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-3
 - Update libhover
 - Prefer macro usage instead of patching poms
diff --git a/sources b/sources
index 1ed658e..f113f24 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 da9186b8edfc5f4efaa189ad7c0eb26f  eclipse-cdt.desktop
-87352c8d344c04d03b641be07343a4ac  CDT_8_5_0.tar.bz2
-a57ce079f4e839c7edecf9ff7a5b81a2  org.eclipse.linuxtools-3.1.0b.tar.bz2
+7a02d1149e6f33edac85f6f6c0d90b3d  CDT_8_6_0.tar.bz2
+ead98020851c4b5a8b8741fb80d48fb7  org.eclipse.linuxtools-3.2.0.tar.bz2