diff --git a/perl-URL-Encode-XS.rpmlintrc b/perl-URL-Encode-XS.rpmlintrc
new file mode 100644
index 0000000..26bd049
--- /dev/null
+++ b/perl-URL-Encode-XS.rpmlintrc
@@ -0,0 +1,4 @@
+from Config import *
+
+# False positive ("URL::Encode")
+addFilter("tag-in-description C URL:")
diff --git a/perl-URL-Encode-XS.spec b/perl-URL-Encode-XS.spec
index 5b4395c..2f6e613 100644
--- a/perl-URL-Encode-XS.spec
+++ b/perl-URL-Encode-XS.spec
@@ -1,37 +1,34 @@
 Name:           perl-URL-Encode-XS
 Version:        0.03
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        XS implementation of URL::Encode
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/URL-Encode-XS
-Source0:        https://cpan.metacpan.org/authors/id/C/CH/CHANSEN/URL-Encode-XS-%{version}.tar.gz
-# Fix build on Perl without "." in @INC, CPAN RT#121686
+Source0:        https://cpan.metacpan.org/modules/by-module/URL/URL-Encode-XS-%{version}.tar.gz
 Patch0:         URL-Encode-XS-0.03-Fix-building-on-Perl-without-.-in-INC.patch
+# Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
 BuildRequires:  gcc
-BuildRequires:  perl-interpreter
+BuildRequires:  make
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
-BuildRequires:  perl(base)
-BuildRequires:  perl(Config)
-BuildRequires:  perl(Cwd)
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.59
+BuildRequires:  perl(inc::Module::Install)
+BuildRequires:  perl(Module::Install::ReadmeFromPod)
+# Module
 BuildRequires:  perl(Exporter)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(ExtUtils::MM_Unix)
-BuildRequires:  perl(Fcntl)
-BuildRequires:  perl(File::Basename)
-BuildRequires:  perl(File::Find)
-BuildRequires:  perl(File::Path)
-BuildRequires:  perl(File::Spec)
-BuildRequires:  perl(FindBin)
 BuildRequires:  perl(strict)
-BuildRequires:  perl(Test::More) >= 0.88
-BuildRequires:  perl(utf8)
-BuildRequires:  perl(vars)
 BuildRequires:  perl(XSLoader)
 BuildRequires:  perl(warnings)
+# Test Suite
+BuildRequires:  perl(Test::More) >= 0.88
+BuildRequires:  perl(utf8)
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Exporter)
 Requires:       perl(XSLoader)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This package implements the original URL::Encode via XS interface. The main
@@ -40,31 +37,46 @@ Do not use this package directly, use URL::Encode instead.
 
 %prep
 %setup -qn URL-Encode-XS-%{version}
+
+# Unbundle inc::Module::Install and friends
+rm -rf inc/
+sed -i -e '/^inc\// d' MANIFEST
+
+# Fix build on Perl without "." in @INC, CPAN RT#121686
 %patch0 -p1
+
+# Avoid doc-file dependencies
 chmod -c -x dev/*
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete -print
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
+find %{buildroot} -type f -name '*.bs' -empty -delete -print
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
 
 %files
-%doc Changes README dev
-%{perl_vendorarch}/auto/*
-%{perl_vendorarch}/URL*
-%{_mandir}/man3/*
+%doc Changes dev/ README
+%{perl_vendorarch}/auto/URL/
+%{perl_vendorarch}/URL/
+%{_mandir}/man3/URL::Encode::XS.3*
 
 %changelog
+* Wed Oct 30 2019 Paul Howarth <paul@city-fan.org> - 0.03-17
+- Spec tidy-up
+  - Use author-independent source URL
+  - Classify buildreqs by usage
+  - Unbundle inc::Module::Install and friends
+  - Simplify find commands using -empty and -delete
+  - Fix permissions verbosely
+  - Make %%files list more explicit
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.03-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild