diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 3801c48b6a..3d3d369674 100644
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -706,9 +706,28 @@ objectclass ( 2.16.840.1.113730.3.2.6 NAME 'referral'
 	DESC 'namedref: named subordinate referral'
 	SUP top STRUCTURAL MUST ref )
 
+#
+# LDAP/X.500 subentry schema
+#	draft-zeilenga-ldap-subentry-xx.txt
+#
+attributetype ( 2.5.18.5 NAME 'administrativeRole'
+	EQUALITY objectIdentifierMatch
+	USAGE directoryOperation
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+
+attributetype ( 2.5.18.6 NAME 'subtreeSpecification'
+	SINGLE-VALUE
+	USAGE directoryOperation
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.45 )
+
+objectclass ( 2.5.20.0 NAME 'subentry'
+	SUP top STRUCTURAL
+	MUST ( cn $ subtreeSpecification ) )   
+
+
 #
 # LDAPsubEntry
-#	likely to change!
+#	deprecated!
 objectclass ( 2.16.840.1.113719.2.142.6.1.1
 	NAME 'LDAPsubEntry'
 	DESC 'LDAP Subentry'
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 4b49e541a5..ed6015a74b 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -4113,15 +4113,18 @@ static struct syntax_defs_rec {
 	slap_syntax_transform_func *sd_str2ber;
 #endif
 } syntax_defs[] = {
-	{"( 1.3.6.1.4.1.1466.115.121.1.1 DESC 'ACI Item' " X_BINARY X_NOT_H_R ")",
+	{"( 1.3.6.1.4.1.1466.115.121.1.1 DESC 'ACI Item' "
+		X_BINARY X_NOT_H_R ")",
 		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.2 DESC 'Access Point' " X_NOT_H_R ")",
 		0, NULL, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.3 DESC 'Attribute Type Description' )",
 		0, NULL, NULL, NULL},
-	{"( 1.3.6.1.4.1.1466.115.121.1.4 DESC 'Audio' " X_NOT_H_R ")",
+	{"( 1.3.6.1.4.1.1466.115.121.1.4 DESC 'Audio' "
+		X_NOT_H_R ")",
 		SLAP_SYNTAX_BLOB, blobValidate, NULL, NULL},
-	{"( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' " X_NOT_H_R ")",
+	{"( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' "
+		X_NOT_H_R ")",
 		SLAP_SYNTAX_BER, berValidate, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' )",
 		0, bitStringValidate, bitStringNormalize, NULL },
@@ -4202,6 +4205,9 @@ static struct syntax_defs_rec {
 		0, NULL, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.44 DESC 'Printable String' )",
 		0, printableStringValidate, IA5StringNormalize, NULL},
+	{"( 1.3.6.1.4.1.1466.115.121.1.45 DESC 'SubtreeSpecification' "
+		X_BINARY X_NOT_H_R ")",
+		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.49 DESC 'Supported Algorithm' "
 		X_BINARY X_NOT_H_R ")",
 		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, berValidate, NULL, NULL},