diff --git a/aespipe.spec b/aespipe.spec
index 8c97e17..8b4358b 100644
--- a/aespipe.spec
+++ b/aespipe.spec
@@ -1,9 +1,8 @@
 Summary:        AES-based encryption tool for tar/cpio and loop-aes images
 Name:           aespipe
 Version:        2.4c
-Release:        2%{?dist}
+Release:        7%{?dist}
 License:        GPLv2+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/System
 URL:            http://loop-aes.sourceforge.net/
 Source:         http://loop-aes.sourceforge.net/aespipe/aespipe-v%{version}.tar.bz2
@@ -35,36 +34,46 @@ kernel module.
 %ifarch %{ix86}
 %global make_target x86
 %endif
-%{__make} %{?_smp_mflags} %{make_target}
+make %{?_smp_mflags} %{make_target}
 
 %check
-%{__make} tests
+make tests
 
 %install
-%{__rm} -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_defaultdocdir}/%{name}/examples
-%{__cp} -p ChangeLog README %{buildroot}%{_defaultdocdir}/%{name}
-%{__install} -Dp -m0644 bz2aespipe %{buildroot}%{_defaultdocdir}/%{name}/examples
-%{__install} -Dp -m0644 aespipe.1 %{buildroot}%{_mandir}/man1/aespipe.1
-%{__install} -Dp -m0755 aespipe %{buildroot}%{_bindir}/aespipe
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/examples
+cp -p ChangeLog README %{buildroot}%{_defaultdocdir}/%{name}
+install -Dp -m0644 bz2aespipe %{buildroot}%{_defaultdocdir}/%{name}/examples
+install -Dp -m0644 aespipe.1 %{buildroot}%{_mandir}/man1/aespipe.1
+install -Dp -m0755 aespipe %{buildroot}%{_bindir}/aespipe
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-, root, root, -)
 %dir %{_defaultdocdir}/%{name}
 %{_defaultdocdir}/%{name}/*
 %{_mandir}/man1/*
 %{_bindir}/aespipe
 
 %changelog
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-2
+* Sun Jun 22 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.4c-7
+- Modernise spec, fixup scew with f20
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Sat Jan 04 2014 Jirka Hladky <hladky.jiri@gmail.com> - 2.4c-1
-- Unversioned docdir change, more info on 
-  https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+* Thu Aug  8 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.4c-5
+- Use special %%doc to install docs (#993663).
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Sun Jul  3 2011 Jirka Hladky <jhladky@redhat.com> - 2.4c
   - Update to version 2.4c