diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 693f5c62577..6ac363303fc 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2020/07/03 21:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2021/12/26 10:02:24 giovanni Exp $
 
 COMMENT =		perl oop implementation of Sender Policy Framework
 
 DISTNAME =		Mail-SPF-v2.9.0
 PKGNAME =		p5-${DISTNAME:S/-v/-/}
-REVISION =		1
+REVISION =		2
 CATEGORIES =		mail
 
 MAINTAINER =		Giovanni Bechis <giovanni@openbsd.org>
diff --git a/mail/p5-Mail-SPF/patches/patch-lib_Mail_SPF_Record_pm b/mail/p5-Mail-SPF/patches/patch-lib_Mail_SPF_Record_pm
new file mode 100644
index 00000000000..a1150ae3ec0
--- /dev/null
+++ b/mail/p5-Mail-SPF/patches/patch-lib_Mail_SPF_Record_pm
@@ -0,0 +1,13 @@
+$OpenBSD: patch-lib_Mail_SPF_Record_pm,v 1.1 2021/12/26 10:02:24 giovanni Exp $
+Fix for cpan bug 130299 (https://rt.cpan.org/Public/Bug/Display.html?id=130299)
+Index: lib/Mail/SPF/Record.pm
+--- lib/Mail/SPF/Record.pm.orig
++++ lib/Mail/SPF/Record.pm
+@@ -206,6 +206,7 @@ sub parse_version_tag {
+ 
+ sub parse_term {
+     my ($self) = @_;
++    require Mail::SPF::Mech;
+     if (
+         $self->{parse_text} =~ s/
+             ^