diff --git a/perl-UNIVERSAL-moniker.spec b/perl-UNIVERSAL-moniker.spec
index 64f17ed..3c7dbf2 100644
--- a/perl-UNIVERSAL-moniker.spec
+++ b/perl-UNIVERSAL-moniker.spec
@@ -1,16 +1,26 @@
 Name:           perl-UNIVERSAL-moniker
 Version:        0.08
-Release:        45%{?dist}
+Release:        46%{?dist}
 Summary:        Real world naming for classes
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/UNIVERSAL-moniker
-Source0:        https://cpan.metacpan.org/authors/id/K/KA/KASEI/UNIVERSAL-moniker-%{version}.tar.gz
+Source0:        https://cpan.metacpan.org/modules/by-module/UNIVERSAL/UNIVERSAL-moniker-%{version}.tar.gz
 BuildArch:      noarch
-BuildRequires: make
+# Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More), perl(Lingua::EN::Inflect)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Module
+# (nothing)
+# Test Suite
+BuildRequires:  perl(Test::More)
+# Optional Tests
+BuildRequires:  perl(Lingua::EN::Inflect)
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 # Filter bogus provide for perl(UNIVERSAL) (rpm 4.9 onwards)
 %global __provides_exclude ^perl\\(UNIVERSAL\\)
@@ -23,14 +33,13 @@ guess at what they would be called in the real world.
 %setup -q -n UNIVERSAL-moniker-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
@@ -38,10 +47,18 @@ make test
 %files
 %doc Changes README
 %{perl_vendorlib}/UNIVERSAL/
-%{_mandir}/man3/UNIVERSAL::moniker.3pm*
-
+%{_mandir}/man3/UNIVERSAL::moniker.3*
 
 %changelog
+* Wed Jul 13 2022 Paul Howarth <paul@city-fan.org> - 0.08-46
+- Spec tidy-up
+  - Use author-independent source URL
+  - Classify buildreqs by usage
+  - Use DESTDIR rather than PERL_INSTALL_ROOT
+  - Simplify find command using -delete
+  - Drop redundant removal of empty directories from the buildroot
+  - Fix permissions verbosely
+
 * Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 0.08-45
 - Perl 5.36 rebuild