diff --git a/perl-File-Find-Object.spec b/perl-File-Find-Object.spec
index 7eebfea..eb7046e 100644
--- a/perl-File-Find-Object.spec
+++ b/perl-File-Find-Object.spec
@@ -1,43 +1,42 @@
-%global pkgname File-Find-Object
-
 Name:           perl-File-Find-Object
 Version:        0.2.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Object oriented File::Find replacement
 License:        GPLv2+ or Artistic 2.0
 URL:            http://search.cpan.org/dist/File-Find-Object/
-Source0:        http://www.cpan.org/authors/id/S/SH/SHLOMIF/%{pkgname}-v%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SH/SHLOMIF/File-Find-Object-v%{version}.tar.gz
 BuildArch:      noarch
+# Module Build
 BuildRequires:  coreutils
 BuildRequires:  perl
-BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(lib)
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(strict)
-# Test::Run::CmdLine::Iface not used
 BuildRequires:  perl(vars)
-BuildRequires:  perl(warnings)
-# Run-time:
+# Module Runtime
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Class::XSAccessor)
 BuildRequires:  perl(Fcntl)
+BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(integer)
 BuildRequires:  perl(List::Util)
 BuildRequires:  perl(parent)
-# Tests:
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Test Suite
 BuildRequires:  perl(File::Path)
 BuildRequires:  perl(Test::More)
-# Optional tests:
+# Optional Tests
 BuildRequires:  perl(Test::CPAN::Changes)
-BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
 BuildRequires:  perl(Test::Pod) >= 1.14
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
 %if !%{defined %perl_bootstrap}
 # Break build-time dependency cycle: perl-File-Find-Object
 # → perl-Test-TrailingSpace → perl-File-Find-Object-Rule
 # → perl-File-Find-Object
 BuildRequires:  perl(Test::TrailingSpace)
 %endif
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 File::Find::Object does the same job as File::Find but works like an object
@@ -47,26 +46,33 @@ File::Find is its file processing: after starting its main loop, one cannot
 easily wait for another event and so get the next result.
 
 %prep
-%setup -qn %{pkgname}-v%{version}
-chmod 644 examples/tree
+%setup -qn File-Find-Object-v%{version}
+chmod -c 644 examples/tree
 
 %build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL --installdirs=vendor
 ./Build
 
 %install
-./Build install destdir=%{buildroot} create_packlist=0
-%{_fixperms} %{buildroot}/*
+./Build install --destdir=%{buildroot} --create_packlist=0
+%{_fixperms} %{buildroot}
 
 %check
 ./Build test
 
 %files
-%doc Changes README examples rejects scripts
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%license LICENSE
+%doc Changes README examples/ rejects/ scripts/
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Find::Object.3*
+%{_mandir}/man3/File::Find::Object::Base.3*
+%{_mandir}/man3/File::Find::Object::PathComp.3*
+%{_mandir}/man3/File::Find::Object::Result.3*
 
 %changelog
+* Mon Feb 29 2016 Paul Howarth <paul@city-fan.org> - 0.2.13-3
+- Spec clean-up
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild