diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
index 123dfc37ae..f4fc4ae57d 100644
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,31 +1,32 @@
 The OpenLDAP Public License
-  Version 2.2.1, 1 March 2000
+  Version 2.3, 28 July 2000
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
 that the following conditions are met:
 
 1. Redistributions of source code must retain copyright statements
-and notices.  Redistributions must also contain a copy of this
-document.
+and notices.
 
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
+2. Redistributions in binary form must reproduce applicable copyright
+statements and notices, this list of conditions, and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution.
 
-3. The name "OpenLDAP" must not be used to endorse or promote
+3. Redistributions must contain a verbatim copy of this document.
+
+4. The name "OpenLDAP" must not be used to endorse or promote
 products derived from this Software without prior written permission
 of the OpenLDAP Foundation.
 
-4. Products derived from this Software may not be called "OpenLDAP"
+5. Products derived from this Software may not be called "OpenLDAP"
 nor may "OpenLDAP" appear in their names without prior written
 permission of the OpenLDAP Foundation.
 
-5. Due credit should be given to the OpenLDAP Project
+6. Due credit should be given to the OpenLDAP Project
 (http://www.openldap.org/).
 
-6. The OpenLDAP Foundation may revise this license from time to
+7. The OpenLDAP Foundation may revise this license from time to
 time.  Each revision is distinguished by a version number.  You
 may use the Software under terms of this license revision or under
 the terms of any subsequent revision of the license.
diff --git a/doc/guide/plain.sdf b/doc/guide/plain.sdf
index 8488c49c99..462625bd7c 100644
--- a/doc/guide/plain.sdf
+++ b/doc/guide/plain.sdf
@@ -11,8 +11,10 @@
 !macro HTML_HEADER
 !endmacro
 !macro HTML_FOOTER
-{{INLINE:<SMALL>______<BR>}}
-Copyright 1999-2000, The OpenLDAP Foundation. {{EMAIL:info@openldap.org}}
-All Rights Reserved.
-{{INLINE:</SMALL>}}
+{{INLINE:<FONT COLOR="#808080" FACE="Arial,Verdana,Helvetica" SIZE="1">}}
+{{INLINE:<B>______________<BR><SMALL>}}
+[[c]]  Copyright 2000,
+{{INLINE:<A HREF="/foundation/">OpenLDAP Foundation</A>}},
+{{EMAIL: info@OpenLDAP.org}}
+{{INLINE:</SMALL><BR></B></FONT>}}
 !endmacro
diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index f4d4a1800e..419ebcfb40 100644
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -18,8 +18,8 @@
 
 !define DOC_LOGO	"../images/LDAPwww.gif"
 # should create a smaller logo for HTML and TOPIC purposes
-#!define DOC_HTML_LOGO	"../images/LDAPwww.gif"
-#!define DOC_TOPIC_LOGO	"../images/LDAPwww.gif"
+#!define DOC_HTML_LOGO	"../images/LDAPlogo.gif"
+!define DOC_TOPIC_LOGO	"../images/LDAPlogo.gif"
 
 !define DOC_LOF_TITLE	"Figures"
 !define DOC_LOF
diff --git a/doc/guide/release/copyright-plain.sdf b/doc/guide/release/copyright-plain.sdf
index 7479aa92a6..68ebe9dd9e 100644
--- a/doc/guide/release/copyright-plain.sdf
+++ b/doc/guide/release/copyright-plain.sdf
@@ -5,6 +5,6 @@
 #
 # Plain Copyright for Software Distribution
 #
-!define HTML_TITLE "OpenLDAP Copyright"
+!define HTML_TITLE "OpenLDAP Copyright Notices"
 !include "../plain.sdf"
 !include "copyright.sdf"; plain
diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index a8453e5758..78a5ac1583 100644
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -8,9 +8,9 @@
 !define copyright 'Copyright'
 !endif
 
-H1: OpenLDAP Software Copyrights
+H1: OpenLDAP Software Copyright Notices
 
-H2: OpenLDAP Copyright
+H2: OpenLDAP Copyright Notice
 
 [[copyright]] 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
 All rights reserved.
@@ -36,7 +36,7 @@ or by sending e-mail to:
 .{{EMAIL:info@OpenLDAP.org}}
 
 
-H2: University of Michigan Copyright
+H2: University of Michigan Copyright Notice
 
 Portions [[copyright]] 1992-1996 Regents of the University of Michigan.
 All rights reserved.
diff --git a/doc/guide/release/license-plain.sdf b/doc/guide/release/license-plain.sdf
new file mode 100644
index 0000000000..c920e4d74e
--- /dev/null
+++ b/doc/guide/release/license-plain.sdf
@@ -0,0 +1,10 @@
+# $OpenLDAP$
+# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved.
+# COPYING RESTRICTIONS APPLY, see COPYRIGHT.
+
+#
+# Plain Copyright for Software Distribution
+#
+!define HTML_TITLE "OpenLDAP Public License"
+!include "../plain.sdf"
+!include "license.sdf"; plain