diff --git a/perl-Net-CIDR.spec b/perl-Net-CIDR.spec
index 44840ef..3f0f1b5 100644
--- a/perl-Net-CIDR.spec
+++ b/perl-Net-CIDR.spec
@@ -1,47 +1,57 @@
 Name:           perl-Net-CIDR
 Version:        0.17
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Manipulate IPv4/IPv6 netblocks in CIDR notation
 License:        GPL+ or Artistic
-
 URL:            http://search.cpan.org/dist/Net-CIDR/
 Source0:        http://www.cpan.org/authors/id/M/MR/MRSAM/Net-CIDR-%{version}.tar.gz
-
 BuildArch:      noarch
+# Module Build
+BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%{?perl_default_filter}
+# Module Runtime
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Exporter)
+# Test Suite
+# (no additional dependencies)
+# Runtime
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
-The Net::CIDR package contains functions that manipulate lists of IP
-netblocks expressed in CIDR notation. The Net::CIDR functions handle both
-IPv4 and IPv6 addresses.
+The Net::CIDR package contains functions that manipulate lists of IP netblocks
+expressed in CIDR notation. The Net::CIDR functions handle both IPv4 and IPv6
+addresses.
 
 %prep
 %setup -q -n Net-CIDR-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
 %files
-%doc Changes COPYING README
+%if 0%{?_licensedir:1}
+%license COPYING
+%else
+%doc COPYING
+%endif
+%doc Changes README
 %{perl_vendorlib}/Net/
-%{_mandir}/man3/*.3pm*
+%{_mandir}/man3/Net::CIDR.3*
 
 %changelog
+* Mon Nov 17 2014 Paul Howarth <paul@city-fan.org> - 0.17-6
+- Use %%license where possible
+- Classify buildreqs by usage
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.17-5
 - Perl 5.20 rebuild