diff --git a/perl-Data-Dumper-Names.spec b/perl-Data-Dumper-Names.spec
index 6a4302d..b3054f0 100644
--- a/perl-Data-Dumper-Names.spec
+++ b/perl-Data-Dumper-Names.spec
@@ -1,20 +1,29 @@
 Name:           perl-Data-Dumper-Names
 Version:        0.03
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Data::Dumper like module for printing and eval data structures
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Dumper-Names/
 Source0:        http://www.cpan.org/authors/id/O/OV/OVID/Data-Dumper-Names-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl
 BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Run-time
+BuildRequires:  perl(base)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(Exporter)
 BuildRequires:  perl(PadWalker) >= 0.13
+BuildRequires:  perl(Scalar::Util)
+# Tests
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Pod) >= 1.14
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(PadWalker) >= 0.13
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(PadWalker\\)$
 
 %description
 The essential module Data::Dumper is used for printing perl data structures or 
@@ -25,15 +34,11 @@ source filter.
 %setup -q -n Data-Dumper-Names-%{version}
 
 %build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
 ./Build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
@@ -43,16 +48,15 @@ export PERL5LIB="$(pwd)/no-such-directory"
 
 ./Build test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Feb 04 2016 Jitka Plesnikova <jplesnik@redhat.com> - 0.03-22
+- Package cleanup
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.03-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild