diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index a91ab15c9023106a332f01f04b9ba036dd02f1f3..36bdf37879518e98b0872498ed3bd2af4fb2ac12 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -110,7 +110,7 @@ ldap_back_op_result(struct ldapconn *lc, Operation *op)
 
 	ldap_get_option(lc->ld, LDAP_OPT_ERROR_NUMBER, &err);
 	ldap_get_option(lc->ld, LDAP_OPT_ERROR_STRING, &msg);
-	ldap_get_option(lc->ld, LDAP_OPT_MATCH_STRING, &match);
+	ldap_get_option(lc->ld, LDAP_OPT_MATCHED_DN, &match);
 	send_ldap_result( lc->conn, op, err, match, msg);
 	free(match);
 	free(msg);
diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index fa027d57da5ea63fc53bcc9028e207f502ed67bf..e89cec69ae2bb753b5c924fb40f811f1a5e59c47 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -103,7 +103,7 @@ fail:		return( ldap_back_op_result(lc, op) );
 		} else {
 			sres = ldap_result2error(lc->ld, res, 1);
 			ldap_get_option(lc->ld, LDAP_OPT_ERROR_STRING, &err);
-			ldap_get_option(lc->ld, LDAP_OPT_MATCH_STRING, &match);
+			ldap_get_option(lc->ld, LDAP_OPT_MATCHED_DN, &match);
 			rc = 0;
 		}
 		ldap_msgfree(res);