diff --git a/perl-Class-Load.spec b/perl-Class-Load.spec
index 5796d4d..b163b1e 100644
--- a/perl-Class-Load.spec
+++ b/perl-Class-Load.spec
@@ -1,6 +1,6 @@
 Name:		perl-Class-Load
-Version:	0.22
-Release:	6%{?dist}
+Version:	0.23
+Release:	1%{?dist}
 Summary:	A working (require "Class::Name") and more
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -10,8 +10,10 @@ BuildArch:	noarch
 # ===================================================================
 # Module build requirements
 # ===================================================================
+BuildRequires:	findutils
+BuildRequires:	make
 BuildRequires:	perl
-BuildRequires:	perl(Module::Build::Tiny) >= 0.037
+BuildRequires:	perl(ExtUtils::MakeMaker)
 # ===================================================================
 # Module requirements
 # ===================================================================
@@ -21,7 +23,6 @@ BuildRequires:	perl(Data::OptList)
 BuildRequires:	perl(Exporter)
 BuildRequires:	perl(Module::Implementation) >= 0.04
 BuildRequires:	perl(Module::Runtime) >= 0.012
-BuildRequires:	perl(namespace::clean)
 BuildRequires:	perl(Package::Stash) >= 0.14
 BuildRequires:	perl(Scalar::Util)
 BuildRequires:	perl(Try::Tiny)
@@ -63,14 +64,16 @@ provide is_class_loaded 'Class::Name'.
 %setup -q -n Class-Load-%{version}
 
 %build
-perl Build.PL --installdirs=vendor
-./Build
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 %install
-./Build install --destdir=%{buildroot} --create_packlist=0
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+%{_fixperms} %{buildroot}
 
 %check
-./Build test
+make test
 
 %files
 %if 0%{?_licensedir:1}
@@ -80,10 +83,14 @@ perl Build.PL --installdirs=vendor
 %endif
 %doc Changes CONTRIBUTING README
 %{perl_vendorlib}/Class/
-%{_mandir}/man3/Class::Load.3pm*
-%{_mandir}/man3/Class::Load::PP.3pm*
+%{_mandir}/man3/Class::Load.3*
 
 %changelog
+* Thu Jun 25 2015 Paul Howarth <paul@city-fan.org> - 0.23-1
+- Update to 0.23
+  - Remove use of namespace::clean
+- Switch to ExtUtils::MakeMaker flow
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 196a287..1924861 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad59087e70b0df76d718c90b53e209d5  Class-Load-0.22.tar.gz
+080973026b82051117b6c18f5d77aaa9  Class-Load-0.23.tar.gz