diff --git a/perl-Env-Sanctify.rpmlintrc b/perl-Env-Sanctify.rpmlintrc
new file mode 100644
index 0000000..e42b2be
--- /dev/null
+++ b/perl-Env-Sanctify.rpmlintrc
@@ -0,0 +1,12 @@
+from Config import *
+
+# Unexpanded macro warnings are expected from time to time:
+# https://bugzilla.redhat.com/show_bug.cgi?id=551366
+addFilter("unexpanded-macro Summary\(C\) %ENV")
+addFilter("unexpanded-macro %description -l C %ENV")
+
+# These are written as they are intended
+addFilter("spelling-error Summary\(en_US\) Lexically -> ")
+addFilter("spelling-error %description -l en_US lexically -> ")
+addFilter("spelling-error %description -l en_US regexen -> ")
+addFilter("spelling-error %description -l en_US automagically -> ")
diff --git a/perl-Env-Sanctify.spec b/perl-Env-Sanctify.spec
index 8be9802..6e85034 100644
--- a/perl-Env-Sanctify.spec
+++ b/perl-Env-Sanctify.spec
@@ -1,13 +1,17 @@
 Name:		perl-Env-Sanctify
 Summary:	Lexically scoped sanctification of %%ENV
 Version:	1.12
-Release:	17%{?dist}
+Release:	18%{?dist}
 License:	GPL+ or Artistic
 URL:		https://metacpan.org/release/Env-Sanctify
-Source0:	https://cpan.metacpan.org/authors/id/B/BI/BINGOS/Env-Sanctify-%{version}.tar.gz
+Source0:	https://cpan.metacpan.org/modules/by-module/Env/Env-Sanctify-%{version}.tar.gz
 BuildArch:	noarch
 # Build
+BuildRequires:	coreutils
+BuildRequires:	findutils
+BuildRequires:	make
 BuildRequires:	perl-generators
+BuildRequires:	perl-interpreter
 BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.30
 # Module
 BuildRequires:	perl(strict)
@@ -40,10 +44,9 @@ perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-%{_fixperms} %{buildroot}
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} -c %{buildroot}
 
 %check
 # Pod test modules too old prior to RHEL-7
@@ -54,14 +57,26 @@ make test AUTHOR_TESTING=1
 %endif
 
 %files
-%doc Changes LICENSE README examples/
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%doc Changes README examples/
 %{perl_vendorlib}/Env/
-%{_mandir}/man3/Env::Sanctify.3pm*
+%{_mandir}/man3/Env::Sanctify.3*
 
 %changelog
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-17
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sun Sep 22 2019 Paul Howarth <paul@city-fan.org> - 1.12-17
+- Spec tidy-up
+  - Specify all build requirements
+  - Simplify find command using -delete
+  - Drop redundant buildroot cleaning in %%install section
+  - Use %%license where possible
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild