diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec
index 3f98405..d2facc6 100644
--- a/system-config-keyboard.spec
+++ b/system-config-keyboard.spec
@@ -3,7 +3,7 @@
 
 Name:           system-config-keyboard
 Version:        1.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
@@ -12,7 +12,6 @@ URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.bz2
 
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -48,24 +47,20 @@ Base components of system-config-keyboard.
 %prep
 %setup -q
 
+
 %build
 make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make INSTROOT=$RPM_BUILD_ROOT install
+make INSTROOT=%{buildroot} install
 desktop-file-install --vendor system --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-   $RPM_BUILD_ROOT%{_datadir}/applications/system-config-keyboard.desktop
+  --dir %{buildroot}%{_datadir}/applications             \
+   %{buildroot}%{_datadir}/applications/system-config-keyboard.desktop
 
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -82,7 +77,6 @@ fi
 
 
 %files
-%defattr(-,root,root)
 %{_sbindir}/system-config-keyboard
 %{_bindir}/system-config-keyboard
 %{_datadir}/system-config-keyboard
@@ -95,12 +89,14 @@ fi
 
 
 %files base -f %{name}.lang
-%defattr(-,root,root)
 %doc COPYING
 %{python_sitelib}/system_config_keyboard
 
 
 %changelog
+* Thu Oct 24 2013 Lubomir Rintel <lkundrak@v3.sk> - 1.4.0-4
+- Bulk sad and useless attempt at consistent SPEC file formatting
+
 * Thu Aug 15 2013 Nils Philippsen <nils@redhat.com> - 1.4.0-3
 - remove trailing whitespace
 - make package noarch again (#921542)