diff --git a/B-Hooks-EndOfScope-0.10-shellbangs.patch b/B-Hooks-EndOfScope-0.10-shellbangs.patch
new file mode 100644
index 0000000..bc0d33d
--- /dev/null
+++ b/B-Hooks-EndOfScope-0.10-shellbangs.patch
@@ -0,0 +1,18 @@
+Remove shellbangs from tests to placate rpmlint
+
+--- B-Hooks-EndOfScope/t/release-pod-coverage.t
++++ B-Hooks-EndOfScope/t/release-pod-coverage.t
+@@ -1,5 +1,3 @@
+-#!perl
+-
+ BEGIN {
+   unless ($ENV{RELEASE_TESTING}) {
+     require Test::More;
+--- B-Hooks-EndOfScope/t/release-pod-syntax.t
++++ B-Hooks-EndOfScope/t/release-pod-syntax.t
+@@ -1,5 +1,3 @@
+-#!perl
+-
+ BEGIN {
+   unless ($ENV{RELEASE_TESTING}) {
+     require Test::More;
diff --git a/perl-B-Hooks-EndOfScope.spec b/perl-B-Hooks-EndOfScope.spec
index ab223b4..453b839 100644
--- a/perl-B-Hooks-EndOfScope.spec
+++ b/perl-B-Hooks-EndOfScope.spec
@@ -1,23 +1,25 @@
 Name:		perl-B-Hooks-EndOfScope
-Version:	0.09
+Version:	0.10
 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)
+Source0:	http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/B-Hooks-EndOfScope-%{version}.tar.gz
+Patch0:		B-Hooks-EndOfScope-0.10-shellbangs.patch
 BuildArch:	noarch
 # Build
-BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.31
+BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.30
 # Module
 BuildRequires:	perl(Sub::Exporter)
 BuildRequires:	perl(Variable::Magic) >= 0.34
 # Test suite
-BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::More) >= 0.89
 # Release tests
 BuildRequires:	perl(Pod::Coverage::TrustPod)
-BuildRequires:	perl(Test::Pod) >= 1.41
+BuildRequires:	perl(Test::EOL)
+BuildRequires:	perl(Test::NoTabs)
+BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.08
 # Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -29,30 +31,41 @@ surrounding scope.
 %prep
 %setup -q -n B-Hooks-EndOfScope-%{version}
 
+# Remove shellbangs from tests to placate rpmlint
+%patch0 -p1
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf %{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}
 
 %check
 make test RELEASE_TESTING=1
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
-%doc Changes README t/
+%doc Changes LICENSE README t/
 %{perl_vendorlib}/B/
 %{_mandir}/man3/B::Hooks::EndOfScope.3pm*
 
 %changelog
+* Thu Feb 16 2012 Paul Howarth <paul@city-fan.org> - 0.10-1
+- Update to 0.10 (stop propagating our magic through localisation)
+- Package LICENSE file
+- Downgrade ExtUtils::MakeMaker version requirement to 6.30
+- Upgrade Test::More version requirement to 0.89
+- Drop Test::Pod version requirement for EPEL-6 spec compatibility
+- BR: perl(Test::EOL) and perl(Test::NoTabs) for additional test coverage
+- Clean up for modern rpmbuild since we have no branches prior to EPEL-6
+  - Don't specify BuildRoot:
+  - Skip cleaning of buildroot in %%install
+  - Remove %%clean section
+  - Drop redundant %%defattr
+- Remove shellbangs from tests to placate rpmlint
+
 * Tue Jan 17 2012 Paul Howarth <paul@city-fan.org> - 0.09-1
 - Update to 0.09 (improve distribution metadata)
 - Run release tests too
diff --git a/sources b/sources
index 56e2c20..ee42542 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83d941d374d6718cdd5c2721c40f660f  B-Hooks-EndOfScope-0.09.tar.gz
+2166de1666560f46f4c48e6030ec0a7e  B-Hooks-EndOfScope-0.10.tar.gz