diff --git a/makeself.spec b/makeself.spec
index e0ee0c5..cf9269a 100644
--- a/makeself.spec
+++ b/makeself.spec
@@ -1,16 +1,16 @@
 Summary:	Generates a self-extractable archive from a directory
 Name:		makeself
 Version:	2.1.5
-Release:	%mkrel 6
+Release:	7
 Source0:	http://www.megastep.org/makeself/%{name}-%{version}.tar.bz2
 Source1:	http://angst.cynapses.org/stripmakeself
 License:	GPLv3
 Group: 		Archiving/Compression
 Url:		http://www.megastep.org/makeself/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:	bzip2
 Requires:	coreutils
 Requires:	gnupg
+BuildArch:	noarch
 
 %description
 Makeself is a small shell script that generates a self-extractable
@@ -44,20 +44,15 @@ cp -p %{SOURCE1} .
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} \
-	$RPM_BUILD_ROOT%{_mandir}/man1 \
-	$RPM_BUILD_ROOT%{_datadir}/makeself/
-install -m 755 makeself.sh $RPM_BUILD_ROOT%{_bindir}/makeself
-install -m 755 makeself-header.sh $RPM_BUILD_ROOT%{_datadir}/makeself/makeself-header
-install -m 755 stripmakeself $RPM_BUILD_ROOT%{_bindir}/
-install -m 644 makeself.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man1 \
+	%{buildroot}%{_datadir}/makeself/
+install -m 755 makeself.sh %{buildroot}%{_bindir}/makeself
+install -m 755 makeself-header.sh %{buildroot}%{_datadir}/makeself/makeself-header
+install -m 755 stripmakeself %{buildroot}%{_bindir}/
+install -m 644 makeself.1 %{buildroot}%{_mandir}/man1/
 
 %files
-%defattr(-,root,root)
 %doc COPYING README TODO makeself.lsm
 %{_bindir}/*
 %{_mandir}/man1/*
@@ -99,11 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 + Revision: 120926
 - Import makeself
 
-* Sun Oct 01 2006 Giuseppe Ghibò <ghibo@mandriva.coM> 2.1.4-2mdk
+* Sun Oct 01 2006 Giuseppe Ghibò <ghibo@mandriva.coM> 2.1.4-2mdk
 - Fixed in stripmakeself handling of archives beginning with empty lines
   (thanks to pixel).
 
-* Tue May 16 2006 Giuseppe Ghibò <ghibo@mandriva.com> 2.1.4-1mdk
+* Tue May 16 2006 Giuseppe Ghibò <ghibo@mandriva.com> 2.1.4-1mdk
 - Initial release 2.1.4.
 - Merged Patch0 from Deb.