diff --git a/perl-PPI-HTML.spec b/perl-PPI-HTML.spec
index adebc7f..6df0a6e 100644
--- a/perl-PPI-HTML.spec
+++ b/perl-PPI-HTML.spec
@@ -1,24 +1,34 @@
 Name:           perl-PPI-HTML
 Version:        1.08
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Generate syntax-highlighted HTML for Perl using PPI
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/PPI-HTML
-Source0:        https://cpan.metacpan.org/authors/id/A/AD/ADAMK/PPI-HTML-%{version}.tar.gz
+Source0:        https://cpan.metacpan.org/modules/by-module/PPI/PPI-HTML-%{version}.tar.gz
 BuildArch:      noarch
+# Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(inc::Module::Install)
-# Run-time:
+# Module Run-time:
 BuildRequires:  perl(CSS::Tiny) >= 1.10
 BuildRequires:  perl(Params::Util) => 0.05
-BuildRequires:  perl(PPI) >= 0.990
 BuildRequires:  perl(PPI::Document)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
+# Script Run-time:
+BuildRequires:  perl(File::Slurp)
+BuildRequires:  perl(PPI) >= 0.990
 # Tests:
 BuildRequires:  perl(File::Spec) >= 0.80
 BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(lib)
 BuildRequires:  perl(Test::More) >= 0.47
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(CSS::Tiny) >= 1.10
 Requires:       perl(Params::Util) => 0.05
 Requires:       perl(PPI) >= 0.990
@@ -31,29 +41,40 @@ PPI::HTML converts Perl documents into syntax highlighted HTML pages.
 
 %prep
 %setup -q -n PPI-HTML-%{version}
-# Remove bundled modules
-rm -r inc/*
+
+# Remove bundled inc::Module::Install
+rm -r inc/
 sed -i '/^\/inc\//d' MANIFEST
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-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
 
 %files
-%doc Changes LICENSE README
-%{_bindir}/*
+%license LICENSE
+%doc Changes README
+%{_bindir}/ppi2html
 %{perl_vendorlib}/PPI/
-%{_mandir}/man3/*.3pm*
+%{_mandir}/man3/PPI::HTML.3*
 
 %changelog
+* Thu Oct 24 2019 Paul Howarth <paul@city-fan.org> - 1.08-21
+- Spec tidy-up
+  - Use author-independent source URL
+  - Specify all build dependencies
+  - Simplify find command using -delete
+  - Fix permissions verbosely
+  - Use %%license
+  - Make %%files list more explicit
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.08-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild