diff --git a/perl-Heap.spec b/perl-Heap.spec
index b79e160..fd2a4ad 100644
--- a/perl-Heap.spec
+++ b/perl-Heap.spec
@@ -1,17 +1,25 @@
 Name:           perl-Heap
 Version:        0.80
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Perl extension for keeping data partially sorted
 
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Heap
 Source0:        http://search.cpan.org/CPAN/authors/id/J/JM/JMM/Heap-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  coreutils
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76 
+# Run-time
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
+# Tests
+BuildRequires:  perl(lib)
+BuildRequires:  perl(Test::More)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 The Heap collection of modules provide routines that manage a heap of 
@@ -30,36 +38,27 @@ to the Heap::Elem interface.
 %prep
 %setup -q -n Heap-%{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 -type d -depth -exec rmdir {} 2>/dev/null ';'
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-
 %check
 make test
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Thu Feb 18 2016 Jitka Plesnikova <jplesnik@redhat.com> - 0.80-21
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.80-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild