diff --git a/perl-Test-CleanNamespaces.spec b/perl-Test-CleanNamespaces.spec
index 477fe05..f6b4147 100644
--- a/perl-Test-CleanNamespaces.spec
+++ b/perl-Test-CleanNamespaces.spec
@@ -1,6 +1,6 @@
 Name:		perl-Test-CleanNamespaces
 Summary:	Check for uncleaned imports
-Version:	0.19
+Version:	0.21
 Release:	1%{?dist}
 License:	GPL+ or Artistic
 URL:		https://metacpan.org/release/Test-CleanNamespaces
@@ -11,20 +11,18 @@ BuildRequires:	coreutils
 BuildRequires:	findutils
 BuildRequires:	make
 BuildRequires:	perl
-%if 0%{?fedora} > 20 || 0%{?rhel} > 7
 BuildRequires:	perl-generators
-%endif
 BuildRequires:	perl(CPAN::Meta::Requirements) >= 2.120620
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Module::Metadata)
 # Module
+BuildRequires:	perl(Exporter) >= 5.57
 BuildRequires:	perl(File::Find)
 BuildRequires:	perl(File::Spec)
 BuildRequires:	perl(Module::Runtime)
 BuildRequires:	perl(Package::Stash) >= 0.14
 BuildRequires:	perl(Package::Stash::XS)
 BuildRequires:	perl(strict)
-BuildRequires:	perl(Sub::Exporter::Progressive)
 BuildRequires:	perl(Sub::Identify)
 BuildRequires:	perl(Test::Builder)
 BuildRequires:	perl(warnings)
@@ -34,7 +32,6 @@ BuildRequires:	perl(Role::Tiny) >= 1.003000
 BuildRequires:	perl(constant)
 BuildRequires:	perl(CPAN::Meta) >= 2.120900
 BuildRequires:	perl(CPAN::Meta::Prereqs)
-BuildRequires:	perl(Exporter) >= 5.57
 BuildRequires:	perl(File::Spec::Functions)
 BuildRequires:	perl(if)
 BuildRequires:	perl(lib)
@@ -46,7 +43,7 @@ BuildRequires:	perl(Scalar::Util)
 BuildRequires:	perl(Sub::Exporter)
 BuildRequires:	perl(Test::Deep)
 BuildRequires:	perl(Test::More) >= 0.94
-BuildRequires:	perl(Test::Requires)
+BuildRequires:	perl(Test::Needs)
 BuildRequires:	perl(Test::Tester)
 # Optional Test Requirements
 %if 0%{!?perl_bootstrap:1}
@@ -66,11 +63,7 @@ BuildRequires:	perl(Mouse::Role)
 BuildRequires:	perl(Test::Warnings) >= 0.009
 # Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-%if 0%{?fedora}
 Recommends:	perl(Role::Tiny) >= 1.003000
-%else
-Requires:	perl(Role::Tiny) >= 1.003000
-%endif
 
 %description
 This module lets you check your module's namespaces for imported functions you
@@ -100,6 +93,10 @@ make test %{!?perl_bootstrap:AUTOMATED_TESTING=1}
 %{_mandir}/man3/Test::CleanNamespaces.3*
 
 %changelog
+* Tue Aug 16 2016 Paul Howarth <paul@city-fan.org> - 0.21-1
+- Update to 0.21
+  - Switch to plain old Exporter, removing build_* subs from the API
+
 * Fri Jun 17 2016 Paul Howarth <paul@city-fan.org> - 0.19-1
 - Update to 0.19
   - Removed dependencies on namespace::clean, Sub::Exporter, File::Find::Rule
diff --git a/sources b/sources
index 91b773b..e769a83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f8a8cc3e5c350cfcf2e768da0d364bb  Test-CleanNamespaces-0.19.tar.gz
+6dce5addcec3b546ef17691d59074475  Test-CleanNamespaces-0.21.tar.gz