diff --git a/afpfs-ng.spec b/afpfs-ng.spec
index 3bdd838..c59a17e 100644
--- a/afpfs-ng.spec
+++ b/afpfs-ng.spec
@@ -5,7 +5,7 @@
 
 Name:           afpfs-ng
 Version:        0.8.1
-Release:        12%{?dist}.3
+Release:        13%{?dist}.3
 Summary:        Apple Filing Protocol client
 
 Group:          System Environment/Base
@@ -14,7 +14,6 @@ URL:            http://alexthepuffin.googlepages.com/home
 Source0:        http://downloads.sourceforge.net/afpfs-ng/%{name}-%{version}.tar.bz2
 Patch0:         afpfs-ng-0.8.1-overflows.patch
 Patch1:         afpfs-ng-0.8.1-pointer.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %{?!_without_fuse:BuildRequires: fuse-devel}
 BuildRequires: libgcrypt-devel gmp-devel readline-devel
@@ -64,18 +63,12 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_includedir}/afpfs-ng
-cp -p include/* $RPM_BUILD_ROOT%{_includedir}/afpfs-ng
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
+install -d %{buildroot}%{_includedir}/afpfs-ng
+cp -p include/* %{buildroot}%{_includedir}/afpfs-ng
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/afpcmd
 %{_bindir}/afpgetstatus
 %{_mandir}/man1/afpcmd.1*
@@ -87,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{?!_without_fuse:1}0
 %files -n fuse-afp
-%defattr(-,root,root,-)
 %{_bindir}/afp_client
 %{_bindir}/afpfs
 %{_bindir}/afpfsd
@@ -100,7 +92,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/afpfs-ng
 %{_libdir}/*.so
 
@@ -112,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 24 2013 Lubomir Rintel <lkundrak@v3.sk> - 0.8.1-13.3
+- Bulk sad and useless attempt at consistent SPEC file formatting
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-12.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild