diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index 7e8748acd09..811f72cc10b 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2017/08/04 23:14:32 giovanni Exp $
+# $OpenBSD: Makefile,v 1.65 2017/08/09 20:36:40 giovanni Exp $
 
 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@@ -7,6 +7,7 @@ COMMENT-pgsql=		pgsql authentication module for courier-authLib
 COMMENT-userdb=		userdb authentication module for courier-authLib
 
 DISTNAME=		courier-authlib-0.68.0
+REVISION=		0
 PKGNAME-main=		${DISTNAME}
 PKGNAME-ldap=		${DISTNAME:S/lib-/lib-ldap-/}
 PKGNAME-mysql=		${DISTNAME:S/lib-/lib-mysql-/}
@@ -72,16 +73,16 @@ BUILD_DEPENDS=		lang/expect \
 
 DOCS=			COPYING COPYING.GPL INSTALL NEWS README
 
-MODULES=		devel/gettext \
-			textproc/intltool
+MODULES=		textproc/intltool
 
 MULTI_PACKAGES=		-main -ldap -mysql -pgsql -userdb
 PSEUDO_FLAVORS=		no_ldap no_mysql no_pgsql no_userdb
 FLAVOR?=
 
-WANTLIB-main=		c ltdl m pthread sqlite3 ${COMPILER_LIBCXX}
+WANTLIB-main=		c iconv intl ltdl m pthread sqlite3 ${COMPILER_LIBCXX}
 
 LIB_DEPENDS-main=	databases/sqlite3 \
+			devel/gettext \
 			devel/libtool,-ltdl
 
 WANTLIB-ldap=		crypto ssl courierauthcommon courierauth \
@@ -104,9 +105,8 @@ LIB_DEPENDS-pgsql=	${BUILD_PKGPATH} \
 			databases/postgresql
 
 WANTLIB-userdb=		c courierauthcommon courierauth \
-			gdbm>=3 ${MODGETTEXT_WANTLIB}
+			gdbm>=3 iconv intl
 LIB_DEPENDS-userdb=	${BUILD_PKGPATH} \
-			${MODGETTEXT_LIB_DEPENDS} \
 			databases/gdbm
 
 .include <bsd.port.arch.mk>
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 203045b705d..282575b5d1a 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.111 2017/08/04 23:15:45 giovanni Exp $
+# $OpenBSD: Makefile,v 1.112 2017/08/09 20:36:40 giovanni Exp $
 
 COMMENT-main=		imap server for maildir format mailboxes
 COMMENT-pop3=		pop3 server for maildir format mailboxes
 
 V=			4.18.0
 DISTNAME=		courier-imap-${V}
+REVISION=		0
 PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-pop3=	courier-pop3-${V}
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3
@@ -23,9 +24,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 COMPILER =		gcc
 
 WANTLIB=		c courierauth courierauthcommon courierauthsasl gdbm
-WANTLIB+=		idn m pcre ${COMPILER_LIBCXX}
+WANTLIB+=		iconv intl idn m pcre ${COMPILER_LIBCXX}
 WANTLIB-pop3=		c courierauth courierauthcommon courierauthsasl
-WANTLIB-pop3+=		idn m pcre ${COMPILER_LIBCXX} ${MODGETTEXT_WANTLIB}
+WANTLIB-pop3+=		iconv intl idn m pcre ${COMPILER_LIBCXX}
 
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	autoconf automake
@@ -94,14 +95,14 @@ CONFIGURE_ARGS+=	--disable-workarounds-for-imap-client-bugs
 MULTI_PACKAGES=		-main -pop3
 
 LIB_DEPENDS-main=	${LIB_DEPENDS} \
-			mail/courier-unicode>=2.0 \
-			databases/gdbm
+			devel/gettext \
+			databases/gdbm \
+			mail/courier-unicode>=2.0
+
 RUN_DEPENDS-pop3=	mail/courier-imap,-main
 
 WANTLIB-main=		${WANTLIB} ssl crypto courier-unicode
 
-MODULES=		devel/gettext
-
 CNFFILES=		etc/courier/imapd-ssl.dist etc/courier/imapd.dist \
 			etc/courier/pop3d-ssl.dist etc/courier/pop3d.dist \
 			etc/courier/imapd.cnf etc/courier/pop3d.cnf \