diff --git a/package/mnemoc/openldap/openldap.conf b/package/mnemoc/openldap/openldap.conf
index fac0bc88c..213187870 100644
--- a/package/mnemoc/openldap/openldap.conf
+++ b/package/mnemoc/openldap/openldap.conf
@@ -26,9 +26,8 @@ createdocs=0
 set_confopt
 sysconfdir=${sysconfdir%/openldap}
 
-if [ -f $root/var/adm/flists/tcp_wrappers ]; then
-	var_append extraconfopt ' ' '--enable-wrappers'
-fi
+pkginstalled tcp_wrappers && var_append extraconfopt ' ' '--enable-wrappers'
+
 var_append extraconfopt ' ' "--enable-shared"
 
 if [ "$ROCKCFG_PKG_OPENLDAP_JUSTLIBS" = "1" ]; then
diff --git a/package/mnemoc/openldap/openldap.desc b/package/mnemoc/openldap/openldap.desc
index 58575d44b..d55d5eea5 100644
--- a/package/mnemoc/openldap/openldap.desc
+++ b/package/mnemoc/openldap/openldap.desc
@@ -38,8 +38,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.1.30
+[V] 2.2.17
 [P] X -?---5---9 117.900
 
-[D] 3289071287 openldap-2.1.30.tgz ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+[D] 1281009371 openldap-2.2.17.tgz ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 
diff --git a/package/mnemoc/openldap/openldap.init b/package/mnemoc/openldap/openldap.init
index aa8c07f58..05efb3e4a 100644
--- a/package/mnemoc/openldap/openldap.init
+++ b/package/mnemoc/openldap/openldap.init
@@ -30,7 +30,7 @@ main_begin
 
    block_begin(start, `Starting OpenLDAP.')
        check(`D_prefix/libexec/slapd -h "ldapi:/// ldap:///" &')
-    block_end
+   block_end
 
    block_begin(stop, `Stopping OpenLDAP.')
        check(`killall -15 D_prefix/libexec/slapd')