diff --git a/perl-DateTime-Format-IBeat.spec b/perl-DateTime-Format-IBeat.spec
index a287f12..f949f10 100644
--- a/perl-DateTime-Format-IBeat.spec
+++ b/perl-DateTime-Format-IBeat.spec
@@ -1,21 +1,30 @@
 Name:           perl-DateTime-Format-IBeat
 Version:        0.161
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Format times in .beat notation 
-
 Group:          Development/Libraries
 License:        GPL+ or Artistic 
 URL:            http://search.cpan.org/dist/DateTime-Format-IBeat            
 Source0:        http://backpan.perl.org/authors/id/E/EM/EMARTIN/DateTime-Format-IBeat-0.161.tar.gz
-
 BuildArch:      noarch 
-BuildRequires:  perl(Class::ISA)
-BuildRequires:  perl(DateTime) >= 0.18, perl(Test::More) >= 0.47
+# Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
+BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
+# Module
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(DateTime) >= 0.18
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
+BuildRequires:  perl(warnings)
+# Test Suite
+BuildRequires:  perl(Test::More) >= 0.47
+# Optional Tests
 BuildRequires:  perl(Test::Pod) >= 1.00
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%{?perl_default_filter}
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 No Time Zones, No Geographical Borders 
@@ -25,35 +34,35 @@ day into 1000 beats. One Swatch beat is the equivalent of 1 minute 26.4
 seconds. That means that 12 noon in the old time system is the equivalent of 
 500 Swatch .beats.
 
-
 %prep
 %setup -q -n DateTime-Format-IBeat-%{version}
 
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-# American English...
-mv LICENCE LICENSE
-
 %install
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-chmod -R u+w %{buildroot}/*
-
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
-
 %files
-%doc Artistic COPYING LICENSE Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
-
+%license Artistic COPYING LICENCE
+%doc Changes README
+%{perl_vendorlib}/DateTime/
+%{_mandir}/man3/DateTime::Format::IBeat.3*
 
 %changelog
+* Fri Mar 11 2016 Paul Howarth <paul@city-fan.org> - 0.161-25
+- Spec clean-up
+  - Classify buildreqs by usage
+  - Make %%files list more explicit
+  - Use %%license
+  - Simplify find command using -delete
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.161-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild