diff --git a/perl-MouseX-Types.rpmlintrc b/perl-MouseX-Types.rpmlintrc
new file mode 100644
index 0000000..5e98172
--- /dev/null
+++ b/perl-MouseX-Types.rpmlintrc
@@ -0,0 +1,7 @@
+from Config import *
+
+addFilter("spelling-error %description -l en_US manpage -> ")
+
+# These are documentation, shellbang doesn't matter
+addFilter("wrong-script-interpreter /usr/share/doc/.*/.*\.t ")
+
diff --git a/perl-MouseX-Types.spec b/perl-MouseX-Types.spec
index 15c4b1a..4d37378 100644
--- a/perl-MouseX-Types.spec
+++ b/perl-MouseX-Types.spec
@@ -1,41 +1,43 @@
 Name:           perl-MouseX-Types
 Summary:        Organize your Mouse types in libraries
 Version:        0.06
-Release:        23%{?dist}
+Release:        24%{?dist}
 License:        GPL+ or Artistic
-Source0:        https://cpan.metacpan.org/authors/id/G/GF/GFUJI/MouseX-Types-%{version}.tar.gz 
 URL:            https://metacpan.org/release/MouseX-Types
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Source0:        https://cpan.metacpan.org/modules/by-module/MouseX/MouseX-Types-%{version}.tar.gz
 BuildArch:      noarch
-
+# Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(Any::Moose) >= 0.15
-BuildRequires:  perl(base)
-BuildRequires:  perl(Carp)
-BuildRequires:  perl(constant)
-BuildRequires:  perl(FindBin)
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(inc::Module::Install)
-BuildRequires:  perl(lib)
 BuildRequires:  perl(Module::Install::AuthorTests)
 BuildRequires:  perl(Module::Install::Metadata)
 BuildRequires:  perl(Module::Install::Repository)
 BuildRequires:  perl(Module::Install::WriteAll)
+BuildRequires:  sed
+# Runtime
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(constant)
 BuildRequires:  perl(Mouse) >= 0.77
 BuildRequires:  perl(Mouse::Exporter)
 BuildRequires:  perl(Mouse::Util::TypeConstraints)
-BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Test Suite
+BuildRequires:  perl(Any::Moose) >= 0.15
+BuildRequires:  perl(base)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(lib)
+BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Sub::Exporter)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(warnings)
-
-Requires:       perl(Mouse) >= 0.41
-
-# obsolete/provide old tests subpackage
-# can be removed during F19 development cycle
-Obsoletes:      %{name}-tests < 0.06-2
-Provides:       %{name}-tests = %{version}-%{release}
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(Mouse) >= 0.77
 
 %{?perl_default_filter}
 
@@ -48,33 +50,45 @@ This library was split off from Mouse as of Mouse 0.15.
 
 %prep
 %setup -q -n MouseX-Types-%{version}
+
 # Remove bundled libraries
 rm -r inc
 sed -i -e '/^inc\// d' MANIFEST
 
-find lib -type f -name '*.pm' -print0 | xargs -0 chmod 0644
-chmod 0644 t/*.t
+# Remove unwanted exec permissions
+find lib -type f -name '*.pm' -print0 | xargs -0 chmod -c 0644
+chmod -c 0644 t/*.t
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-
-%{_fixperms} %{buildroot}/*
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
 
 %files
 %doc Changes README t/
-%{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/MouseX/
+%{_mandir}/man3/MouseX::Types.3*
+%{_mandir}/man3/MouseX::Types::Moose.3*
+%{_mandir}/man3/MouseX::Types::Mouse.3*
 
 %changelog
+* Fri Oct 18 2019 Paul Howarth <paul@city-fan.org> - 0.06-24
+- Spec clean-up
+  - Use author-independent source URL
+  - Classify buildreqs by usage
+  - Fix permissions verbosely
+  - Simplify find command using -delete
+  - Don't need to remove empty directories from the buildroot
+  - Drop ancient obsoletes/provides for old -tests sub-package
+  - Make %%files list more explicit
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.06-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild