diff --git a/swig-ccache-conflict-fix.patch b/swig-ccache-conflict-fix.patch
new file mode 100644
index 0000000..8834d35
--- /dev/null
+++ b/swig-ccache-conflict-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/CCache/test.sh b/CCache/test.sh
+index 6e5d267..a0e888d 100755
+--- a/CCache/test.sh
++++ b/CCache/test.sh
+@@ -15,6 +15,10 @@ else
+  SWIG=swig
+ fi
+ 
++# RH fix: Remove ccache from $PATH if it exists
++# as it will influence the unit tests
++PATH="`echo $PATH |awk -v RS=: -v ORS=: '/\/usr\/lib(64|)\/ccache(:|)/ {next} {print}' | sed 's/:*$//'`"
++
+ CCACHE=../ccache-swig
+ TESTDIR=test.$$
+ 
diff --git a/swig.spec b/swig.spec
index b86ad92..6c9b9c3 100644
--- a/swig.spec
+++ b/swig.spec
@@ -33,7 +33,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
 Version: 3.0.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+ and BSD
 URL:     http://swig.sourceforge.net/
 Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
@@ -44,6 +44,7 @@ Source1: description.h2m
 Patch1:  swig307-Fix-Ruby-trackings-code-to-use-C-hash.patch
 Patch2:  swig307-Ruby-trackings-patch-tidy-up.patch
 Patch3:  swig307-Ruby-trackings-support-for-1.8.patch
+Patch4:  swig-ccache-conflict-fix.patch
 
 BuildRequires: perl, python2-devel, pcre-devel
 BuildRequires: autoconf, automake, gawk, dos2unix
@@ -110,6 +111,7 @@ This package contains documentation for SWIG and useful examples
 %patch1 -p1 -b .rubyhash
 %patch2 -p1 -b .rubytidyup
 %patch3 -p1 -b .ruby18
+%patch4 -p1 -b .ccache-conflict
 
 for all in CHANGES README; do
     iconv -f ISO88591 -t UTF8 < $all > $all.new
@@ -209,6 +211,10 @@ ln -fs ../../bin/ccache-swig %{buildroot}%{_libdir}/ccache/swig
 %doc Doc Examples COPYRIGHT
 
 %changelog
+* Wed Oct 21 2015 David Sommerseth <davids@redhat.com> - 3.0.7-8
+- Ignore locally installed ccache when running CCache unit tests
+- Resolves: bz#1274031
+
 * Wed Sep 16 2015 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.7-7
 - Remove the old setools patch. The bug was already fixed by upstream
 - Resolves: bz#1180257