diff --git a/.gitignore b/.gitignore
index dd4e4a1..37099a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-B-Hooks-EndOfScope-0.08.tar.gz
+/B-Hooks-EndOfScope-[0-9.]*.tar.gz
diff --git a/perl-B-Hooks-EndOfScope.spec b/perl-B-Hooks-EndOfScope.spec
index d1207bd..ab223b4 100644
--- a/perl-B-Hooks-EndOfScope.spec
+++ b/perl-B-Hooks-EndOfScope.spec
@@ -1,20 +1,26 @@
-Name:       perl-B-Hooks-EndOfScope
-Version:    0.08
-Release:    8%{?dist}
-# see lib/B/Hooks/EndOfScope.pm
-License:    GPL+ or Artistic
-Group:      Development/Libraries
-Summary:    Execute code after scope compilation finishes
-Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/B-Hooks-EndOfScope-%{version}.tar.gz
-Url:        http://search.cpan.org/dist/B-Hooks-EndOfScope
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch:  noarch
-
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires: perl(Variable::Magic) >= 0.34
-BuildRequires: perl(Sub::Exporter)
-BuildRequires: perl(Test::More)
+Name:		perl-B-Hooks-EndOfScope
+Version:	0.09
+Release:	1%{?dist}
+License:	GPL+ or Artistic
+Group:		Development/Libraries
+Summary:	Execute code after scope compilation finishes
+Url:		http://search.cpan.org/dist/B-Hooks-EndOfScope
+Source:		http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/B-Hooks-EndOfScope-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildArch:	noarch
+# Build
+BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.31
+# Module
+BuildRequires:	perl(Sub::Exporter)
+BuildRequires:	perl(Variable::Magic) >= 0.34
+# Test suite
+BuildRequires:	perl(Test::More)
+# Release tests
+BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Test::Pod) >= 1.41
+BuildRequires:	perl(Test::Pod::Coverage) >= 1.08
+# Runtime
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 This module allows you to execute code when Perl has finished compiling the
@@ -24,20 +30,18 @@ surrounding scope.
 %setup -q -n B-Hooks-EndOfScope-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-
-%{_fixperms} %{buildroot}/*
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+%{_fixperms} %{buildroot}
 
 %check
-make test
+make test RELEASE_TESTING=1
 
 %clean
 rm -rf %{buildroot}
@@ -45,10 +49,21 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Changes README t/
-%{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/B/
+%{_mandir}/man3/B::Hooks::EndOfScope.3pm*
 
 %changelog
+* Tue Jan 17 2012 Paul Howarth <paul@city-fan.org> - 0.09-1
+- Update to 0.09 (improve distribution metadata)
+- Run release tests too
+- BR: perl(Pod::Coverage::TrustPod), perl(Test::Pod) and
+  perl(Test::Pod::Coverage) for release tests
+- Spec clean-up:
+  - Make %%files list more explicit
+  - Use DESTDIR rather than PERL_INSTALL_ROOT
+  - Use tabs
+  - Split buildreqs by Build/Module/Tests/Release tests
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.08-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -59,7 +74,7 @@ rm -rf %{buildroot}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Dec 15 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.08-5
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Thu Apr 29 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.08-4
 - Mass rebuild with perl-5.12.0
diff --git a/sources b/sources
index 6857591..56e2c20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c770f55ce0205bcbb5824e4ec28431fd  B-Hooks-EndOfScope-0.08.tar.gz
+83d941d374d6718cdd5c2721c40f660f  B-Hooks-EndOfScope-0.09.tar.gz