diff --git a/Test-Portability-Files-0.06-old-Test::More.patch b/Test-Portability-Files-0.06-old-Test::More.patch
deleted file mode 100644
index 34f9121..0000000
--- a/Test-Portability-Files-0.06-old-Test::More.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.PL
-+++ Makefile.PL
-@@ -12,7 +12,7 @@ my %WriteMakefileArgs = (
-   "ABSTRACT" => "Check file names portability",
-   "AUTHOR" => "S\303\251bastien Aperghis-Tramoni <sebastien\@aperghis.net>, Alexander Hartmaier <abraxxa\@cpan.org>",
-   "BUILD_REQUIRES" => {
--    "Test::More" => "0.98"
-+    "Test::More" => "0.47"
-   },
-   "CONFIGURE_REQUIRES" => {
-     "ExtUtils::MakeMaker" => "6.30"
---- t/01basic.t
-+++ t/01basic.t
-@@ -1,5 +1,5 @@
- use strict;
--use Test::More;
-+use Test::More tests => 3;
- 
- require Test::Portability::Files;
- 
-@@ -7,5 +7,3 @@ require Test::Portability::Files;
- ok( defined \&Test::Portability::Files::options               ); #01
- ok( defined \&Test::Portability::Files::run_tests             ); #02
- ok( defined \&Test::Portability::Files::test_name_portability ); #03
--
--done_testing;
-\ No newline at end of file
---- t/release-cpan-changes.t
-+++ t/release-cpan-changes.t
-@@ -8,8 +8,7 @@ BEGIN {
- }
- 
- 
--use Test::More;
-+use Test::More;
- eval 'use Test::CPAN::Changes';
- plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
- changes_ok();
--done_testing();
---- t/release-test-version.t
-+++ t/release-test-version.t
-@@ -8,7 +8,7 @@ BEGIN {
- 
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 2;
- 
- # generated by Dist::Zilla::Plugin::Test::Version 0.002004
- BEGIN { eval "use Test::Version; 1;" or die $@; }
-@@ -27,4 +27,3 @@ push @imports, $params
- Test::Version->import(@imports);
- 
- version_all_ok;
--done_testing;
diff --git a/perl-Test-Portability-Files.spec b/perl-Test-Portability-Files.spec
index fdb4506..02b69cb 100644
--- a/perl-Test-Portability-Files.spec
+++ b/perl-Test-Portability-Files.spec
@@ -1,39 +1,34 @@
-# We need to patch the test suite if we have an old version of Test::More
-%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
-
 Name:           perl-Test-Portability-Files
-Version:        0.07
-Release:        4%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Check file names portability
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Test-Portability-Files/
 Source0:        http://www.cpan.org/authors/id/A/AB/ABRAXXA/Test-Portability-Files-%{version}.tar.gz
-Patch1:         Test-Portability-Files-0.06-old-Test::More.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
 # Build
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(strict)
-BuildRequires:  perl(warnings)
 # Runtime
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::Manifest)
 BuildRequires:  perl(File::Basename)
 BuildRequires:  perl(File::Find)
 BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(strict)
 BuildRequires:  perl(Test::Builder)
+BuildRequires:  perl(warnings)
 # Test Suite
-BuildRequires:  perl(blib)
 BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(IO::Handle)
 BuildRequires:  perl(IPC::Open3)
-BuildRequires:  perl(Test::More) >= 0.47
+BuildRequires:  perl(Test::More) >= 0.88
+BuildRequires:  perl(utf8)
+# Dependencies
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
@@ -45,34 +40,35 @@ a distribution can select which tests to execute.
 %prep
 %setup -q -n Test-Portability-Files-%{version}
 
-# We need to patch the test suite if we have an old version of Test::More
-%if %{old_test_more}
-%patch1
-%endif
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -delete
-%{_fixperms} $RPM_BUILD_ROOT
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %license LICENSE
 %doc Changes README
 %{perl_vendorlib}/Test/
-%{_mandir}/man3/Test::Portability::Files.3pm*
+%{_mandir}/man3/Test::Portability::Files.3*
 
 %changelog
+* Tue Jan  2 2018 Paul Howarth <paul@city-fan.org> - 0.09-1
+- Update to 0.09
+  - Add windows_reserved option to test for Windows reserved filenames
+  - Add tests, now requires Perl 5.008
+- Drop EL-5 support
+  - Drop BuildRoot: and Group: tags
+  - Drop explicit buildroot cleaning in %%install section
+  - Drop explicit %%clean section
+  - Drop workaround for building with Test::More < 0.88
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 1cb1abb..f3aa214 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aecd3a2b17a8e298ae7ac4d889c52670  Test-Portability-Files-0.07.tar.gz
+SHA512 (Test-Portability-Files-0.09.tar.gz) = bb397342bf0c4d09e1a5a2ee7b7fe9ec9094c83e8b19f36b2ac803fed192cf4021723e9960d184b2acbd274852a258edfe505ba55efe4eed75c8b501e1aed2e7