diff --git a/perl-DateTime-Calendar-Mayan.spec b/perl-DateTime-Calendar-Mayan.spec
index 95c9919..53ddc7e 100644
--- a/perl-DateTime-Calendar-Mayan.spec
+++ b/perl-DateTime-Calendar-Mayan.spec
@@ -1,18 +1,29 @@
 Name:		perl-DateTime-Calendar-Mayan 
 Version:	0.0601 
-Release:	26%{?dist}
+Release:	27%{?dist}
 License:	GPL+ or Artistic 
-Group:		Development/Libraries
 Summary:	Mayan Long Count Calendar 
-Url:		https://metacpan.org/release/DateTime-Calendar-Mayan
-Source:		https://cpan.metacpan.org/authors/id/J/JH/JHOBLITT/DateTime-Calendar-Mayan-%{version}.tar.gz 
+URL:		https://metacpan.org/release/DateTime-Calendar-Mayan
+Source0:	https://cpan.metacpan.org/modules/by-module/DateTime/DateTime-Calendar-Mayan-%{version}.tar.gz
 BuildArch:	noarch
+# Module Build
+BuildRequires:	coreutils
+BuildRequires:	findutils
 BuildRequires:	perl-generators
-BuildRequires:	perl(DateTime) >= 0.15
+BuildRequires:	perl-interpreter
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Module::Build::Compat)
+# Runtime
+BuildRequires:	perl(constant)
+BuildRequires:	perl(DateTime) >= 0.15
 BuildRequires:	perl(Params::Validate) >= 0.64
+BuildRequires:	perl(strict)
+BuildRequires:	perl(vars)
+# Test Suite
+BuildRequires:	perl(DateTime::Duration)
 BuildRequires:	perl(Test::More)
+BuildRequires:	perl(warnings)
+# Dependencies
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
@@ -28,22 +39,33 @@ 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 {} ';'
-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
-%defattr(-,root,root,-)
-%doc README Changes LICENSE Todo
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%doc Changes README Todo
 %{perl_vendorlib}/DateTime/
-%{_mandir}/man3/DateTime::Calendar::Mayan.3pm*
+%{_mandir}/man3/DateTime::Calendar::Mayan.3*
 
 %changelog
+* Thu Jul  5 2018 Paul Howarth <paul@city-fan.org> - 0.0601-27
+- Spec clean-up
+  - Classify buildreqs by usage
+  - Drop legacy Group: tag
+  - Use %%license where possible
+  - Drop %%defattr, redundant since rpm 4.4
+  - Drop buildroot cleaning in %%install section
+  - Don't need to remove empty directories from the buildroot
+
 * Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.0601-26
 - Perl 5.28 rebuild