diff --git a/.gitignore b/.gitignore
index f028d85..ab5a091 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ ammacros-1.9.6.xml
 /CDT_9_4_2.tar.gz
 /CDT_9_4_3.tar.gz
 /025742ca9153703cbbe803bfa667706c6b7d3543.tar.gz
+/org.eclipse.tools.templates-c7881b5a9894ee1fdb2fa9bc5dd37359533627b5.tar.xz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index cdd3f87..d967161 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -13,8 +13,8 @@
 Epoch: 1
 
 %global eclipse_base            %{_datadir}/eclipse
-%global cdt_snapshot            025742ca9153703cbbe803bfa667706c6b7d3543
-%global template_snapshot       org.eclipse.tools.templates-b7cecf0b4a70eb74346d3de33096d16b2bbcd880
+%global cdt_snapshot            org.eclipse.cdt-e6550c7a10b51ae7deeb78138277b69c2d6a9ec3
+%global template_snapshot       org.eclipse.tools.templates-c7881b5a9894ee1fdb2fa9bc5dd37359533627b5
 
 %ifarch %{ix86}
     %global eclipse_arch x86
@@ -36,11 +36,11 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
-Source0: https://github.com/eclipse/cdt/archive/%{cdt_snapshot}.tar.gz
+Source0: http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/%{cdt_snapshot}.tar.xz
 
 # This could be broken out into a separate SRPM if another project starts using it
 Source1: http://git.eclipse.org/c/cdt/org.eclipse.tools.templates.git/snapshot/%{template_snapshot}.tar.xz
@@ -194,7 +194,7 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 Source for Eclipse CDT for use within Eclipse.
 
 %prep
-%setup -q -n cdt-%{cdt_snapshot}
+%setup -q -n %{cdt_snapshot}
 
 # get desktop info
 mkdir desktop
@@ -357,6 +357,15 @@ sed -i -e 's/org.freemarker/org.freemarker.freemarker/' \
   bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF \
   build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
 
+# Don't package problematic test data
+rm core/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.so
+rm core/org.eclipse.cdt.core.tests/resources/exebig/x86/o.g/exebig_g
+rm core/org.eclipse.cdt.core.tests/resources/exe/x86/o.g/exe_g
+rm core/org.eclipse.cdt.core.tests/resources/exe/x86/o/exe
+rm core/org.eclipse.cdt.core.tests/resources/exe/ppc/be.g/exe_g
+find core/org.eclipse.cdt.core.tests/resources -name *.o -delete
+find core/org.eclipse.cdt.core.tests/resources -name *.a -delete
+
 %mvn_package "::pom::" __noinstall
 %mvn_package ":*.{testing,tests,tests.dsf,tests.dsf.gdb}" tests
 %mvn_package "::jar:sources{,-feature}:" sdk
@@ -559,6 +568,9 @@ fi
 %endif
 
 %changelog
+* Sat Jun 23 2018 Mat Booth <mat.booth@redhat.com> - 1:9.5.0-2
+- Update due to respin of 9.5.0
+
 * Wed Jun 13 2018 Mat Booth <mat.booth@redhat.com> - 1:9.5.0-1
 - Update to Photon release
 
diff --git a/sources b/sources
index f86b6d7..4714516 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (org.eclipse.tools.templates-b7cecf0b4a70eb74346d3de33096d16b2bbcd880.tar.xz) = 99037d35b4d91d9fdb8dc22b5e2816ac1df9e4e1b192c430fd02aa1630e27c0573ed9d82b2c0d27573cc27aca75be72237ef7a4648edd7234523896b62b14490
-SHA512 (025742ca9153703cbbe803bfa667706c6b7d3543.tar.gz) = 0422d20a35d528a8341ec60e09b9e96895958aa40c2de1a10aacf97064466669b02131caf40087b572a65365e19cfdbb0d64ed6af015a70f81c586436961c16d
+SHA512 (org.eclipse.cdt-e6550c7a10b51ae7deeb78138277b69c2d6a9ec3.tar.xz) = 5a10774cd4d63c77075e5b56c49397ee41a32fe9f9fed9ecb985aab4d320a003dfb9dfcf68b979077937bc2b3125ed29db8319497a4914c0f13472bb5e2d8842
+SHA512 (org.eclipse.tools.templates-c7881b5a9894ee1fdb2fa9bc5dd37359533627b5.tar.xz) = 68b8829ef2931e652fa73617cc02b5f7581c44010cbed0bdbfa8024ab8a6d85436c8a057082915126b4b4e44423ef40ad51008f702a28d0f61f99ac93509cfa6