diff --git a/CHANGES b/CHANGES
index d462bbca51cc3675dc32ff40911947c013831a1a..7ed7308b70ad0dff6da23c9d52f6f51767906c43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,7 @@ OpenLDAP 2.4.12 Engineering
 	Documentation
 		Added slapd-ldap(5), slapd-meta(5) noundeffilter (ITS#5614)
 		Added slapo-retcode(5) retcode.conf location (ITS#5633)
+		Fixed slapd-ldap(5), slapd-meta(5) schema requirements (ITS#5680)
 		admin24 guide updates (ITS#5616)
 		admin24 octetString fix (ITS#5670)
 
diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index ddadfb493514aa0d279c5c1d9d7c91d1ba9edab6..061428dee890221b40383b1d95b75222d740d142 100644
--- a/doc/man/man5/slapd-ldap.5
+++ b/doc/man/man5/slapd-ldap.5
@@ -37,6 +37,15 @@ rules; see
 .BR slapd.conf (5)
 for details.
 
+The proxy instance of
+.BR slapd (8)
+must contain schema information for the attributes and objectClasses
+used in filters, request DN and request-related data in general.
+It should also contain schema information for the data returned
+by the proxied server.
+It is the responsibility of the proxy administrator to keep the schema
+of the proxy lined up with that of the proxied server.
+
 .LP
 Note: When looping back to the same instance of
 .BR slapd (8), 
diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5
index e44dcd6bff8cafac65745461e1ede7af10427cbc..3f4684fbd38bc916b075508f9c8412ba399784e6 100644
--- a/doc/man/man5/slapd-meta.5
+++ b/doc/man/man5/slapd-meta.5
@@ -38,6 +38,15 @@ excessive overhead for some applications, so its use should be
 carefully considered.
 In the examples section, some typical scenarios will be discussed.
 
+The proxy instance of
+.BR slapd (8)
+must contain schema information for the attributes and objectClasses
+used in filters, request DN and request-related data in general.
+It should also contain schema information for the data returned
+by the proxied server.
+It is the responsibility of the proxy administrator to keep the schema
+of the proxy lined up with that of the proxied server.
+
 .LP
 Note: When looping back to the same instance of \fBslapd\fP(8), 
 each connection requires a new thread; as a consequence, \fBslapd\fP(8)