diff --git a/mcelog.spec b/mcelog.spec
index 95eea6e..8940810 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -3,7 +3,7 @@
 Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
 Version:	1.0
-Release:	0.8.%{last_git_commit}%{?dist}
+Release:	0.9.%{last_git_commit}%{?dist}
 Epoch:		2
 Group:		System Environment/Base
 License:	GPLv2
@@ -13,11 +13,12 @@ Source2:	mcelog.service
 Source10:	mcelog.setup
 Patch0:		mcelog-fix-trigger-path-and-cacheing.patch
 URL:		https://github.com/andikleen/mcelog.git
-Buildroot:	%{_tmppath}/%{name}-%{version}-root
+
 ExclusiveArch:	i686 x86_64
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+BuildRequires: systemd-devel
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description
 mcelog is a utility that collects and decodes Machine Check Exception data
@@ -35,7 +36,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}
 make CFLAGS="$RPM_OPT_FLAGS -fpie -pie"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,8}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers
@@ -53,9 +53,6 @@ install -p -m755 mcelog.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/mcelog.c
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service
 install -p -m644 mcelog.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 systemctl enable mcelog.service &> /dev/null ||
 systemctl daemon-reload &> /dev/null
@@ -74,7 +71,6 @@ if [ "$1" -ge 1 ]; then
 fi
 
 %files
-%defattr(-,root,root,-)
 %doc README CHANGES
 %{_sbindir}/mcelog
 %dir %{_sysconfdir}/mcelog
@@ -86,6 +82,9 @@ fi
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Sun Aug  4 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2:1.0-0.9.6e4e2a00
+- Fix FBTFS, modernise spec
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:1.0-0.8.6e4e2a00
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild