diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index d666d3e87a..4dd6d8ccde 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -144,7 +144,7 @@ ldap_back_search(
 	dc.ctx = "searchBase";
 #else
 	dc.tofrom = 1;
-	dc.normalized = 1;
+	dc.normalized = 0;
 #endif
 	if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mbase ) ) {
 		send_ldap_result( op, rs );
diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index fb66fee3cc..2cee684451 100644
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -135,7 +135,7 @@ ldap_back_dn_massage(
 			/* At a DN Separator */
 		}
 
-		if ( !strcmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
+		if ( !strcasecmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
 			res->bv_len = diff + dc->rwmap->rwm_suffix_massage[i+dst].bv_len;
 			res->bv_val = ch_malloc( res->bv_len + 1 );
 			strncpy( res->bv_val, dn->bv_val, diff );