diff --git a/perl-Devel-Caller.spec b/perl-Devel-Caller.spec
index cb4fc43..fedbcc8 100644
--- a/perl-Devel-Caller.spec
+++ b/perl-Devel-Caller.spec
@@ -1,13 +1,15 @@
 Name:           perl-Devel-Caller
 Version:        2.06
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Meatier versions of caller
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Devel-Caller/
 Source0:        http://www.cpan.org/authors/id/R/RC/RCLAMP/Devel-Caller-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  findutils
+BuildRequires:  gcc
+BuildRequires:  make
 BuildRequires:  perl
+BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
@@ -21,15 +23,10 @@ BuildRequires:  perl(XSLoader)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(vars)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(PadWalker) >= 0.08
 
-# Don't provide Caller.so or perl(DB)
-# RPM 4.8 style
-%{?filter_setup:
-%filter_from_provides /^perl(DB)/d
-}
-# RPM 4.9 style
-%{?perl_default_filter}
 %global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(DB\\)
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(PadWalker\\)$
 
 %description
 Devel::Caller - Meatier versions of caller.
@@ -38,34 +35,27 @@ Devel::Caller - Meatier versions of caller.
 %setup -q -n Devel-Caller-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" 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 f -name '*.bs' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name '*.bs' -size 0 -delete
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes
 %{perl_vendorarch}/auto/Devel/
 %{perl_vendorarch}/Devel/
 %{_mandir}/man3/Devel::Caller.3pm*
 
 %changelog
+* Wed Jan 27 2016 Petr Šabata <contyk@redhat.com> - 2.06-8
+- Package cleanup
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.06-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild