diff --git a/perl-Config-Any.rpmlintrc b/perl-Config-Any.rpmlintrc
new file mode 100644
index 0000000..fbb88c0
--- /dev/null
+++ b/perl-Config-Any.rpmlintrc
@@ -0,0 +1,4 @@
+from Config import *
+
+# This file is intentionally empty
+addFilter("zero-length /usr/share/doc/perl-Config-Any/conf/conf.unsupported")
diff --git a/perl-Config-Any.spec b/perl-Config-Any.spec
index 13d2551..8e220a5 100644
--- a/perl-Config-Any.spec
+++ b/perl-Config-Any.spec
@@ -1,39 +1,49 @@
 Name:           perl-Config-Any
 Summary:        Load configuration from different file formats, transparently
 Version:        0.32
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        GPL+ or Artistic
-
-Source0:        https://cpan.metacpan.org/authors/id/H/HA/HAARG/Config-Any-%{version}.tar.gz 
 URL:            https://metacpan.org/release/Config-Any
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Source0:        https://cpan.metacpan.org/modules/by-module/Config/Config-Any-%{version}.tar.gz
 BuildArch:      noarch
-
+# Build
+BuildRequires:  coreutils
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(Config::General)
-BuildRequires:  perl(Config::Tiny)
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
-BuildRequires:  perl(JSON::XS)
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Module::Pluggable) >= 3.01
-BuildRequires:  perl(Scalar::Util)
-BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
-BuildRequires:  perl(version)
-BuildRequires:  perl(XML::LibXML)
+# Module
+BuildRequires:  perl(base)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(Module::Pluggable::Object) >= 3.6
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Optional Functionality
+BuildRequires:  perl(Config::General) >= 2.47
+BuildRequires:  perl(Config::Tiny)
+BuildRequires:  perl(Cpanel::JSON::XS)
+BuildRequires:  perl(XML::NamespaceSupport)
 BuildRequires:  perl(XML::Simple)
 BuildRequires:  perl(YAML::XS)
-
-Requires:       perl(Config::General)
+BuildRequires:  perl(YAML)
+# Test Suite
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(lib)
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Test::More)
+# Optional Tests
+BuildRequires:  perl(XML::LibXML) >= 1.59
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(Config::General) >= 2.47
 Requires:       perl(Config::Tiny)
-Requires:       perl(JSON::XS)
-Requires:       perl(Module::Pluggable) >= 3.01
+Requires:       perl(Cpanel::JSON::XS)
+Requires:       perl(XML::NamespaceSupport)
 Requires:       perl(XML::Simple)
 Requires:       perl(YAML::XS)
-
-
-%{?perl_default_filter}
+Requires:       perl(YAML)
 
 %description
 Config::Any provides a facility for Perl applications and libraries to
@@ -45,23 +55,40 @@ Perl code.
 %setup -q -n Config-Any-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-make pure_install DESTDIR=%{buildroot}
-%{_fixperms} %{buildroot}/*
+%{make_install}
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
 
 %files
 # conf/ for examples of different config types
-%doc Changes README
-%{perl_vendorlib}/Config*
-%{_mandir}/man3/Config*
+%doc Changes README t/conf/
+%{perl_vendorlib}/Config/
+%{_mandir}/man3/Config::Any.3*
+%{_mandir}/man3/Config::Any::Base.3*
+%{_mandir}/man3/Config::Any::General.3*
+%{_mandir}/man3/Config::Any::INI.3*
+%{_mandir}/man3/Config::Any::JSON.3*
+%{_mandir}/man3/Config::Any::Perl.3*
+%{_mandir}/man3/Config::Any::XML.3*
+%{_mandir}/man3/Config::Any::YAML.3*
 
 %changelog
+* Wed Oct 30 2019 Paul Howarth <paul@city-fan.org> - 0.32-10
+- Spec tidy-up
+  - Use author-independent source URL
+  - Classify buildreqs by usage
+  - Cpanel::JSON::XS is now upstream's preferred JSON backend
+  - Drop redundant use of %%{?perl_default_filter}
+  - Use %%{make_build} and %%{make_install}
+  - Fix permissions verbosely
+  - Make %%files list more explicit
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild