diff --git a/perl-Pod-Strip.spec b/perl-Pod-Strip.spec
index 92fe7c8..247cfeb 100644
--- a/perl-Pod-Strip.spec
+++ b/perl-Pod-Strip.spec
@@ -1,57 +1,53 @@
 Name:           perl-Pod-Strip
 Version:        1.02
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Remove POD from Perl code
-
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Pod-Strip/
 Source0:        http://www.cpan.org/authors/id/D/DO/DOMM/Pod-Strip-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
+# Build
+BuildRequires:  perl
 BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Runtime
+BuildRequires:  perl(base)
 BuildRequires:  perl(Pod::Simple) >= 3.00
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Tests only
+BuildRequires:  perl(Test::More)
+# Optional tests only
+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(Pod::Simple) >= 3.00
 
 %description
 Pod::Strip is a subclass of Pod::Simple that strips all POD from Perl Code.
 
-
 %prep
 %setup -q -n Pod-Strip-%{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
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+./Build install destdir=%{buildroot} create_packlist=0
+%{_fixperms} %{buildroot}/*
 
 %check
 ./Build test
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/Pod/
-%{_mandir}/man3/*.3pm*
-
+%{_mandir}/man3/*
 
 %changelog
+* Tue Mar 01 2016 Petr Šabata <contyk@redhat.com> - 1.02-22
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.02-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild