diff --git a/mail/spamassassin-devel/Makefile b/mail/spamassassin-devel/Makefile
index 1baf4cc3c220e..de86e10e26281 100644
--- a/mail/spamassassin-devel/Makefile
+++ b/mail/spamassassin-devel/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
 		re2c>=.12.0:devel/re2c
 
-.for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL
+.for dep in DCC DKIM DMARC MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL
 TEST_DEPENDS+=	${${dep}_RUN_DEPENDS}
 .endfor
 
@@ -57,7 +57,7 @@ CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
 OPTIONS_DEFINE=		AS_ROOT DOCS SSL
 OPTIONS_GROUP=		DATABASE GPG PLUGINS
 OPTIONS_GROUP_DATABASE=	MYSQL PGSQL
-OPTIONS_GROUP_PLUGINS=	DCC DKIM PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY
+OPTIONS_GROUP_PLUGINS=	DCC DKIM DMARC PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY
 OPTIONS_SINGLE=		GPG
 OPTIONS_SINGLE_GPG=	GNUPG_NONE GNUPG GNUPG2
 OPTIONS_DEFAULT=	AS_ROOT DKIM GNUPG SSL SPF_QUERY
@@ -74,6 +74,7 @@ GNUPG2_DESC=		GnuPG 2 (security/gnupg)
 PLUGINS_DESC=		Optional SpamAssassin plugins
 DCC_DESC=		DCC digest list support (mail/dcc-dccd)
 DKIM_DESC=		Verify DKIM records (mail/p5-Mail-DKIM)
+DMARC_DESC=		Verify DMARC records (mail/p5-Mail-DMARC)
 PYZOR_DESC=		Pyzor digest list support (mail/pyzor)
 RAZOR_DESC=		Vipul's Razor digest list support (mail/razor-agents)
 RELAY_COUNTRY_DESC=	Location-based scoring (net/p5-GeoIP2)
@@ -91,6 +92,35 @@ DCC_RUN_DEPENDS=	dcc-dccd>=1.3.111:mail/dcc-dccd
 DKIM_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 			p5-Mail-DKIM>=0.37:mail/p5-Mail-DKIM \
 			p5-Crypt-OpenSSL-RSA>=0.26_1:security/p5-Crypt-OpenSSL-RSA
+DMARC_RUN_DEPENDS=	p5-Mail-DMARC>=0:mail/p5-Mail-DMARC \
+			p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+			p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+			p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+			p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
+			p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+			p5-Socket6>=0:net/p5-Socket6 \
+			p5-Email-MIME>=0:mail/p5-Email-MIME \
+			p5-HTTP-Message>=0:www/p5-HTTP-Message \
+			p5-HTTP-Tiny>=0:www/p5-HTTP-Tiny \
+			p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+			p5-JSON>=0:converters/p5-JSON \
+			p5-Net-SMTPS>=0:mail/p5-Net-SMTPS \
+			p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+			p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+			p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+			p5-DBIx-Simple>=0:databases/p5-DBIx-Simple \
+			p5-Test-File-ShareDir>=0:devel/p5-Test-File-ShareDir \
+			p5-CGI>=0:www/p5-CGI \
+			p5-Email-Simple>=0:mail/p5-Email-Simple \
+			p5-Mail-DKIM>=0:mail/p5-Mail-DKIM \
+			p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple \
+			p5-Net-Server>=0:net/p5-Net-Server \
+			p5-Net-HTTP>=0:net/p5-Net-HTTP \
+			p5-Test-Output>=0:devel/p5-Test-Output \
+			p5-Net-DNS>=0:dns/p5-Net-DNS \
+			p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
+			p5-libwww>=0:www/p5-libwww \
+			p5-URI>=0:net/p5-URI
 GNUPG_RUN_DEPENDS=	gnupg1>=1.4.7:security/gnupg1
 GNUPG2_RUN_DEPENDS=	gpg2:security/gnupg
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
@@ -111,6 +141,7 @@ SSL_CONFIGURE_OFF=	ENABLE_SSL=no
 # plugin names in rules/*.pre, for enabling/disabling
 DCC_INITVAR=		DCC
 DKIM_INITVAR=		DKIM
+DMARC_INITVAR=		DMARC
 PYZOR_INITVAR=		Pyzor
 RAZOR_INITVAR=		Razor2
 RELAY_COUNTRY_INITVAR=	RelayCountry
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 7fa570df61065..50053c3ff5e6e 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
 		re2c>=.12.0:devel/re2c
 
-.for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL
+.for dep in DCC DKIM DMARC MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL
 TEST_DEPENDS+=	${${dep}_RUN_DEPENDS}
 .endfor
 
@@ -54,7 +54,7 @@ CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
 OPTIONS_DEFINE=		AS_ROOT DOCS SSL
 OPTIONS_GROUP=		DATABASE GPG PLUGINS
 OPTIONS_GROUP_DATABASE=	MYSQL PGSQL
-OPTIONS_GROUP_PLUGINS=	DCC DKIM PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY
+OPTIONS_GROUP_PLUGINS=	DCC DKIM DMARC PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY
 OPTIONS_SINGLE=		GPG
 OPTIONS_SINGLE_GPG=	GNUPG_NONE GNUPG GNUPG2
 OPTIONS_DEFAULT=	AS_ROOT DKIM GNUPG SSL SPF_QUERY
@@ -71,6 +71,7 @@ GNUPG2_DESC=		GnuPG 2 (security/gnupg)
 PLUGINS_DESC=		Optional SpamAssassin plugins
 DCC_DESC=		DCC digest list support (mail/dcc-dccd)
 DKIM_DESC=		Verify DKIM records (mail/p5-Mail-DKIM)
+DMARC_DESC=		Verify DMARC records (mail/p5-Mail-DMARC)
 PYZOR_DESC=		Pyzor digest list support (mail/pyzor)
 RAZOR_DESC=		Vipul's Razor digest list support (mail/razor-agents)
 RELAY_COUNTRY_DESC=	Location-based scoring (net/p5-GeoIP2)
@@ -88,6 +89,35 @@ DCC_RUN_DEPENDS=	dcc-dccd>=1.3.111:mail/dcc-dccd
 DKIM_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 			p5-Mail-DKIM>=0.37:mail/p5-Mail-DKIM \
 			p5-Crypt-OpenSSL-RSA>=0.26_1:security/p5-Crypt-OpenSSL-RSA
+DMARC_RUN_DEPENDS=	p5-Mail-DMARC>=0:mail/p5-Mail-DMARC \
+			p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+			p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+			p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+			p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
+			p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+			p5-Socket6>=0:net/p5-Socket6 \
+			p5-Email-MIME>=0:mail/p5-Email-MIME \
+			p5-HTTP-Message>=0:www/p5-HTTP-Message \
+			p5-HTTP-Tiny>=0:www/p5-HTTP-Tiny \
+			p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+			p5-JSON>=0:converters/p5-JSON \
+			p5-Net-SMTPS>=0:mail/p5-Net-SMTPS \
+			p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+			p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+			p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+			p5-DBIx-Simple>=0:databases/p5-DBIx-Simple \
+			p5-Test-File-ShareDir>=0:devel/p5-Test-File-ShareDir \
+			p5-CGI>=0:www/p5-CGI \
+			p5-Email-Simple>=0:mail/p5-Email-Simple \
+			p5-Mail-DKIM>=0:mail/p5-Mail-DKIM \
+			p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple \
+			p5-Net-Server>=0:net/p5-Net-Server \
+			p5-Net-HTTP>=0:net/p5-Net-HTTP \
+			p5-Test-Output>=0:devel/p5-Test-Output \
+			p5-Net-DNS>=0:dns/p5-Net-DNS \
+			p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
+			p5-libwww>=0:www/p5-libwww \
+			p5-URI>=0:net/p5-URI
 GNUPG_RUN_DEPENDS=	gnupg1>=1.4.7:security/gnupg1
 GNUPG2_RUN_DEPENDS=	gpg2:security/gnupg
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
@@ -108,6 +138,7 @@ SSL_CONFIGURE_OFF=	ENABLE_SSL=no
 # plugin names in rules/*.pre, for enabling/disabling
 DCC_INITVAR=		DCC
 DKIM_INITVAR=		DKIM
+DMARC_INITVAR=		DMARC
 PYZOR_INITVAR=		Pyzor
 RAZOR_INITVAR=		Razor2
 RELAY_COUNTRY_INITVAR=	RelayCountry