diff --git a/perl-Term-Size-Perl.spec b/perl-Term-Size-Perl.spec
index 5a85c6f..66c050d 100644
--- a/perl-Term-Size-Perl.spec
+++ b/perl-Term-Size-Perl.spec
@@ -1,18 +1,25 @@
 Name:           perl-Term-Size-Perl
 Version:        0.029
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Perl extension for retrieving terminal size (Perl version)
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Term-Size-Perl/
 Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Term-Size-Perl-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Build
+BuildRequires:  gcc
+BuildRequires:  make
+BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::CBuilder)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+# Runtime
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(strict)
+# Tests only
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Optional tests only
+BuildRequires:  perl(Test::Pod) >= 1.18
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 
 # although the resulting rpm appears to be noarch, the build is arch-dependent
 # and produces different code for ppc and x86
@@ -26,32 +33,25 @@ exception of a C probe run on build time.
 %setup -q -n Term-Size-Perl-%{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 README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Wed Mar 02 2016 Petr Šabata <contyk@redhat.com> - 0.029-21
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.029-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild