diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 5726d362037..821022c8e49 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2016/03/11 19:59:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.38 2016/04/05 20:03:26 naddy Exp $
 
 COMMENT=		GNU dbm
 
 VERSION=		1.11
-REVISION=		0
+REVISION=		1
 DISTNAME=		gdbm-${VERSION}
 CATEGORIES=		databases
 
@@ -16,9 +16,9 @@ MASTER_SITES=		${MASTER_SITE_GNU:=gdbm/}
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-MODULES=		devel/gettext
+LIB_DEPENDS=		devel/gettext
 
-WANTLIB +=		c
+WANTLIB +=		c iconv intl
 
 USE_GROFF =		Yes
 
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index fa1a4251532..9e96eed5e4f 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.97 2016/03/09 19:11:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.98 2016/04/05 20:03:26 naddy Exp $
 
 BROKEN-sparc=	Segmentation fault on any non-trivial script
 
@@ -6,6 +6,7 @@ COMMENT=	GNU Bourne Again Shell
 
 DISTNAME=	bash-4.3.30
 PKGNAME=	bash-4.3.42
+REVISION=	0
 CATEGORIES=	shells
 HOMEPAGE=	http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
 
@@ -21,8 +22,8 @@ DIST_SUBDIR=	bash
 PATCHFILES+=	bash43-0$i:0
 .endfor
 
-MODULES=	devel/gettext
-WANTLIB=	c termcap 
+LIB_DEPENDS=	devel/gettext
+WANTLIB=	c iconv intl termcap 
 
 CONFIGURE_STYLE=gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/support