diff --git a/CHANGES b/CHANGES
index e984923867..1cdc28292a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@ OpenLDAP 2.0.13 Release
 	Fixed ldapdelete -c handling (ITS#1071)
 	Fixed ldapsearch -S handling
 	Fixed ldbm BerkeleyDB 3.0 support (ITS#1306)
-	Fixed ldbm dbhandle cache bug
+	Fixed ldbm dbhandle cache bug (ITS#1164)
 	Fixed shell fgets handling
 	Fixed -lldap TLS ldap.conf handling
 	Added -lldap improved TLS certificate checking
diff --git a/COPYRIGHT b/COPYRIGHT
index 73e3b057b8..eeee7eb9a5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -7,11 +7,14 @@ Public License.  A copy of this license is available at
 http://www.OpenLDAP.org/license.html or in file LICENSE in the
 top-level directory of the distribution.
 
-Individual files and/or contributed packages may contain material
-copyright by other parties and use subject to additional restrictions.
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Individual files and/or contributed packages may be copyright by
+other parties and subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
-software <http://www.umich.edu/~dirsvcs/ldap/>.
+distribution.  Information concerning this software is available
+at: http://www.umich.edu/~dirsvcs/ldap/
 
 This work also contains materials derived from public sources.
 
@@ -32,6 +35,3 @@ to the University of Michigan at Ann Arbor. The name of the University
 may not be used to endorse or promote products derived from this
 software without specific prior written permission. This software
 is provided ``as is'' without express or implied warranty.
-
----
-$OpenLDAP$
diff --git a/LICENSE b/LICENSE
index f987ebdf89..65a3a21abf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,36 +1,31 @@
 The OpenLDAP Public License
-  Version 2.6, 14 June 2001
+  Version 2.7, 7 September 2001
 
 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.
+   and notices,
 
 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.
+   statements and notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution, and
 
 3. Redistributions must contain a verbatim copy of this document.
 
-4. The names and trademarks of the authors and copyright holders
-must not be used in advertising or otherwise to promote the sale,
-use or other dealing in this Software without specific, written
-prior permission.
+The OpenLDAP Foundation may revise this license from time to time.
+Each revision is distinguished by a version number.  You may use
+this Software under terms of this license revision or under the
+terms of any subsequent revision of the license.
 
-5. 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.
-
-THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) OR
-OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
@@ -39,8 +34,14 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-OpenLDAP is a trademark of the OpenLDAP Foundation.
+The names of the authors and copyright holders must not be used in
+advertising or otherwise to promote the sale, use or other dealing
+in this Software without specific, written prior permission.  Title
+to copyright in this Software shall at all times remain with
+copyright holders.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 Copyright 1999-2001 The OpenLDAP Foundation, Redwood City,
 California, USA.  All Rights Reserved.  Permission to copy and
-distributed verbatim copies of this document is granted.
+distribute verbatim copies of this document is granted.