diff --git a/servers/slapd/lcup.c b/servers/slapd/lcup.c
index c51e745440..399f7cfb0c 100644
--- a/servers/slapd/lcup.c
+++ b/servers/slapd/lcup.c
@@ -21,7 +21,7 @@ AttributeName uuid_attr[2];
 int
 build_uuid_attr()
 {
-        const char* text;
+	const char* text;
 
 	uuid_attr[0].an_name.bv_len = 9;
 	uuid_attr[0].an_name.bv_val = "entryUUID";
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index fe9d43c306..577d073976 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -440,7 +440,7 @@ static struct slap_schema_ad_map {
 		offsetof(struct slap_internal_schema, si_ad_collectiveExclusions) },
 
 	{ "entryUUID", "( 1.3.6.1.4.1.4203.666.1.6 NAME 'entryUUID' "   
-			"DESC 'LCUP/LDUP: universally unique identifier' "
+			"DESC 'LCUP/LDUP: UUID of the entry' "
 			"EQUALITY octetStringMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
 			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
@@ -448,7 +448,7 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_entryUUID) },
 	{ "entryCSN", "( 1.3.6.1.4.1.4203.666.1.7 NAME 'entryCSN' "
-			"DESC 'LCUP/LDUP: change sequence number' "
+			"DESC 'LCUP/LDUP: change sequence number of the entry' "
 			"EQUALITY octetStringMatch "
 			"ORDERING octetStringOrderingMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
@@ -457,6 +457,15 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_entryCSN) },
 
+	{ "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "   
+			"DESC 'LCUP/LDUP: UUID of the superior entry' "
+			"EQUALITY octetStringMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+		NULL, SLAP_AT_HIDE,
+		NULL, NULL, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_superiorUUID) },
+
 	/* root DSE attributes */
 	{ "altServer", "( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' "
 			"DESC 'RFC2252: alternative servers' "
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index bc923d1257..9fa03c3816 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -678,6 +678,7 @@ struct slap_internal_schema {
 	AttributeDescription *si_ad_collectiveExclusions;
 	AttributeDescription *si_ad_entryUUID;
 	AttributeDescription *si_ad_entryCSN;
+	AttributeDescription *si_ad_superiorUUID;
 
 	/* root DSE attribute descriptions */
 	AttributeDescription *si_ad_altServer;