diff --git a/.gitignore b/.gitignore
index 8a86f10..b2e0365 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /CPAN-2.14.tar.gz
 /CPAN-2.16.tar.gz
 /CPAN-2.22.tar.gz
+/CPAN-2.25.tar.gz
diff --git a/perl-CPAN.spec b/perl-CPAN.spec
index d4d2280..2f70f48 100644
--- a/perl-CPAN.spec
+++ b/perl-CPAN.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           perl-CPAN
-Version:        2.22
+Version:        2.25
 Release:        1%{?dist}
 Summary:        Query, download and build perl modules from CPAN sites
 License:        GPL+ or Artistic
@@ -81,8 +81,10 @@ BuildRequires:  perl(lib)
 # Module::Signature is optional
 # Net::Config not used at tests
 # Net::FTP not used at tests
+# Net::Ping is required but >= 2.13 version is a soft dependency
 BuildRequires:  perl(Net::Ping)
 BuildRequires:  perl(overload)
+# Pod::Perldoc is optional
 BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Safe)
 BuildRequires:  perl(Sys::Hostname)
@@ -107,6 +109,7 @@ BuildRequires:  perl(Module::Build)
 %endif
 
 # Tests:
+BuildRequires:  perl(blib)
 # CPAN::Checksums not used
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(Pod::Usage)
@@ -194,6 +197,9 @@ Requires:       perl(local::lib)
 %endif
 %if ! %{defined perl_bootstrap}
 Requires:       perl(Module::Build)
+%endif
+Recommends:     perl(Pod::Perldoc)
+%if ! %{defined perl_bootstrap}
 Recommends:     perl(Term::ReadKey)
 Requires:       perl(Text::Glob)
 # Text::Levenshtein::XS or Text::Levenshtein::Damerau::XS or Text::Levenshtein
@@ -227,11 +233,11 @@ rm -r ./inc/*
 sed -i -e '/inc\//d' MANIFEST
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
@@ -248,6 +254,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 04 2019 Petr Pisar <ppisar@redhat.com> - 2.25-1
+- 2.25 bump
+
 * Wed Jan 02 2019 Petr Pisar <ppisar@redhat.com> - 2.22-1
 - 2.22 bump
 
diff --git a/sources b/sources
index d47debe..12b8834 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (CPAN-2.22.tar.gz) = e071f2605597f874bf49b87f81cd93a246905339e1d9f657c7e05043848c13170a35c683822df5142553eec5ae4d0194c5dd20208a36d6e6b1816cfc76be99bb
+SHA512 (CPAN-2.25.tar.gz) = b7f3bb66fb00d4a971940f810e49a60572dbe65ee63875b1fe75dc1313efabf877c9f24749c6d3ba9a5ea404fceceeef5c6da5be15ec5f967fc759e852e78886