diff --git a/grepmail.spec b/grepmail.spec
index 5de9283..7c1580d 100644
--- a/grepmail.spec
+++ b/grepmail.spec
@@ -1,7 +1,7 @@
 Summary:	Search mailboxes for a particular email
 Name:		grepmail
 Version:	5.3034
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL+
 Group:		Applications/Text
 Url:		http://search.cpan.org/dist/grepmail/
@@ -9,18 +9,25 @@ Source0:	http://search.cpan.org/CPAN/authors/id/D/DC/DCOPPIT/grepmail-%{version}
 Patch0:		grepmail-5.3034-revert-recursive-test-change.patch
 Patch1:		grepmail-5.3034-empty-file-not-error.patch
 Patch2:		grepmail-5.3034-date-manip-6.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(Mail::Mbox::MessageParser) >= 1.4001
-BuildRequires:	perl(Mail::Mbox::MessageParser) >= 1.4001, perl(Date::Parse), perl(Date::Manip)
-BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::More)
+BuildRequires:	perl(Carp)
+BuildRequires:	perl(Date::Manip)
+BuildRequires:	perl(Date::Parse)
+BuildRequires:	perl(Digest::MD5)
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Mail::Mbox::MessageParser) >= 1.4001
+BuildRequires:	perl(Test::More)
 # AutoInstall.pm should have been bundled but wasn't
 # http://code.google.com/p/grepmail/issues/detail?id=1
 BuildRequires:	perl(Module::AutoInstall)
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:	perl(Mail::Mbox::MessageParser) >= 1.4001
 # The following module requirements are optional and hence not picked up by RPM automatically.
 # Adding manual deps for them improves grepmail's functionality.
-Requires:	perl(Date::Parse), perl(Date::Manip)
+Requires:	perl(Date::Manip)
+Requires:	perl(Date::Parse)
+Requires:	perl(Digest::MD5)
 # perl(Date::Parse) can be found in the perl-TimeDate package
 
 %description
@@ -45,23 +52,23 @@ operators.
 %patch2 -p1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor --default
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor --default
+make %{?_smp_mflags}
 
 %install
-%{__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} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
-%{__chmod} -R u+w %{buildroot}
+rm -rf %{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+chmod -R u+w %{buildroot}
 
 %check
 export LANG=C
 export TZ=GMT0
-%{__make} test
+make test
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -70,13 +77,18 @@ export TZ=GMT0
 %{_mandir}/man1/grepmail.1*
 
 %changelog
-* Tue Jul 19 2011 Petr Sabata <contyk@redhat.com> - 5.3034-6
+* Sat Oct  8 2011 Paul Howarth <paul@city-fan.org> 5.3034-7
+- BR/R: perl(Digest::MD5) for improved memory usage
+- BR: perl(Carp)
+- Nobody else likes macros for commands
+
+* Tue Jul 19 2011 Petr Sabata <contyk@redhat.com> 5.3034-6
 - Perl mass rebuild
 
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3034-5
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> 5.3034-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 5.3034-4
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> 5.3034-4
 - Mass rebuild with perl-5.12.0
 
 * Mon Feb 15 2010 Paul Howarth <paul@city-fan.org> 5.3034-3