diff --git a/perl-Set-Infinite.spec b/perl-Set-Infinite.spec
index e1cfc97..6074b55 100644
--- a/perl-Set-Infinite.spec
+++ b/perl-Set-Infinite.spec
@@ -1,20 +1,30 @@
 Name:           perl-Set-Infinite
 Version:        0.65
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Sets of intervals
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Set-Infinite/
 Source0:        http://www.cpan.org/authors/id/F/FG/FGLOCK/Set-Infinite-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+# Build
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+# Runtime
+BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
+BuildRequires:  perl(constant)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Exporter)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(overload)
+BuildRequires:  perl(POSIX)
+BuildRequires:  perl(strict)
 BuildRequires:  perl(Time::Local)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(vars)
+# Tests only
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(warnings)
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 
 %description
 Set::Infinite is a Set Theory module for infinite sets.
@@ -23,32 +33,26 @@ Set::Infinite is a Set Theory module for infinite sets.
 %setup -q -n Set-Infinite-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-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}
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc Changes LICENSE README TODO
+%license LICENSE
+%doc Changes README TODO
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Mar 01 2016 Petr Šabata <contyk@redhat.com> - 0.65-17
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.65-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild