diff --git a/.gitignore b/.gitignore
index ebc477e..058430e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ cachefilesd-0.10.tar.bz2
 cachefilesd-0.10.1.tar.bz2
 /cachefilesd-0.10.3.tar.bz2
 /cachefilesd-0.10.4.tar.bz2
+/cachefilesd-0.10.5.tar.bz2
diff --git a/cachefilesd.spec b/cachefilesd.spec
index c08bdc6..bc35b4e 100644
--- a/cachefilesd.spec
+++ b/cachefilesd.spec
@@ -1,7 +1,7 @@
 # % define buildid .local
 
 Name:		cachefilesd
-Version:	0.10.4
+Version:	0.10.5
 Release:	1%{?dist}%{?buildid}
 Summary:	CacheFiles user-space management daemon
 Group:		System Environment/Daemons
@@ -33,7 +33,7 @@ PIE="-fpie"
 export PIE
 CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`"
 
-make all
+make all CFLAGS="$CFLAGS"
 
 %install
 rm -rf %{buildroot}
@@ -87,8 +87,14 @@ fi
 %{_localstatedir}/cache/fscache
 
 %changelog
+* Tue Dec 6 2011 David Howells <dhowells@redhat.com> 0.10.5-1
+- Fix systemd service data according to review comments [RH BZ 754811].
+
+* Tue Dec 6 2011 Dan Horák <dan[at]danny.cz>
+- use Fedora CFLAGS in build (fixes build on s390)
+
 * Wed Nov 30 2011 David Howells <dhowells@redhat.com> 0.10.4-1
-- Fix packaging of systemd service file.
+- Fix packaging of systemd service file [RH BZ 754811].
 - Fix rpmlint complaints.
 
 * Tue Nov 22 2011 David Howells <dhowells@redhat.com> 0.10.3-1
diff --git a/sources b/sources
index 6e051ea..d86b53c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6066f66586180f845f414a7e651b7483  cachefilesd-0.10.4.tar.bz2
+9e85dd0ace346ff47e188ded8c05ab3b  cachefilesd-0.10.5.tar.bz2