diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 0cff6cc3aab..af562bf44a2 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.44 2008/03/15 12:50:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2008/05/14 07:38:42 ajacoutot Exp $
 
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 DISTNAME=	cyrus-sasl-2.1.22
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 SHARED_LIBS=	anonymous	2.22 \
 		crammd5		2.22 \
 		digestmd5	2.22 \
 		gssapiv2	2.22 \
+		ldapdb		2.22 \
 		login		2.22 \
 		ntlm		2.22 \
 		otp		2.22 \
@@ -44,6 +45,7 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
 		--enable-login \
 		--enable-static \
 		--enable-ntlm \
+		--enable-auth-sasldb \
 		--disable-sample
 
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config ${WRKSRC}/saslauthd/config
@@ -66,8 +68,10 @@ CONFIGURE_ARGS+=--with-dblib=ndbm \
 .endif
 
 .if ${FLAVOR:L:Mldap}
+WANTLIB+=	ssl
 LIB_DEPENDS+=	ldap.>=2,lber:openldap-client-2.*:databases/openldap
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} \
+		--enable-ldapdb
 .else
 CONFIGURE_ARGS+=--without-ldap
 .endif
diff --git a/security/cyrus-sasl2/patches/patch-saslauthd_configure b/security/cyrus-sasl2/patches/patch-saslauthd_configure
index a05f535a218..40df1e7db06 100644
--- a/security/cyrus-sasl2/patches/patch-saslauthd_configure
+++ b/security/cyrus-sasl2/patches/patch-saslauthd_configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-saslauthd_configure,v 1.12 2007/06/18 12:31:20 ajacoutot Exp $
+$OpenBSD: patch-saslauthd_configure,v 1.13 2008/05/14 07:38:42 ajacoutot Exp $
 --- saslauthd/configure.orig	Thu May 18 21:30:20 2006
-+++ saslauthd/configure	Fri Jun  1 08:49:08 2007
++++ saslauthd/configure	Wed May 14 09:18:39 2008
 @@ -753,10 +753,10 @@ ac_env_CC_set=${CC+set}
  ac_env_CC_value=$CC
  ac_cv_env_CC_set=${CC+set}
@@ -124,6 +124,15 @@ $OpenBSD: patch-saslauthd_configure,v 1.12 2007/06/18 12:31:20 ajacoutot Exp $
  fi
  
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
+@@ -9427,7 +9430,7 @@ fi
+ 
+ 
+ 
+-  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
++  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
+ fi
+ 
+ # Check whether --enable-httpform or --disable-httpform was given.
 @@ -9704,7 +9707,7 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
diff --git a/security/cyrus-sasl2/pkg/PFRAG.ldap b/security/cyrus-sasl2/pkg/PFRAG.ldap
index 40e88660f30..ddc21764ea7 100644
--- a/security/cyrus-sasl2/pkg/PFRAG.ldap
+++ b/security/cyrus-sasl2/pkg/PFRAG.ldap
@@ -1,4 +1,7 @@
-@comment $OpenBSD: PFRAG.ldap,v 1.1 2008/03/15 12:50:46 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.ldap,v 1.2 2008/05/14 07:38:42 ajacoutot Exp $
+%%SHARED%%
+lib/sasl2/libldapdb.a
+lib/sasl2/libldapdb.la
 share/doc/sasl2/LDAP_SASLAUTHD
 share/examples/sasl2/saslauthd.conf
 @mode 640
diff --git a/security/cyrus-sasl2/pkg/PFRAG.shared-ldap b/security/cyrus-sasl2/pkg/PFRAG.shared-ldap
new file mode 100644
index 00000000000..acb6ad5a5e0
--- /dev/null
+++ b/security/cyrus-sasl2/pkg/PFRAG.shared-ldap
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-ldap,v 1.1 2008/05/14 07:38:42 ajacoutot Exp $
+@lib lib/sasl2/libldapdb.so.${LIBldapdb_VERSION}