diff --git a/perl-Test-EOL.spec b/perl-Test-EOL.spec
index b3f53e7..dde7de7 100644
--- a/perl-Test-EOL.spec
+++ b/perl-Test-EOL.spec
@@ -1,23 +1,43 @@
 Name:		perl-Test-EOL
-Version:	1.5
-Release:	8%{?dist}
+Version:	1.6
+Release:	1%{?dist}
 Summary:	Check the correct line endings in your project
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Test-EOL/
-Source0:	http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Test-EOL-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/F/FR/FREW/Test-EOL-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
-BuildRequires:	perl(Cwd)
+# Module Build
+BuildRequires:	coreutils
+BuildRequires:	findutils
+BuildRequires:	make
+BuildRequires:	perl
 BuildRequires:	perl(ExtUtils::MakeMaker)
+# Module Runtime
+BuildRequires:	perl(Cwd)
+BuildRequires:	perl(File::Find)
 BuildRequires:	perl(File::Spec)
-BuildRequires:	perl(File::Temp)
-BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(strict)
 BuildRequires:	perl(Test::Builder)
+BuildRequires:	perl(vars)
+BuildRequires:	perl(warnings)
+# Test Suite
+BuildRequires:	perl(Config)
+BuildRequires:	perl(File::Temp)
+BuildRequires:	perl(FindBin)
+BuildRequires:	perl(IO::Handle)
+BuildRequires:	perl(IPC::Open3)
 BuildRequires:	perl(Test::More)
-BuildRequires:	perl(Test::NoTabs) >= 1.2
-BuildRequires:	perl(Test::Pod)
+# Optional Tests
+%if 0%{?fedora} || 0%{?rhel} > 6
+BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Test::More) >= 0.88
+BuildRequires:	perl(Test::NoTabs)
+BuildRequires:	perl(Test::Pod) >= 1.41
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.08
+%endif
+# Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
@@ -39,17 +59,33 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 %{_fixperms} %{buildroot}
 
 %check
-make test RELEASE_TESTING=1
+%if 0%{?fedora} || 0%{?rhel} > 6
+make test AUTHOR_TESTING=1 RELEASE_TESTING=1
+%else
+make test
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 %files
-%doc Changes LICENSE README
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%doc Changes README
 %{perl_vendorlib}/Test/
-%{_mandir}/man3/Test::EOL.3pm*
+%{_mandir}/man3/Test::EOL.3*
 
 %changelog
+* Fri Jul 31 2015 Paul Howarth <paul@city-fan.org> - 1.6-1
+- Update to 1.6
+  - Add 'no_test' import option to allow more composability
+- This release by FREW → update source URL
+- Use %%license where possible
+- Classify buildreqs by usage
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index afc07c9..bc40654 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6ae3b338c034dc747458ed0a5fb6667  Test-EOL-1.5.tar.gz
+1255e6ef49c417845aa70441c4b40c90  Test-EOL-1.6.tar.gz