diff --git a/perl-Clone-Choose.spec b/perl-Clone-Choose.spec
index 1f59a04..37e74c0 100644
--- a/perl-Clone-Choose.spec
+++ b/perl-Clone-Choose.spec
@@ -1,14 +1,30 @@
 Name:           perl-Clone-Choose
 Version:        0.008
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Choose appropriate clone utility
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Clone-Choose/
 Source0:        http://search.cpan.org/CPAN/authors/id/H/HE/HERMES/Clone-Choose-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  coreutils
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(Test::More), perl(Clone::PP), perl(ExtUtils::MakeMaker), perl(Storable), perl(Clone)
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(:VERSION) >= 5.8.1
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(lib)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Run-time
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Module::Runtime)
+# Tests
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Test::More)
+# Optional tests
+BuildRequires:  perl(Clone)
+BuildRequires:  perl(Clone::PP)
+BuildRequires:  perl(Storable)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %{?perl_default_filter}
@@ -20,13 +36,11 @@ Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %setup -q -n Clone-Choose-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -x %{buildroot}%{perl_vendorlib}/Clone/Choose.pm
 %{_fixperms} %{buildroot}/*
 
@@ -39,6 +53,9 @@ make test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Apr 17 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.008-3
+- Specify all dependencies; Modernize spec file
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.008-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild