diff --git a/perl-String-ShellQuote.spec b/perl-String-ShellQuote.spec
index 27fccf8..161b191 100644
--- a/perl-String-ShellQuote.spec
+++ b/perl-String-ShellQuote.spec
@@ -1,24 +1,22 @@
 Name:           perl-String-ShellQuote
 Version:        1.04
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Perl module for quoting strings for passing through the shell
-# shell-quote:  GPLv2+
-# rest:         GPL+ or Artistic
 License:        (GPL+ or Artistic) and GPLv2+
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/String-ShellQuote/
 Source0:        http://www.cpan.org/authors/id/R/RO/ROSCH/String-ShellQuote-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+# Build
 BuildRequires:  perl
-BuildRequires:  perl(ExtUtils::MakeMaker)
-# Run-time:
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+# Runtime
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Exporter)
 # RS::Handy is never used
 BuildRequires:  perl(strict)
 BuildRequires:  perl(vars)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Tests only
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 Requires:       perl(Carp)
 Requires:       perl(Getopt::Long)
 
@@ -31,34 +29,27 @@ shell or a shell-like object.
 %setup -q -n String-ShellQuote-%{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 -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{_bindir}/shell-quote
 %{perl_vendorlib}/String
-%{_mandir}/man1/shell-quote.1*
-%{_mandir}/man3/String::ShellQuote.3*
+%{_mandir}/man1/*
+%{_mandir}/man3/*
 
 %changelog
+* Tue Mar 01 2016 Petr Šabata <contyk@redhat.com> - 1.04-18
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.04-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild