diff --git a/findutils.spec b/findutils.spec
index 3130a83..e031f18 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -3,7 +3,7 @@ Name: findutils
 Version: 4.2.31
 Release: 2%{?dist}
 Epoch: 1
-License: GPL+
+License: GPLv2+
 Group: Applications/File
 URL: http://www.gnu.org/software/findutils/
 Source0: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
@@ -13,7 +13,7 @@ Patch2: findutils-selinux.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, automake, autoconf
 BuildRequires: dejagnu, gettext-devel, texinfo
 BuildRequires: libselinux-devel
@@ -47,7 +47,7 @@ make
 make check
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -63,7 +63,7 @@ if [ $1 = 0 ]; then
 fi
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)