diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 097b5c5de534..b2ddee4bac3c 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.58.9
-PORTREVISION=	2
+PORTVERSION=	4.59.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -52,7 +51,7 @@ OPTIONS=	SPAMASSASSIN "Install SpamAssassin" on \
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
-PATCHLEVEL=	1
+PATCHLEVEL=	2
 
 USE_PERL5=	yes
 
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index c2ba583ebc8c..4b29eff80bc8 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.58.9-1.tar.gz) = 5c641a7d76beaa0bb7d9efcb04f6b333
-SHA256 (MailScanner-install-4.58.9-1.tar.gz) = 4e4f362fc8778c9a0deaff696f8c966081c4bf08227f3bd036f39fbbe6d7010c
-SIZE (MailScanner-install-4.58.9-1.tar.gz) = 7058345
+MD5 (MailScanner-install-4.59.4-2.tar.gz) = 342a3d40c8bdf0f204556956370e4042
+SHA256 (MailScanner-install-4.59.4-2.tar.gz) = c591c3f58c9de0991a5f1736fc1cf7a6be1ad49ce68ddb6bdd2c1dbd4f5c29f1
+SIZE (MailScanner-install-4.59.4-2.tar.gz) = 7060488
diff --git a/mail/mailscanner/files/CHANGES.port b/mail/mailscanner/files/CHANGES.port
index c1500cc301df..667e9df3cf2b 100644
--- a/mail/mailscanner/files/CHANGES.port
+++ b/mail/mailscanner/files/CHANGES.port
@@ -1,3 +1,7 @@
+Version 4.59.4_2
+================
+- update to 4.59.4
+
 Version 4.58.9_2
 ================
 - clamav-wrapper contained options unarj, unace and zoo. unace
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index a12c0550d131..3f176d8aecd2 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -63,12 +63,16 @@ libexec/MailScanner/update_virus_scanners.cron
 libexec/MailScanner/sa-update.cron
 libexec/MailScanner/antivir-autoupdate.sample
 libexec/MailScanner/antivir-wrapper.sample
+libexec/MailScanner/avast-wrapper.sample
+libexec/MailScanner/avastd-wrapper.sample
+libexec/MailScanner/avast-autoupdate.sample
 libexec/MailScanner/avg-autoupdate.sample
 libexec/MailScanner/avg-wrapper.sample
 libexec/MailScanner/bitdefender-autoupdate.sample
 libexec/MailScanner/bitdefender-wrapper.sample
 libexec/MailScanner/clamav-autoupdate.sample
 libexec/MailScanner/clamav-wrapper.sample
+libexec/MailScanner/clamd-wrapper.sample
 libexec/MailScanner/command-wrapper.sample
 libexec/MailScanner/css-autoupdate.sample
 libexec/MailScanner/css-wrapper.sample