diff --git a/mail/spamassassin-devel/Makefile b/mail/spamassassin-devel/Makefile
index bedbe5fd69912..a4952e13b0c76 100644
--- a/mail/spamassassin-devel/Makefile
+++ b/mail/spamassassin-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	spamassassin
 PORTVERSION=	${SA_COMMIT_DATE}
+PORTREVISION=	1
 CATEGORIES?=	mail perl5
 PKGNAMESUFFIX=	-devel
 
@@ -24,6 +25,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
 		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
 		p5-URI>=0:net/p5-URI \
+		p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-XString>=0:textproc/p5-XString \
 		re2c>=.12.0:devel/re2c
 
 .for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 4c0c3d949cec2..f98eb2fd343f2 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	spamassassin
 PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	mail perl5
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail
 DISTNAME=	Mail-SpamAssassin-${PORTVERSION}
@@ -21,6 +21,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
 		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
 		p5-URI>=0:net/p5-URI \
+		p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-XString>=0:textproc/p5-XString \
 		re2c>=.12.0:devel/re2c
 
 .for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL