diff --git a/astronomy-menus.spec b/astronomy-menus.spec
index 46f9cdc..62c9d0b 100644
--- a/astronomy-menus.spec
+++ b/astronomy-menus.spec
@@ -1,6 +1,6 @@
 Name:           astronomy-menus
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Astronomy menu for the Desktop
 Group:          User Interface/Desktops
 License:        Public Domain
@@ -9,7 +9,6 @@ URL:            http://fedoraproject.org/wiki/SIGs/Astronomy
 # make -C astronomy/projects/astronomy-menus dist
 Source0:        %{name}-%{version}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       redhat-menus hicolor-icon-theme
 BuildRequires:  m4 tidy
@@ -41,18 +40,13 @@ make %{_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 
 %check
 make test
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -82,7 +76,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/astronomy.menu
 %{_datadir}/desktop-directories/Astronomy.directory
 %{_datadir}/icons/hicolor/scalable/devices/dome.svg
@@ -90,7 +83,6 @@ fi
 
 
 %files toplevel
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/astronomy-toplevel.menu
 %{_datadir}/desktop-directories/Astronomy.directory
 %{_datadir}/icons/hicolor/scalable/devices/dome.svg
@@ -98,6 +90,9 @@ fi
 
 
 %changelog
+* Thu Oct 24 2013 Lubomir Rintel <lkundrak@v3.sk> - 1.0-9
+- Bulk sad and useless attempt at consistent SPEC file formatting
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -116,7 +111,7 @@ fi
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak@v3.sk> - 1.0-2
+* Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak@v3.sk> - 1.0-2
 - Fix BRs and call scriptlets for the subpackage as well (Marek Mahut)
 
 * Tue Mar 24 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak@v3.sk> - 1.0-1