diff --git a/perl-B-Hooks-EndOfScope.spec b/perl-B-Hooks-EndOfScope.spec
index 52aa51d..3b2081b 100644
--- a/perl-B-Hooks-EndOfScope.spec
+++ b/perl-B-Hooks-EndOfScope.spec
@@ -1,6 +1,6 @@
 Name:		perl-B-Hooks-EndOfScope
-Version:	0.15
-Release:	5%{?dist}
+Version:	0.19
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Summary:	Execute code after scope compilation finishes
@@ -9,9 +9,13 @@ Source0:	http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-%{
 Patch0:		B-Hooks-EndOfScope-0.13-shellbangs.patch
 BuildArch:	noarch
 # Build
+BuildRequires:	coreutils
+BuildRequires:	findutils
+BuildRequires:	make
 BuildRequires:	perl
-BuildRequires:	perl(ExtUtils::CBuilder) >= 0.26
 BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(lib)
+BuildRequires:	perl(Text::ParseWords)
 # Common Module Requirements
 BuildRequires:	perl(Module::Implementation) >= 0.05
 BuildRequires:	perl(Sub::Exporter::Progressive) >= 0.001006
@@ -33,12 +37,16 @@ BuildRequires:	perl(Devel::Hide) >= 0.0007
 BuildRequires:	perl(File::Glob)
 BuildRequires:	perl(File::Spec)
 BuildRequires:	perl(IPC::Open2)
+BuildRequires:	perl(Module::Metadata)
 BuildRequires:	perl(Test::More) >= 0.89
 # Optional Tests
 BuildRequires:	perl(CPAN::Meta) >= 2.120900
 BuildRequires:	perl(CPAN::Meta::Prereqs)
-# Release tests
-%if 0%{!?perl_bootstrap:1} && 0%{?rhel} < 7
+# Author/Release tests
+# Note: Test::Pod::No404s intentionally omitted as it would fail due to
+# missing connectivity in the koji build environment
+%if 0%{!?perl_bootstrap:1} && !0%{?rhel}
+BuildRequires:	perl(blib)
 BuildRequires:	perl(IO::Handle)
 BuildRequires:	perl(IPC::Open3)
 BuildRequires:	perl(Pod::Coverage::TrustPod)
@@ -49,10 +57,10 @@ BuildRequires:	perl(Test::EOL)
 BuildRequires:	perl(Test::Kwalitee) >= 1.21
 BuildRequires:	perl(Test::MinimumVersion)
 BuildRequires:	perl(Test::Mojibake)
+BuildRequires:	perl(Test::More) >= 0.96
 BuildRequires:	perl(Test::NoTabs)
 BuildRequires:	perl(Test::Pod) >= 1.41
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.08
-BuildRequires:	perl(Test::Pod::No404s)
 BuildRequires:	perl(Test::Portability::Files)
 BuildRequires:	perl(Test::Spelling), hunspell-en
 %endif
@@ -69,13 +77,16 @@ surrounding scope.
 # Remove shellbangs from tests to placate rpmlint
 %patch0
 
+# British-English spelling LICENCE upsets US spell checker
+echo LICENCE >> xt/author/pod-spell.t
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name .packlist -delete
 %{_fixperms} %{buildroot}
 
 %check
@@ -86,7 +97,7 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
 %endif
 
 %files
-%license LICENSE
+%license LICENCE
 %doc Changes CONTRIBUTING README t/
 %{perl_vendorlib}/B/
 %{_mandir}/man3/B::Hooks::EndOfScope.3*
@@ -94,6 +105,15 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
 %{_mandir}/man3/B::Hooks::EndOfScope::XS.3*
 
 %changelog
+* Tue May  3 2016 Paul Howarth <paul@city-fan.org> - 0.19-1
+- Update to 0.19
+  - More Makefile.PL updates
+  - Makefile.PL now checks for a working compiler using ExtUtils::HasCompiler
+    (inlined into the build) rather than ExtUtils::CBuilder (CPAN RT#113685)
+- Simplify find command using -delete
+- Fix EPEL conditional - only currently buildable for EPEL 7 onwards
+- Drop BR: for Test::Pod::No404s, which breaks koji builds
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.15-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 7f818bc..9375a6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61dd64e3a05ffb06fee9bee3211d16b8  B-Hooks-EndOfScope-0.15.tar.gz
+ab13185fe7019717645b936a5d77ea29  B-Hooks-EndOfScope-0.19.tar.gz