diff --git a/CHANGES b/CHANGES
index ee604453a976b6e80e96f137555f403f943b19b2..127433263189e1f8fa4fc13de43083f12d35b0aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ OpenLDAP 2.4.25 Engineering
 	Documentation
 		admin24 guide ldapi usage (ITS#6839)
 		admin24 guide conversion notes (ITS#6834)
+		admin24 guide note manpages are definitive (ITS#6855)
 
 OpenLDAP 2.4.24 Release (2011/02/10)
 	Added LDIF line wrapping setting (ITS#6645)
diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf
index f28915ebe4d828854824875ed70cadf23e338eed..7335a6ee359fc8e177aeedf6a74ae25ae25816c4 100644
--- a/doc/guide/admin/preface.sdf
+++ b/doc/guide/admin/preface.sdf
@@ -48,6 +48,13 @@ Software Pages|http://www.OpenLDAP.org/software/
 Support Pages|http://www.OpenLDAP.org/support/
 !endblock
  
+This document is not a complete reference for OpenLDAP software; the
+manual pages are the definitive documentation. For best results,
+you should use the manual pages that were installed on your system
+with your version of OpenLDAP software so that you're looking at
+documentation that matches the code. While the OpenLDAP web site
+also provides the manual pages for convenience, you can not assume
+that they corresond to the particular version you're running.
 
 P2[notoc] Acknowledgments