diff --git a/.gitignore b/.gitignore
index 30a143f..6427adb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /Filter-1.54.tar.gz
 /Filter-1.55.tar.gz
 /Filter-1.57.tar.gz
+/Filter-1.58.tar.gz
diff --git a/perl-Filter.spec b/perl-Filter.spec
index f9c878d..47fa9ca 100644
--- a/perl-Filter.spec
+++ b/perl-Filter.spec
@@ -1,30 +1,29 @@
 Name:           perl-Filter
 Epoch:          2
-Version:        1.57
-Release:        6%{?dist}
+Version:        1.58
+Release:        1%{?dist}
 Summary:        Perl source filters
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Filter/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/Filter-%{version}.tar.gz
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(Config)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  perl(strict)
 BuildRequires:  sed
 # Run-time
+BuildRequires:  perl(:VERSION) >= 5.6
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(DynaLoader)
 BuildRequires:  perl(Exporter)
-BuildRequires:  perl(vars)
 BuildRequires:  perl(warnings)
+BuildRequires:  perl(XSLoader)
 # Tests
 BuildRequires:  perl(Cwd)
 BuildRequires:  perl(Test::More) >= 0.88
@@ -42,6 +41,7 @@ BuildRequires:  perl(Test::Pod) >= 1.00
 # Text::CSV_XS not used
 %endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(Carp)
 
 %{?perl_default_filter}
 
@@ -58,12 +58,11 @@ sed -i -e '1 s|.*|%(perl -MConfig -e 'print $Config{startperl}')|' \
     examples/filtdef
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -delete
 find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete
 %{_fixperms} $RPM_BUILD_ROOT/*
 
@@ -77,6 +76,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2017 Petr Pisar <ppisar@redhat.com> - 2:1.58-1
+- 1.58 bump
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.57-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index b0ef3be..2599a27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Filter-1.57.tar.gz) = 6e0fe52ace85b329a73a79522a8227b64017701c9949d89271257bc6c50c263074084a50c500a3250959617707261ea71abd2432678c0741f4ad713e03ddefec
+SHA512 (Filter-1.58.tar.gz) = 38ffd5beb766c2a43d7d2c47dd7979abdf4222cc6151b0ae314f365270d08a41c73fe0efc46bc008dd210b3fe71576818c44ab855f92e3d62356f9d9c355e634