diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index 07c7420885b..3a91d02db39 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,7 +1,7 @@
 COMMENT=	companion library to APR
 
 V=		1.6.1
-REVISION=	3
+REVISION=	4
 DISTNAME=	apr-util-$V
 SHARED_LIBS +=	aprutil-1          6.1     # .6.0
 
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
 			--with-ldap-lib=${LOCALBASE}/lib \
 			--with-ldap
 LIB_DEPENDS+=		databases/openldap
-WANTLIB+=		sasl2 lber-2.4 ldap-2.4
+WANTLIB+=		sasl2 lber ldap
 .else
 CONFIGURE_ARGS+=	--with-ldap=no
 .endif
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 653535ecc3c..24657bc70ac 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -13,6 +13,7 @@ PKGNAME-pdfviewer=	claws-mail-pdfviewer-${V}
 PKGNAME-gdata=		claws-mail-gdata-${V}
 
 REVISION=		1
+REVISION-main=		2
 
 CATEGORIES=		mail news
 
@@ -124,7 +125,7 @@ CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 
 .if ${FLAVOR:Mldap}
-WANTLIB-main+=		lber-2.4 ldap-2.4
+WANTLIB-main+=		lber ldap
 LIB_DEPENDS-main+=	databases/openldap
 .else
 CONFIGURE_ARGS+=	--disable-ldap
diff --git a/net/dico/Makefile b/net/dico/Makefile
index 7f86ce4ef01..41265995076 100644
--- a/net/dico/Makefile
+++ b/net/dico/Makefile
@@ -2,7 +2,7 @@ COMMENT =	GNU dictionary server
 
 V =		2.10
 DISTNAME =	dico-$V
-REVISION =	0
+REVISION =	1
 
 SHARED_LIBS +=  dico                      0.0 # 2.0
 
@@ -15,8 +15,8 @@ MAINTAINER =	Anthony J. Bentley <anthony@anjbe.name>
 # GPLv3+
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += c crypto curses gsasl iconv idn intl lber-2.4 ldap-2.4
-WANTLIB += ltdl pam pcre readline sasl2 ssl z
+WANTLIB += c crypto curses gcrypt gpg-error gsasl iconv idn intl
+WANTLIB += lber ldap ltdl pam pcre readline sasl2 ssl z
 
 MASTER_SITES =		${MASTER_SITE_GNU:=dico/}