diff --git a/perl-HTML-Selector-XPath.spec b/perl-HTML-Selector-XPath.spec
index 8af0519..2b11299 100644
--- a/perl-HTML-Selector-XPath.spec
+++ b/perl-HTML-Selector-XPath.spec
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Selector-XPath
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CSS Selector to XPath compiler
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,9 +9,15 @@ Source0:        http://www.cpan.org/authors/id/C/CO/CORION/HTML-Selector-XPath-%
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.59
+
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(strict)
 BuildRequires:  perl(Test::Base)
 BuildRequires:  perl(Test::More)
 
+BuildRequires:  perl(inc::Module::Install)
+
 # for improved tests
 BuildRequires:  perl(HTML::TreeBuilder::XPath)
 BuildRequires:  perl(Test::Pod) >= 1.00
@@ -24,17 +30,15 @@ equivalent XPath expression.
 
 %prep
 %setup -q -n HTML-Selector-XPath-%{version}
+rm -r inc
+sed -i -e '/^inc\/.*$/d' MANIFEST
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 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/*
 
 %check
@@ -46,6 +50,10 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 31 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.18-5
+- Modernize spec.
+- Remove inc/.
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild