diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 37e7d8a3c2a..aaf305902f9 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.85 2011/10/19 23:06:57 fkr Exp $
+# $OpenBSD: Makefile,v 1.86 2011/11/18 13:29:29 espie Exp $
 
 CATEGORIES =		mail
 COMMENT-main =		flexible mail transfer agent
@@ -26,7 +26,7 @@ PERMIT_DISTFILES_FTP =   Yes
 PSEUDO_FLAVORS =	no_eximon
 FLAVORS =		mysql postgresql sqlite3 ldap sasl
 FLAVOR ?=
-MULTI_PACKAGES =	-main
+MULTI_PACKAGES =	-main -eximon
 
 MODULES =		converters/libiconv
 LIB_DEPENDS-main =	${LIB_DEPENDS} devel/pcre
@@ -39,12 +39,13 @@ LIB_DEPENDS-eximon =	devel/pcre
 USE_GROFF =		Yes
 NO_REGRESS =		Yes
 
-.if !${FLAVOR:L:Mno_eximon}
-MULTI_PACKAGES +=	-eximon
+.include <bsd.port.arch.mk>
+
+.if ${BUILD_PACKAGES:M-eximon}
 EXIM_MAKECAT +=		"EXIM_MONITOR=eximon.bin\n"
 .endif
 
-.if ${FLAVOR:L:Mmysql}
+.if ${FLAVOR:Mmysql}
 EXIM_MAKECAT +=		"LOOKUP_MYSQL=yes\n"
 EXIM_LOOKUP_INCLUDE +=	-I${LOCALBASE}/include/mysql
 EXIM_LOOKUP_LIBS +=	-L${LOCALBASE}/lib/mysql -lmysqlclient
@@ -52,7 +53,7 @@ LIB_DEPENDS-main +=	databases/mysql
 WANTLIB-main +=		lib/mysql/mysqlclient>=10
 .endif
 
-.if ${FLAVOR:L:Mpostgresql}
+.if ${FLAVOR:Mpostgresql}
 EXIM_MAKECAT +=		"LOOKUP_PGSQL=yes\n"
 EXIM_LOOKUP_INCLUDE +=	-I${LOCALBASE}/include/postgresql
 EXIM_LOOKUP_LIBS +=	-L${LOCALBASE}/lib/ -lpq
@@ -60,14 +61,14 @@ LIB_DEPENDS-main +=	databases/postgresql
 WANTLIB-main +=		pq>=2
 .endif
 
-.if ${FLAVOR:L:Msqlite3}
+.if ${FLAVOR:Msqlite3}
 EXIM_MAKECAT +=		"LOOKUP_SQLITE=yes\n"
 EXIM_LOOKUP_LIBS +=	-L${LOCALBASE}/lib/ -lsqlite3
 LIB_DEPENDS-main +=	databases/sqlite3
 WANTLIB-main +=		sqlite3>=8
 .endif
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 EXIM_MAKECAT +=		"LOOKUP_LDAP=yes\n"
 EXIM_MAKECAT +=		"LDAP_LIB_TYPE=OPENLDAP2\n"
 EXIM_LOOKUP_LIBS +=	-L${LOCALBASE}/lib -lldap -llber
@@ -75,7 +76,7 @@ LIB_DEPENDS-main +=	databases/openldap>=2.3
 WANTLIB-main +=		ldap>=9 lber
 .endif
 
-.if ${FLAVOR:L:Msasl}
+.if ${FLAVOR:Msasl}
 EXIM_MAKECAT +=		"AUTH_CYRUS_SASL=yes\n"
 EXIM_EXTRA_LIBS +=	-L${LOCALBASE}/lib -lsasl2
 LIB_DEPENDS-main +=	security/cyrus-sasl2