diff --git a/.gitignore b/.gitignore
index cb408fe..b9ca421 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /aespipe-v2.4b.tar.bz2
 /aespipe-v2.4c.tar.bz2
+/aespipe-v2.4d.tar.bz2
diff --git a/aespipe.spec b/aespipe.spec
index 7d0bd96..8af9b46 100644
--- a/aespipe.spec
+++ b/aespipe.spec
@@ -1,8 +1,9 @@
 Summary:        AES-based encryption tool for tar/cpio and loop-aes images
 Name:           aespipe
-Version:        2.4c
-Release:        10%{?dist}
+Version:        2.4d
+Release:        1%{?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
@@ -25,8 +26,7 @@ kernel module.
 %setup -q -n %{name}-v%{version}
 
 %build
-# Package calls CC to link
-%configure LDFLAGS="${CFLAGS}"
+%configure
 
 %global make_target %{nil}
 %ifarch x86_64
@@ -35,55 +35,36 @@ 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
-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
+%{__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
 
+%clean
+%{__rm} -rf %{buildroot}
 
 %files
+%defattr(-, root, root, -)
 %dir %{_defaultdocdir}/%{name}
 %{_defaultdocdir}/%{name}/*
 %{_mandir}/man1/*
 %{_bindir}/aespipe
 
 %changelog
-* Tue Jul 07 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.4c-10
-- Add LDFLAGS=${CFLAGS} to %%configure (Fix F23FTBFS RHBZ#1239364).
+* Thu Aug 20 2015 Jirka Hladky <hladky.jiri@gmail.com> - 2.4d-1
+- Update to version 2.4d
 
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4c-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* 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
-
-* 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
+* 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
 
 * Sun Jul  3 2011 Jirka Hladky <jhladky@redhat.com> - 2.4c
   - Update to version 2.4c
diff --git a/sources b/sources
index 53e2dce..61e434a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97b1f481721ea5d65018ddae1143bac5  aespipe-v2.4c.tar.bz2
+bcf49066053aabf9e291a00b20bc5f00  aespipe-v2.4d.tar.bz2