--- COPYRIGHT	1998/12/28 18:24:35	1.7
+++ COPYRIGHT	2001/09/08 02:34:11	1.7.8.8
@@ -1,14 +1,20 @@
-Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+Copyright 1998-2001 The OpenLDAP Foundation
 All rights reserved.
 
-Redistribution and use in source and binary forms are permitted only
-as authorized by the OpenLDAP 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.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted only as authorized by the OpenLDAP
+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.
+
+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
-distribution.  Information concerning is available at
-    http://www.umich.edu/~dirsvcs/ldap/ldap.html.
+distribution.  Information concerning this software is available
+at: http://www.umich.edu/~dirsvcs/ldap/
 
 This work also contains materials derived from public sources.