diff --git a/perl-Date-Simple.spec b/perl-Date-Simple.spec
index 9a831f5..64a6b59 100644
--- a/perl-Date-Simple.spec
+++ b/perl-Date-Simple.spec
@@ -1,16 +1,34 @@
 Summary:	Simple date object for perl
 Name:		perl-Date-Simple
 Version:	3.03
-Release:	21%{?dist}
+Release:	22%{?dist}
 License:	GPL+ or Artistic
-Group:		Development/Libraries
-Url:		http://search.cpan.org/dist/Date-Simple/
+URL:		http://search.cpan.org/dist/Date-Simple/
 Source0:	http://search.cpan.org/CPAN/authors/id/I/IZ/IZUT/Date-Simple-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
-BuildRequires:	perl(Carp)
+# Module Build
+BuildRequires:	coreutils
+BuildRequires:	findutils
+BuildRequires:	make
+BuildRequires:	perl
+BuildRequires:	perl-devel
 BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	sed
+# Module Runtime
+BuildRequires:	perl(base)
+BuildRequires:	perl(Carp)
+BuildRequires:	perl(DynaLoader)
+BuildRequires:	perl(Exporter)
+BuildRequires:	perl(overload)
+BuildRequires:	perl(POSIX)
+BuildRequires:	perl(Scalar::Util)
+BuildRequires:	perl(strict)
+BuildRequires:	perl(warnings::register)
+# Test Suite
 BuildRequires:	perl(Test::More)
+BuildRequires:	perl(warnings)
+# Dependencies
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:	perl(DynaLoader)
 
 # Don't "provide" private Perl libs
 %{?perl_default_filter}
@@ -37,27 +55,34 @@ perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+find %{buildroot} -type f -name .packlist -delete
+find %{buildroot} -type f -name '*.bs' -a -empty -delete
 %{_fixperms} %{buildroot}
 
 %check
 make test
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%license COPYING
+%doc ChangeLog README
 %{perl_vendorarch}/Date/
 %{perl_vendorarch}/auto/Date/
-%{_mandir}/man3/Date::Simple*.3pm*
+%{_mandir}/man3/Date::Simple.3*
+%{_mandir}/man3/Date::Simple::D8.3*
+%{_mandir}/man3/Date::Simple::Fmt.3*
+%{_mandir}/man3/Date::Simple::ISO.3*
 
 %changelog
+* Tue Apr 19 2016 Paul Howarth <paul@city-fan.org> - 3.03-22
+- Classify buildreqs by usage
+- Simplify find commands using -empty and -delete
+- Don't need to remove empty directories from the buildroot
+- Drop %%defattr, %%clean and buildroot cleaning
+- Drop Group: and BuildRoot: tags
+- Use %%license
+- Make %%files list more explicit
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.03-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild