diff --git a/.gitignore b/.gitignore
index 884b09c..88a1c8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Mail-SPF-v[0-9.]*.tar.gz
+/Mail-SPF-3.20240205.tar.gz
diff --git a/perl-Mail-SPF.spec b/perl-Mail-SPF.spec
index cb03b18..a10c196 100644
--- a/perl-Mail-SPF.spec
+++ b/perl-Mail-SPF.spec
@@ -1,19 +1,20 @@
 Name:           perl-Mail-SPF
-Version:        2.9.0
-Release:        34%{?dist}
+Version:        3.20240205
+Release:        1%{?dist}
 Summary:        Object-oriented implementation of Sender Policy Framework
 License:        BSD-3-Clause
 URL:            https://metacpan.org/release/Mail-SPF
-Source0:        https://cpan.metacpan.org/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v%{version}.tar.gz
-Patch0:         Mail-SPF-v2.8.0-POD.patch
-Patch1:         Mail-SPF-v2.8.0-testsuite.patch
+Source0:        https://cpan.metacpan.org/modules/by-module/Mail/Mail-SPF-%{version}.tar.gz
+Patch0:         Mail-SPF-v2.8.0-testsuite.patch
 BuildArch:      noarch
 # Build
 BuildRequires:  coreutils
-BuildRequires:  perl-interpreter
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(version)
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
 # Runtime
 BuildRequires:  perl(base)
 BuildRequires:  perl(constant)
@@ -22,12 +23,9 @@ BuildRequires:  perl(Net::DNS) >= 0.62
 BuildRequires:  perl(Net::DNS::Resolver)
 BuildRequires:  perl(NetAddr::IP) >= 4
 BuildRequires:  perl(overload)
-BuildRequires:  perl(strict)
 BuildRequires:  perl(Sys::Hostname)
-BuildRequires:  perl(URI) >= 1.13
-BuildRequires:  perl(URI::Escape)
+BuildRequires:  perl(URI::Escape) >= 1.13
 BuildRequires:  perl(utf8)
-BuildRequires:  perl(warnings)
 # Tests only
 BuildRequires:  perl(blib)
 BuildRequires:  perl(Net::DNS::Resolver::Programmable) >= 0.003
@@ -46,45 +44,43 @@ Mail::SPF is an object-oriented implementation of Sender Policy Framework
 (SPF). See http://www.openspf.org for more information about SPF.
 
 %prep
-%setup -q -n Mail-SPF-v%{version}
-# Fix broken POD (CPAN RT#86060)
-%patch -P 0
+%setup -q -n Mail-SPF-%{version}
 # Work around test suite failures with Net::DNS ≥ 0.68 (CPAN RT#78214)
-%patch -P 1
-chmod -x bin/* sbin/*
+%patch -P 0
+chmod -x bin/*
 
 %build
-perl Build.PL installdirs=vendor
-./Build
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-./Build install destdir=%{buildroot} create_packlist=0
+%{make_install}
 %{_fixperms} %{buildroot}/*
 # The spfquery and spfd will use alternatives
 %{__mv} -f %{buildroot}%{_bindir}/spfquery %{buildroot}%{_bindir}/spfquery.%{name}
-%{__mv} -f %{buildroot}%{_sbindir}/spfd %{buildroot}%{_bindir}/spfd.%{name}
+%{__mv} -f %{buildroot}%{_bindir}/spfd %{buildroot}%{_bindir}/spfd.%{name}
 %{__mv} -f %{buildroot}%{_mandir}/man1/spfquery.1 %{buildroot}%{_mandir}/man1/spfquery-%{name}.1
 touch %{buildroot}%{_bindir}/spfquery %{buildroot}%{_bindir}/spfd %{buildroot}%{_mandir}/man1/spfquery.1.gz
 
 %check
-./Build test
+make test
 
 %post
 %{_sbindir}/update-alternatives --install %{_bindir}/spfquery spf %{_bindir}/spfquery.%{name} 10 \
-	--slave %{_bindir}/spfd spf-daemon %{_bindir}/spfd.%{name} \
-	--slave %{_mandir}/man1/spfquery.1.gz spfquery-man-page %{_mandir}/man1/spfquery-%{name}.1.gz
+       --slave %{_bindir}/spfd spf-daemon %{_bindir}/spfd.%{name} \
+       --slave %{_mandir}/man1/spfquery.1.gz spfquery-man-page %{_mandir}/man1/spfquery-%{name}.1.gz
 
 %postun
 if [ $1 -eq 0 ] ; then
-	%{_sbindir}/update-alternatives --remove spf %{_bindir}/spfquery.%{name}
+       %{_sbindir}/update-alternatives --remove spf %{_bindir}/spfquery.%{name}
 fi
 
 %files
 %license LICENSE
-%doc CHANGES README TODO bin/ sbin/
-%{perl_vendorlib}/*
-%{_mandir}/man1/*
-%{_mandir}/man3/*
+%doc Changes README TODO bin/
+%{perl_vendorlib}/Mail/SPF*
+%{_mandir}/man1/spf*
+%{_mandir}/man3/Mail::SPF*
 %ghost %{_bindir}/spfquery
 %ghost %{_bindir}/spfd
 %ghost %{_mandir}/man1/spfquery.1.gz
@@ -92,6 +88,9 @@ fi
 %{_bindir}/spfd.%{name}
 
 %changelog
+* Mon Feb 05 2024 Jitka Plesnikova <jplesnik@redhat.com> - 3.20240205-1
+- 3.20240205 bump (rhbz#2262786)
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index ec4ea8a..cfa1e64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-664e20d79c87fa505080f362e827dace  Mail-SPF-v2.9.0.tar.gz
+SHA512 (Mail-SPF-3.20240205.tar.gz) = 72d1c3605726498ca5e415c5188a4ba11a104c0b1d27563c25f27abc6e43dce744d5d295a7bc58b41d4b210c478d79d7476ad5c66375b09d593656b8773b336f