diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index f66a6b0f18b..fddca438005 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.44 2011/07/22 19:57:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.45 2011/08/21 11:03:26 sthen Exp $
 
 COMMENT=	virus/spam scanning framework
 
 V=		4.84
-Vs=		1
+Vs=		3
 Vss=		${Vs}-1
-REVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	http://mailscanner.info/files/4/tar/
 DISTNAME=	mailscanner-${V}.${Vss}
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 0b1784ba68c..1e6df1fd4bf 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,5 +1,5 @@
-MD5 (MailScanner-install-4.84.1-1.tar.gz) = QWf4YgLlSvq+i52Be1qpXw==
-RMD160 (MailScanner-install-4.84.1-1.tar.gz) = 1qPy7gWU82B5liB6KpM2js7/DJY=
-SHA1 (MailScanner-install-4.84.1-1.tar.gz) = Z9lsTaVZmJ2gM5KvdUQxFSHfMOc=
-SHA256 (MailScanner-install-4.84.1-1.tar.gz) = rSJKVIXAKz7jNQY8Y6FGZ5//smgI3iwuJYFf8yx22vE=
-SIZE (MailScanner-install-4.84.1-1.tar.gz) = 9495428
+MD5 (MailScanner-install-4.84.3-1.tar.gz) = NPToijlbQIGhHK1ip8ad8g==
+RMD160 (MailScanner-install-4.84.3-1.tar.gz) = 8BHvNPl9kemq2ebPhgPLOHtZTBc=
+SHA1 (MailScanner-install-4.84.3-1.tar.gz) = tfCLpYCxIINVltGEMJZYT59yRCw=
+SHA256 (MailScanner-install-4.84.3-1.tar.gz) = 7eEYRdQDwxvct9iX6Y33cW0YT1s3kvnwfa1GJvMMJnU=
+SIZE (MailScanner-install-4.84.3-1.tar.gz) = 9496593
diff --git a/mail/mailscanner/patches/patch-bin_Sophos_install b/mail/mailscanner/patches/patch-bin_Sophos_install
index 0c8b4512691..38530e1e0fc 100644
--- a/mail/mailscanner/patches/patch-bin_Sophos_install
+++ b/mail/mailscanner/patches/patch-bin_Sophos_install
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bin_Sophos_install,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
---- bin/Sophos.install.orig	Mon Aug 20 15:16:58 2007
-+++ bin/Sophos.install	Sat Dec 15 15:12:36 2007
-@@ -204,9 +204,9 @@ if [ -f /etc/sav.conf ]; then
+$OpenBSD: patch-bin_Sophos_install,v 1.2 2011/08/21 11:03:26 sthen Exp $
+--- bin/Sophos.install.orig	Sat Aug 20 08:32:02 2011
++++ bin/Sophos.install	Sat Aug 20 21:38:21 2011
+@@ -208,9 +208,9 @@ if [ -f /etc/sav.conf ]; then
    rm -f /etc/sav.conf
  fi
  
diff --git a/mail/mailscanner/patches/patch-lib_clamav-wrapper b/mail/mailscanner/patches/patch-lib_clamav-wrapper
index 4def053a293..83f05c1b869 100644
--- a/mail/mailscanner/patches/patch-lib_clamav-wrapper
+++ b/mail/mailscanner/patches/patch-lib_clamav-wrapper
@@ -1,16 +1,7 @@
-$OpenBSD: patch-lib_clamav-wrapper,v 1.2 2008/11/07 02:33:58 brad Exp $
---- lib/clamav-wrapper.orig	Fri Sep  5 04:55:29 2008
-+++ lib/clamav-wrapper	Thu Nov  6 20:24:55 2008
-@@ -51,7 +51,7 @@
- 
- # You may want to check this script for bash-isms
- 
--TempDir="/tmp/clamav.$$"
-+TempDir="`mktemp -d /var/spool/MailScanner/clamav.XXXXXXXXXXXXXXX`"
- ClamUser="clamav"
- ClamGroup="clamav"
- 
-@@ -98,23 +98,23 @@ ExtraScanOptions=""
+$OpenBSD: patch-lib_clamav-wrapper,v 1.3 2011/08/21 11:03:26 sthen Exp $
+--- lib/clamav-wrapper.orig	Sat Aug 20 08:32:02 2011
++++ lib/clamav-wrapper	Sat Aug 20 21:38:21 2011
+@@ -99,23 +99,23 @@ ExtraScanOptions=""
  # LESS COMMON unpackers, which probably aren't installed by default
  # (hence disabled)
  # Uncomment ONE of the following lines if you have unrar installed