diff --git a/perl-MailTools.spec b/perl-MailTools.spec
index 80a88fe..5be0351 100644
--- a/perl-MailTools.spec
+++ b/perl-MailTools.spec
@@ -1,52 +1,50 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
 Version:        1.74
-Release:        1%{?dist}
-
+Release:        2%{?dist}
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MailTools/
-Source0:        http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Net::Domain)
 BuildRequires:  perl(Net::SMTP)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 MailTools is a set of Perl modules related to mail applications.
 
-
 %prep
 %setup -q -n MailTools-%{version}
+# Set up example scripts
 cd examples
-for file in *.PL ; do %{__perl} $file ; done ; chmod -x *_demo
-rm *.PL # yeah, causes warnings from MakeMaker, but we don't care
-cd ..
-
+for file in *.PL
+do
+    %{__perl} $file
+done
+%{__chmod} -x *_demo
+# Remove example-generation scripts, no longer needed
+# It causes warnings from MakeMaker, but we don't care
+%{__rm} *.PL
+cd -
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
 %check
-make test
-
+%{__make} test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,0755)
@@ -55,8 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Mail/
 %{_mandir}/man3/Mail::*.3pm*
 
-
 %changelog
+* Fri Jul 28 2008 Paul Howarth <paul@city-fan.org> 1.74-2
+- cosmetic spec file changes
+
 * Wed Mar  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.74-1
 - 1.74.