diff --git a/bcache-tools.spec b/bcache-tools.spec
index 9871684..ec065aa 100644
--- a/bcache-tools.spec
+++ b/bcache-tools.spec
@@ -3,7 +3,7 @@
 Summary: Tools for Linux kernel block layer cache
 Name: bcache-tools
 Version: 1.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://bcache.evilpiepirate.org/
@@ -28,6 +28,9 @@ Patch2: %{name}-20131018-fedconf.patch
 # util-linux takes care of bcache superblock identification so we remove
 # the probe-cache call (which is Fedora specific):
 Patch3: %{name}-1.0.8-noprobe.patch
+# the following fix is pending upstream
+# gcc 5.1.1 apparently is more picky than Fedora 21 gcc
+Patch4: bcache-tools-1.0.8-crc64.patch
 
 Requires: python
 # This is a kind of soft dependency: because we don't include probe-bcache
@@ -53,6 +56,7 @@ tar xzf %{SOURCE1} --strip-components=1
 %patch2 -p1 -b .fedconfmake
 chmod +x configure
 %patch3 -p1 -b .noprobe
+%patch4 -p1 -b .crc64
 
 %build
 %configure
@@ -92,6 +96,9 @@ install -p  -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status
 %{dracutlibdir}/modules.d/90bcache
 
 %changelog
+* Fri May 22 2015 Rolf Fokkens <rolf@rolffokkens.nl> - 1.0.8-2
+- (#1224384) Now compiles on Fedora 22 / gcc 5.1.1
+
 * Fri Dec 05 2014 Rolf Fokkens <rolf@rolffokkens.nl> - 1.0.8-1
 - Sourced now from https://github.com/g2p/bcache-tools.git