diff --git a/package/base/openldap/openldap.conf b/package/base/openldap/openldap.conf
index 82fb08800..f18332ca5 100644
--- a/package/base/openldap/openldap.conf
+++ b/package/base/openldap/openldap.conf
@@ -29,6 +29,16 @@ pkginstalled tcp_wrappers && var_append extraconfopt ' ' '--enable-wrappers'
 # without debugging, NO log messages will be generated. none. at all. jikes.
 var_append extraconfopt ' ' "--enable-shared --enable-debug"
 
+if [ $stagelevel -le 2 ] ; then
+	var_append extraconfopt ' ' '--with-yielding-select=yes'
+
+	# The variable STRIP in these Makefiles means whether to strip binaries
+	# during installation. Disable this because openldap tries to use the build
+	# system strip and fails.
+	var_remove_regex makeinstopt ' ' 'STRIP=.*'
+	var_append makeinstopt ' ' 'STRIP='
+fi
+
 if [ "$ROCKCFG_PKG_OPENLDAP_JUSTLIBS" = "1" ]; then
 	var_append extraconfopt ' ' "--without-cyrus-sasl --disable-slapd \
 	                             --disable-slurpd"
@@ -36,7 +46,7 @@ fi
 
 openldap_pm() {
 	mkdir -p $localstatedir
-	chown -R openldap:openldap $localstatedir
+	chown -R $(uid_by_name openldap):$(gid_by_name openldap) $localstatedir
 
 	install_init openldap $confdir/openldap.init
 }
diff --git a/package/base/openldap/openldap.desc b/package/base/openldap/openldap.desc
index 0e8544d85..0c1af39d8 100644
--- a/package/base/openldap/openldap.desc
+++ b/package/base/openldap/openldap.desc
@@ -39,8 +39,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.3.35
-[P] X --?--5---9 146.000
+[V] 2.3.43
+[P] X --X--5---9 146.000
 
-[D] 4195392952 openldap-2.3.35.tgz ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+[D] 2347768329 openldap-2.3.43.tgz ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/