diff --git a/CHANGES b/CHANGES
index d8b732e1d54afaa70d29edac3cf2260904685c0f..04b6719a9ead7f41054d079fe1c35fc5dfda8fdc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@ OpenLDAP 2.4.13 Engineering
 	Fixed slapd-bdb/hdb invalid db crash (ITS#5698)
 	Added slapd-bdb/hdb dbpagesize keyword
 	Added slapd-bdb/hdb checksum keyword
+	Fixed slapd-bdb/hdb indexing of entryDN (ITS#5790)
 	Fixed slapd-ldap snprintf buffer overflow test (ITS#4467)
 	Fixed slapd-ldif file rename on windows (ITS#5774)
 	Fixed slapd-null read controls support (ITS#5757)
diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index 0ccbc0e8625bb94a99c61e79aacfc4b2177f2c57..2419a343bb02818eee259a5c5fab554be95e23a8 100644
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -215,7 +215,7 @@ bdb_attr_index_config(
 			goto done;
 		}
 
-		if( slap_ad_is_binary( ad ) ) {
+		if( ad == slap_schema.si_ad_entryDN || slap_ad_is_binary( ad ) ) {
 			if (c_reply) {
 				snprintf(c_reply->msg, sizeof(c_reply->msg),
 					"index of attribute \"%s\" disallowed", attrs[i] );