diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile
index 1cf5cdaa9846..0be234720aa1 100644
--- a/databases/openldap-client/Makefile
+++ b/databases/openldap-client/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2017/06/02 08:29:56 adam Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/02 10:59:13 jperkin Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
+PKGREVISION=	1
 COMMENT=	Lightweight Directory Access Protocol libraries and client programs
 
 CONFLICTS+=		openldap<2.3.23nb1
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 2248ba0c3064..98489208798e 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2018/12/20 17:54:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.43 2019/05/02 10:59:13 jperkin Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -100,6 +100,11 @@ PTH_FDSETSIZE_cmd=							\
 CPPFLAGS+=	-DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
 .endif
 
+# OpenLDAP hardcodes this to 4096, disregarding the OS default.
+.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
+CPPFLAGS+=	-DOPENLDAP_FD_SETSIZE=65536
+.endif
+
 MAKE_FLAGS+=		moduledir=${OPENLDAP_MODULEDIR}
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}