diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index af448fbb791..f6a2ffc4e6d 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.40 2014/09/17 09:13:12 ajacoutot Exp $
 
 COMMENT=	DKIM milter
 
 DISTNAME=	dkim-milter-2.8.3
-REVISION=	4
+REVISION=	5
 CATEGORIES=	mail
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP=		Yes
 
 WANTLIB=	c crypto milter pthread ssl
 
-LIB_DEPENDS=	mail/sendmail
+LIB_DEPENDS=	mail/sendmail,-libmilter
 
 EXAMPLESDIR=	share/examples/dkim-milter
 
diff --git a/mail/milter-checkrcpt/Makefile b/mail/milter-checkrcpt/Makefile
index 88c5de64a9a..70d17ffe4e3 100644
--- a/mail/milter-checkrcpt/Makefile
+++ b/mail/milter-checkrcpt/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.5 2014/09/17 09:13:12 ajacoutot Exp $
 
 COMMENT=	sendmail milter plugin for recipient checking
 
 DISTNAME=	milter-checkrcpt-0.3
-REVISION=	0
+REVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c milter pthread
 
-LIB_DEPENDS=	mail/sendmail
+LIB_DEPENDS=	mail/sendmail,-libmilter
 
 NO_TEST=	Yes
 
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 2adbe969198..baaa87286e3 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.16 2014/09/17 09:13:12 ajacoutot Exp $
 
 COMMENT=	greylist milter
 
 DISTNAME=	milter-greylist-4.2.7
-REVISION=	1
+REVISION=	2
 CATEGORIES=	mail
 HOMEPAGE=	http://hcpnet.free.fr/milter-greylist/
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=		Yes
 WANTLIB=	c pthread milter spf2
 
 LIB_DEPENDS=	mail/libspf2 \
-		mail/sendmail
+		mail/sendmail,-libmilter
 
 BUILD_DEPENDS=	devel/bison
 
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index c144ad27c90..2d2ab117edd 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.28 2014/09/17 09:13:12 ajacoutot Exp $
 
 COMMENT=	sendmail milter plugin for regular expression filtering
 
 DISTNAME=	milter-regex-1.9
-REVISION=	0
+REVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -15,7 +15,7 @@ MAINTAINER=	Daniel Hartmeier <dhartmei@openbsd.org>
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c pthread milter
 
-LIB_DEPENDS=	mail/sendmail
+LIB_DEPENDS=	mail/sendmail,-libmilter
 
 MAKE_FLAGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="-Wall -Wstrict-prototypes ${CFLAGS}" \
diff --git a/mail/milter-spamd/Makefile b/mail/milter-spamd/Makefile
index 0b5d3a7eae6..ca8439906da 100644
--- a/mail/milter-spamd/Makefile
+++ b/mail/milter-spamd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.21 2014/09/17 09:13:13 ajacoutot Exp $
 
 COMMENT=	sendmail milter plugin for SpamAssassin spamd
 
 DISTNAME=	milter-spamd-0.6
-REVISION=	0
+REVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -15,7 +15,7 @@ MAINTAINER=	Daniel Hartmeier <dhartmei@openbsd.org>
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c milter pthread
 
-LIB_DEPENDS=	mail/sendmail
+LIB_DEPENDS=	mail/sendmail,-libmilter
 
 MAKE_FLAGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="-Wall -Wstrict-prototypes ${CFLAGS}" \
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index c8061ba3419..bf49b18fc2b 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.38 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.39 2014/09/17 09:13:13 ajacoutot Exp $
 
 COMMENT=	mailfilter to identify and mark spam
 
 DISTNAME=	mimedefang-2.75
-REVISION=	0
+REVISION=	1
 CATEGORIES=	mail
 
 HOMEPAGE=	http://www.mimedefang.org/
@@ -16,15 +16,17 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m perl pthread util milter
 
+BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	archivers/p5-Archive-Zip \
 		mail/p5-MIME-tools \
 		security/p5-Digest-SHA1 \
 		www/p5-HTML-Parser \
 		sysutils/p5-Unix-Syslog
-BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	mail/sendmail
+
+LIB_DEPENDS=	mail/sendmail,-libmilter
 
 CONFIGURE_STYLE=gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--with-user=_mdefang \
 		--with-ipheader \
 		--disable-anti-virus \
diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile
index a5fe944779f..7f042b1b040 100644
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.22 2014/09/17 09:13:13 ajacoutot Exp $
 
 COMMENT =	Python interface to sendmail milter API
 
 MODPY_EGG_VERSION = 0.9.8
 DISTNAME =	pymilter-${MODPY_EGG_VERSION}
 PKGNAME =	${DISTNAME:S/py/py-/}
-REVISION =	0
+REVISION =	1
 CATEGORIES =	mail
 
 HOMEPAGE =	http://www.bmsi.com/python/milter.html
@@ -19,7 +19,9 @@ MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=pymilter/}
 
 MODULES =	lang/python
 
-LIB_DEPENDS =	mail/sendmail
+CFLAGS +=	-I${LOCALBASE}/include
+
+LIB_DEPENDS =	mail/sendmail,-libmilter
 TEST_DEPENDS = ${RUN_DEPENDS} \
 		  net/py-dns
 
diff --git a/mail/smtp-vilter/Makefile b/mail/smtp-vilter/Makefile
index a8a346f4609..b141f32c542 100644
--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.57 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.58 2014/09/17 09:13:13 ajacoutot Exp $
 
 COMMENT=	sendmail milter to scan messages for viruses and spam
 
 DISTNAME=	smtp-vilter-1.3.6
 EPOCH=		0
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=    	mail
 
@@ -20,7 +20,7 @@ WANTLIB += c m pthread milter
 MASTER_SITES=  	${HOMEPAGE}
 EXTRACT_SUFX=	.tgz
 
-LIB_DEPENDS=	mail/sendmail
+LIB_DEPENDS=	mail/sendmail,-libmilter
 
 NO_TEST=	Yes
 
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 5e53a2de4b0..a931bd9dc73 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.93 2014/09/17 07:52:42 jca Exp $
+# $OpenBSD: Makefile,v 1.94 2014/09/17 09:13:13 ajacoutot Exp $
 
 COMMENT=		virus scanner
 DISTNAME=		clamav-0.98.4
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		security
 
@@ -17,7 +17,7 @@ MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
 # GPLv2/LGPL, with OpenSSL exemption
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += bz2 c crypto curl idn intl ltdl m milter ncurses pthread
+WANTLIB += bz2 c crypto curl idn ltdl m milter ncurses pthread
 WANTLIB += ssl xml2 z
 
 BUILD_DEPENDS=		devel/check \
@@ -25,7 +25,7 @@ BUILD_DEPENDS=		devel/check \
 
 LIB_DEPENDS=		archivers/bzip2 \
 			devel/libtool,-ltdl \
-			mail/sendmail \
+			mail/sendmail,-libmilter \
 			net/curl \
 			textproc/libxml
 
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=        --disable-clamav \
 			--with-ltdl-lib=${LOCALBASE}/lib
 
 TEST_TARGET=	check
-MODULES=	lang/python converters/libiconv
+MODULES=	lang/python devel/gettext
 MODPY_RUNDEP=	no
 
 CPPFLAGS+=	-I/usr/include -I${LOCALBASE}/include