diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 723fa9a6260a..46ad897dd871 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Mail-SPF
 PORTVERSION=	2.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -23,10 +23,11 @@ RUN_DEPENDS=	p5-Error>=0:lang/p5-Error \
 		p5-URI>=1.13:net/p5-URI
 TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
+USES=		perl5 shebangfix
+USE_PERL5=	modbuild
+
 CONFIGURE_ARGS=	--install_path sbin=${PREFIX}/sbin
 NO_ARCH=	yes
-USE_PERL5=	modbuild
-USES=		perl5 shebangfix
 
 SHEBANG_FILES=	bin/spfquery sbin/spfd
 
diff --git a/mail/p5-Mail-SPF/files/patch-lib-Mail-SPF-Record.pm b/mail/p5-Mail-SPF/files/patch-lib-Mail-SPF-Record.pm
new file mode 100644
index 000000000000..233466ba2643
--- /dev/null
+++ b/mail/p5-Mail-SPF/files/patch-lib-Mail-SPF-Record.pm
@@ -0,0 +1,10 @@
+--- lib/Mail/SPF/Record.pm.orig	2013-07-22 03:52:32 UTC
++++ 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/
+             ^