diff --git a/network/openldap/openldap.conf b/network/openldap/openldap.conf
index 895e898b9..2678d0c15 100644
--- a/network/openldap/openldap.conf
+++ b/network/openldap/openldap.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../openldap/openldap.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2008 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -27,6 +27,7 @@ fi
 
 pkginstalled tcp_wrappers && var_append extraconfopt ' ' '--enable-wrappers'
 
+
 var_append extraconfopt ' ' "--enable-shared"
 var_append extraconfopt ' ' "--libexec=$sbindir"
 
@@ -36,6 +37,10 @@ var_append extraconfopt ' ' "--enable-meta --enable-ldap"
 if [ "$SDECFG_PKG_OPENLDAP_CLIENTONLY" = "1" ]; then
 	var_append extraconfopt ' ' "--without-cyrus-sasl --disable-slapd \
 	                             --disable-slurpd"
+else
+	if pkginstalled cyrus-sasl2; then
+		var_append extraconfopt ' ' '--enable-spasswd'
+	fi
 fi
 
 hook_add premake  3 'eval $MAKE depend'