diff --git a/COPYRIGHT b/COPYRIGHT
index 22c4a1fa245ffad49fcfb77f9657176fcf760c52..eaf055c5333033daa77a8cb710597daaf21e1819 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -39,8 +39,8 @@ Public License.
 Portions Copyright 1999-2008 Howard Y.H. Chu.
 Portions Copyright 1999-2008 Symas Corporation.
 Portions Copyright 1998-2003 Hallvard B. Furuseth.
-Portions Copyright 2008-2009 Gavin Henry.
-Portions Copyright 2008-2009 Suretec Systems Ltd.
+Portions Copyright 2007-2011 Gavin Henry.
+Portions Copyright 2007-2011 Suretec Systems Ltd.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/contrib/ldapc++/COPYRIGHT b/contrib/ldapc++/COPYRIGHT
index a6af5d8e7f9641656efcf8a93f9000db8810ba70..48e91eb193725d5531529490d3df7be44ac79fbf 100644
--- a/contrib/ldapc++/COPYRIGHT
+++ b/contrib/ldapc++/COPYRIGHT
@@ -1,37 +1,6 @@
-Copyright 1998-2011 The OpenLDAP Foundation
-All rights reserved.
+Copyright 1998-2011 The OpenLDAP Foundation.  All rights reserved.
 
-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.
+COPYING RESTRICTIONS APPLY.
 
-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 this software is available
-at: http://www.umich.edu/~dirsvcs/ldap/
-
-This work also contains materials derived from public sources.
-
-Additional Information about OpenLDAP can be obtained at:
-    http://www.openldap.org/
-
-or by sending e-mail to:
-    info@OpenLDAP.org
-
----
-
-Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that this notice is preserved and that due credit is given
-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.
+See COPYRIGHT and LICENSE files in the top-level directory of this
+distribution (i.e., ../../COPYRIGHT and ../../LICENSE, respectively).
diff --git a/contrib/ldapc++/LICENSE b/contrib/ldapc++/LICENSE
deleted file mode 100644
index 641253ade2bfb731cf2f0968cfff042a08003763..0000000000000000000000000000000000000000
--- a/contrib/ldapc++/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-The OpenLDAP Public License
-  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,
-
-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, and
-
-3. Redistributions must contain a verbatim copy of this document.
-
-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.
-
-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
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-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.
-
-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-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
-distribute verbatim copies of this document is granted.
diff --git a/contrib/ldapc++/Makefile.am b/contrib/ldapc++/Makefile.am
index 722e1fbc8e68884abb013808e275e6346e3949c0..cf4694b52d4b396982eb6615b00b5138a3a0226d 100644
--- a/contrib/ldapc++/Makefile.am
+++ b/contrib/ldapc++/Makefile.am
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 
 ##
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 
diff --git a/contrib/ldapc++/Makefile.in b/contrib/ldapc++/Makefile.in
index 2ca7d510c740c373c1eac46e2902fe50fc6672f0..3760cd9f63f8f2c2151867c28131afc386d17905 100644
--- a/contrib/ldapc++/Makefile.in
+++ b/contrib/ldapc++/Makefile.in
@@ -16,7 +16,7 @@
 
 # $OpenLDAP$
 
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/contrib/ldapc++/configure.in b/contrib/ldapc++/configure.in
index eac8aeeaf1f24f3a37d3b065e25f575e55bf8ea4..1725c1ccd6cda19fe04c0d97ceb18ea97cb5eb97 100644
--- a/contrib/ldapc++/configure.in
+++ b/contrib/ldapc++/configure.in
@@ -1,6 +1,6 @@
 dnl $OpenLDAP$
 
-dnl Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+dnl Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved.
 dnl COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 
 dnl Process this file with autoconf to produce a configure script.
diff --git a/contrib/ldapc++/examples/Makefile.am b/contrib/ldapc++/examples/Makefile.am
index 5b6d1a38898fdbcfc3b08724870b916549f0d9bc..5923858c1fcb99d8bb8e343caddffde6edd20aba 100644
--- a/contrib/ldapc++/examples/Makefile.am
+++ b/contrib/ldapc++/examples/Makefile.am
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 
 ##
-# Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 AM_CPPFLAGS = -I$(top_srcdir)/src
diff --git a/contrib/ldapc++/examples/Makefile.in b/contrib/ldapc++/examples/Makefile.in
index fe7e9793c0c72948ea74e69fda2a4049a597bd3b..6044d900bfc256d7469df5ff8754624c5c35408b 100644
--- a/contrib/ldapc++/examples/Makefile.in
+++ b/contrib/ldapc++/examples/Makefile.in
@@ -198,7 +198,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
-# Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 AM_CPPFLAGS = -I$(top_srcdir)/src
 main_SOURCES = main.cpp
diff --git a/contrib/ldapc++/examples/main.cpp b/contrib/ldapc++/examples/main.cpp
index 7290a6ee933cf91846814383730d7ff2b5ba6e8a..6ab917df3266f4f48c1ada0a9223688513f74e53 100644
--- a/contrib/ldapc++/examples/main.cpp
+++ b/contrib/ldapc++/examples/main.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/examples/readSchema.cpp b/contrib/ldapc++/examples/readSchema.cpp
index b6645c7c46ba9b73c4f174cb10ae38c00deabd44..15b68bd55b28732122c0e7dfa17a422d6b748f56 100644
--- a/contrib/ldapc++/examples/readSchema.cpp
+++ b/contrib/ldapc++/examples/readSchema.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/examples/startTls.cpp b/contrib/ldapc++/examples/startTls.cpp
index 3d9a471b12b24745bbe2e3ff4e4bf0785f5afa18..a1a69e647c6ab23577fb91ea4a1a13daa7b7fbe0 100644
--- a/contrib/ldapc++/examples/startTls.cpp
+++ b/contrib/ldapc++/examples/startTls.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2010, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/examples/urlTest.cpp b/contrib/ldapc++/examples/urlTest.cpp
index e5f3af18e318ede3cddd721b46fc2213a9038c5f..09dae429bcf4f3beb4edb1631ecc26a90b090aa7 100644
--- a/contrib/ldapc++/examples/urlTest.cpp
+++ b/contrib/ldapc++/examples/urlTest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAddRequest.cpp b/contrib/ldapc++/src/LDAPAddRequest.cpp
index 45606e35cfc37a6917a1efcd1a80279f4480b138..067b48ecb7433a0ff9e6a6c8e24896af4801d127 100644
--- a/contrib/ldapc++/src/LDAPAddRequest.cpp
+++ b/contrib/ldapc++/src/LDAPAddRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAddRequest.h b/contrib/ldapc++/src/LDAPAddRequest.h
index 0231ea9cdf05b32af51cadd356251dee109069af..4cac9416cd42fef3e5c061b814a03850fc467a51 100644
--- a/contrib/ldapc++/src/LDAPAddRequest.h
+++ b/contrib/ldapc++/src/LDAPAddRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAsynConnection.cpp b/contrib/ldapc++/src/LDAPAsynConnection.cpp
index 21242364e144a672bf16f4bdcf53bcd0691085a4..15bd01ead2be8643b90707b95e660854a71616b9 100644
--- a/contrib/ldapc++/src/LDAPAsynConnection.cpp
+++ b/contrib/ldapc++/src/LDAPAsynConnection.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2006, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAsynConnection.h b/contrib/ldapc++/src/LDAPAsynConnection.h
index 48e16e0e235e068be861a7069f39168b6898fb49..12cf9d803fd1da44f5af78d3ad02f7ff76ed88fc 100644
--- a/contrib/ldapc++/src/LDAPAsynConnection.h
+++ b/contrib/ldapc++/src/LDAPAsynConnection.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttrType.cpp b/contrib/ldapc++/src/LDAPAttrType.cpp
index d7650002a4bd2eb5abeba07d24187fe50b91f32b..7f102c3179a2c9da587eb26815e37557fa73a278 100644
--- a/contrib/ldapc++/src/LDAPAttrType.cpp
+++ b/contrib/ldapc++/src/LDAPAttrType.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttrType.h b/contrib/ldapc++/src/LDAPAttrType.h
index 8af09f9d15ba9258519094242f6223f73024a7b7..32f67f16efed719d3658bf76963dd4614dc79dbd 100644
--- a/contrib/ldapc++/src/LDAPAttrType.h
+++ b/contrib/ldapc++/src/LDAPAttrType.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttribute.cpp b/contrib/ldapc++/src/LDAPAttribute.cpp
index 39afcf3dfa949edf3821d4f4f1d00b5d06dd9961..372a36913934cf816d80b6172086031db7c635f2 100644
--- a/contrib/ldapc++/src/LDAPAttribute.cpp
+++ b/contrib/ldapc++/src/LDAPAttribute.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttribute.h b/contrib/ldapc++/src/LDAPAttribute.h
index 834f2ee5459f1fc9858c2ce1ebfcec93ae845c0c..6da14451ff632a85fa77b8edaf288c273ed3e83f 100644
--- a/contrib/ldapc++/src/LDAPAttribute.h
+++ b/contrib/ldapc++/src/LDAPAttribute.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2002, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttributeList.cpp b/contrib/ldapc++/src/LDAPAttributeList.cpp
index de17579a5584c912301d8079555f2b83c0949bc0..daa5b150ffd40322f0c73d003d0c80443fa1c66f 100644
--- a/contrib/ldapc++/src/LDAPAttributeList.cpp
+++ b/contrib/ldapc++/src/LDAPAttributeList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttributeList.h b/contrib/ldapc++/src/LDAPAttributeList.h
index 1e6ba6d51e51640acc9e342a5decd0c8fb96f8a2..78a7462ef92ef2fbb87ca5635ba87b99a31cc7a3 100644
--- a/contrib/ldapc++/src/LDAPAttributeList.h
+++ b/contrib/ldapc++/src/LDAPAttributeList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2002, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPBindRequest.cpp b/contrib/ldapc++/src/LDAPBindRequest.cpp
index 549ff7d458868a1fadad00fb46c78f3272d480f0..a2b0f9d6017686d86552768f5ac9d9b633061793 100644
--- a/contrib/ldapc++/src/LDAPBindRequest.cpp
+++ b/contrib/ldapc++/src/LDAPBindRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPBindRequest.h b/contrib/ldapc++/src/LDAPBindRequest.h
index fd3af97bcbbf8949dbdcf1282bffd95bf3bde154..338c1d6c158e3df063dc726239d028bd6516753a 100644
--- a/contrib/ldapc++/src/LDAPBindRequest.h
+++ b/contrib/ldapc++/src/LDAPBindRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPCompareRequest.cpp b/contrib/ldapc++/src/LDAPCompareRequest.cpp
index ca35b112ef87651ad68707a05be770d4250ba72c..d115baaec89c6e61b60b6a0205a59c197e644327 100644
--- a/contrib/ldapc++/src/LDAPCompareRequest.cpp
+++ b/contrib/ldapc++/src/LDAPCompareRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPCompareRequest.h b/contrib/ldapc++/src/LDAPCompareRequest.h
index 361eab16afd7923eb117f835b4f01d52a28689dd..62ba122d78a13c92975c09483506cb35f745cb1a 100644
--- a/contrib/ldapc++/src/LDAPCompareRequest.h
+++ b/contrib/ldapc++/src/LDAPCompareRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConnection.cpp b/contrib/ldapc++/src/LDAPConnection.cpp
index d226f46fc9351b2f0fa0e6cc6ad9d6a7160eccc6..b0ba527a25a4354d7128e26e48be9c76721ce96e 100644
--- a/contrib/ldapc++/src/LDAPConnection.cpp
+++ b/contrib/ldapc++/src/LDAPConnection.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConnection.h b/contrib/ldapc++/src/LDAPConnection.h
index c83313fd340ac3c3dad4bcedb25da0211cc28fb2..4d7e15daf849e27f9b9ebd0bba69f6e003416016 100644
--- a/contrib/ldapc++/src/LDAPConnection.h
+++ b/contrib/ldapc++/src/LDAPConnection.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConstraints.cpp b/contrib/ldapc++/src/LDAPConstraints.cpp
index c265761ecbb543a3dcfc73edda32cde52c5933e0..2f9175e5a71fc0d4ae9eb7aabe9b1c51ffe5adf6 100644
--- a/contrib/ldapc++/src/LDAPConstraints.cpp
+++ b/contrib/ldapc++/src/LDAPConstraints.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConstraints.h b/contrib/ldapc++/src/LDAPConstraints.h
index dfc90ec83497cf20aea4ad16e62949518f2eec10..e1db4198b62a57872f3d2e00f48adf0df6c84c99 100644
--- a/contrib/ldapc++/src/LDAPConstraints.h
+++ b/contrib/ldapc++/src/LDAPConstraints.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControl.cpp b/contrib/ldapc++/src/LDAPControl.cpp
index b995a35f6918572459dc4e4f69f46bacef349ac3..409e30413c94ba9d2a1c0e7ba421f5de16cd5c5e 100644
--- a/contrib/ldapc++/src/LDAPControl.cpp
+++ b/contrib/ldapc++/src/LDAPControl.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControl.h b/contrib/ldapc++/src/LDAPControl.h
index 002591429f09cc4c3f7654d4e1fe08b2f128f592..25d242d7c89e0d3b40a4153b9c303f196e7a0a3d 100644
--- a/contrib/ldapc++/src/LDAPControl.h
+++ b/contrib/ldapc++/src/LDAPControl.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControlSet.cpp b/contrib/ldapc++/src/LDAPControlSet.cpp
index 806edd63b7261c1b5f7b69927a51773785e7c6a6..e1db135680f5aaf5829ded731d089e853dcb0899 100644
--- a/contrib/ldapc++/src/LDAPControlSet.cpp
+++ b/contrib/ldapc++/src/LDAPControlSet.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControlSet.h b/contrib/ldapc++/src/LDAPControlSet.h
index 43b7f0083434534a3e9e053a53d86d76554a70d4..f782035e6950785993d57745806c2cbd14b4d2a7 100644
--- a/contrib/ldapc++/src/LDAPControlSet.h
+++ b/contrib/ldapc++/src/LDAPControlSet.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPDeleteRequest.cpp b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
index 6a7ced5b7c6dc2ca69f13d5878730764dc4fa43e..4ccb39944a4d35f9254b0af9e4ff9beb04972448 100644
--- a/contrib/ldapc++/src/LDAPDeleteRequest.cpp
+++ b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPDeleteRequest.h b/contrib/ldapc++/src/LDAPDeleteRequest.h
index 1ab442b09235539b8ea7000d442a77c75bfd4972..6ab5fae6545bbbfc6093ab0bd0c3970990e2aa8b 100644
--- a/contrib/ldapc++/src/LDAPDeleteRequest.h
+++ b/contrib/ldapc++/src/LDAPDeleteRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntry.cpp b/contrib/ldapc++/src/LDAPEntry.cpp
index bdf7fa8f2e1715053909fd1660a23b6c583be0f8..1d97a4d06554747c804c8c6624fcc9b0acdfcc1e 100644
--- a/contrib/ldapc++/src/LDAPEntry.cpp
+++ b/contrib/ldapc++/src/LDAPEntry.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntry.h b/contrib/ldapc++/src/LDAPEntry.h
index 9f2aaf02572736ebcc211ea34f9fc5f0d0c1792d..c61022f28a20b9714983ed95c4af4fbf2c2379a1 100644
--- a/contrib/ldapc++/src/LDAPEntry.h
+++ b/contrib/ldapc++/src/LDAPEntry.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntryList.cpp b/contrib/ldapc++/src/LDAPEntryList.cpp
index 987ff9016cec6a1be0580bb0e2ab39b924c6b75b..7d21976b8a487806068020fc508c4a3c33d0836c 100644
--- a/contrib/ldapc++/src/LDAPEntryList.cpp
+++ b/contrib/ldapc++/src/LDAPEntryList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntryList.h b/contrib/ldapc++/src/LDAPEntryList.h
index ceddb44f203324fc72268a1c779f3057191ae04d..1eae1058d2d5ea20410011443730148518ecf788 100644
--- a/contrib/ldapc++/src/LDAPEntryList.h
+++ b/contrib/ldapc++/src/LDAPEntryList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPException.cpp b/contrib/ldapc++/src/LDAPException.cpp
index 9c7815f8454ef4e91bb66453ab8bc48ecf1335a1..6c310900f2c24ea45a9d04c785f8066eac1fb71e 100644
--- a/contrib/ldapc++/src/LDAPException.cpp
+++ b/contrib/ldapc++/src/LDAPException.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPException.h b/contrib/ldapc++/src/LDAPException.h
index ed612ad70256210b9dfadc89e43f55f386431287..20044eaa1577ddb341cb8a83ce7b781e12c2aa8e 100644
--- a/contrib/ldapc++/src/LDAPException.h
+++ b/contrib/ldapc++/src/LDAPException.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtRequest.cpp b/contrib/ldapc++/src/LDAPExtRequest.cpp
index c4896a8ac887c8f4076005207e1f2d025664dd05..ddf7d88ef7d72d464fc1245e93a318aab07850f8 100644
--- a/contrib/ldapc++/src/LDAPExtRequest.cpp
+++ b/contrib/ldapc++/src/LDAPExtRequest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtRequest.h b/contrib/ldapc++/src/LDAPExtRequest.h
index 2448079d8c61e6f45d326cb8d994e34ea5c9a047..2b18fa8a19d4fc247d69d8d0055aafc0dd949d2c 100644
--- a/contrib/ldapc++/src/LDAPExtRequest.h
+++ b/contrib/ldapc++/src/LDAPExtRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtResult.cpp b/contrib/ldapc++/src/LDAPExtResult.cpp
index 6a0ec71adcdf68b1fd677c249a9ad52a02f3f610..3d014eb71eb1d70a05f9e2901e530ca21e11714b 100644
--- a/contrib/ldapc++/src/LDAPExtResult.cpp
+++ b/contrib/ldapc++/src/LDAPExtResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtResult.h b/contrib/ldapc++/src/LDAPExtResult.h
index af56d15f204b632c5fb293f86ef397ff08d458b0..4b03c2bb84b775dc14868dd6bb0fb69e1c35b9b5 100644
--- a/contrib/ldapc++/src/LDAPExtResult.h
+++ b/contrib/ldapc++/src/LDAPExtResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessage.cpp b/contrib/ldapc++/src/LDAPMessage.cpp
index b0608fc158de3993174479fdb7f5e09aae0487dd..881f8a11535a75d77607afaa759889d613d6fea7 100644
--- a/contrib/ldapc++/src/LDAPMessage.cpp
+++ b/contrib/ldapc++/src/LDAPMessage.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessage.h b/contrib/ldapc++/src/LDAPMessage.h
index 8ddcf4055158efe2b3903cbb9909e31a5e9eec7c..55dae1f6387aa0a498a497a6e8c283945aeeff56 100644
--- a/contrib/ldapc++/src/LDAPMessage.h
+++ b/contrib/ldapc++/src/LDAPMessage.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessageQueue.cpp b/contrib/ldapc++/src/LDAPMessageQueue.cpp
index ac52eaf15e4bf3f7c6ad3553ebc76d5a99cbf69b..efc34a44b35e5f2f9708128906cd7f67229d0467 100644
--- a/contrib/ldapc++/src/LDAPMessageQueue.cpp
+++ b/contrib/ldapc++/src/LDAPMessageQueue.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessageQueue.h b/contrib/ldapc++/src/LDAPMessageQueue.h
index d05e84dc43b5750fbb6180ceca66475012a07459..9936c452b1137e2a49849105e52882c09b137c84 100644
--- a/contrib/ldapc++/src/LDAPMessageQueue.h
+++ b/contrib/ldapc++/src/LDAPMessageQueue.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModDNRequest.cpp b/contrib/ldapc++/src/LDAPModDNRequest.cpp
index 5312c860bb0fd5920386d2d16f70e465279ca4ff..7c0ee78b29918ab38966f91e5690a82604b3a137 100644
--- a/contrib/ldapc++/src/LDAPModDNRequest.cpp
+++ b/contrib/ldapc++/src/LDAPModDNRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModDNRequest.h b/contrib/ldapc++/src/LDAPModDNRequest.h
index 87254c5eed61e164c5d07d86d1355dbd3253a019..5ad8f03f09069ecc1f2990c4b01cd434ab34498f 100644
--- a/contrib/ldapc++/src/LDAPModDNRequest.h
+++ b/contrib/ldapc++/src/LDAPModDNRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModList.cpp b/contrib/ldapc++/src/LDAPModList.cpp
index 5f3c89d4ba280e424df073215edae41efe2dfc1f..ca729d61394e8c804865f6d8acb2dcf92cb65436 100644
--- a/contrib/ldapc++/src/LDAPModList.cpp
+++ b/contrib/ldapc++/src/LDAPModList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModList.h b/contrib/ldapc++/src/LDAPModList.h
index 2da4d9991126134c8fcea508e3d36541cb893c8c..01c996386ca4ba886d9b976b316ea9ff66375374 100644
--- a/contrib/ldapc++/src/LDAPModList.h
+++ b/contrib/ldapc++/src/LDAPModList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModification.cpp b/contrib/ldapc++/src/LDAPModification.cpp
index 86b13672f0cb66a41385c6af56696a959b83da17..7445e12b2e97f3e943c5a4f8e6e9c0d9fdb00c81 100644
--- a/contrib/ldapc++/src/LDAPModification.cpp
+++ b/contrib/ldapc++/src/LDAPModification.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModification.h b/contrib/ldapc++/src/LDAPModification.h
index 662a08ddb286a23ca82b6193f7c1140ddf0cdf20..94cacb2a113e3bbae50cea6d2c8f5672625e7341 100644
--- a/contrib/ldapc++/src/LDAPModification.h
+++ b/contrib/ldapc++/src/LDAPModification.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModifyRequest.cpp b/contrib/ldapc++/src/LDAPModifyRequest.cpp
index 2c6e71218097a213d7e79659e34ecc684ea5fa82..538bd5d62c1bfc811f9ea2b79e7ea33146c1dff0 100644
--- a/contrib/ldapc++/src/LDAPModifyRequest.cpp
+++ b/contrib/ldapc++/src/LDAPModifyRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModifyRequest.h b/contrib/ldapc++/src/LDAPModifyRequest.h
index 6060a91ad08a4cc68417d48cadd74ede9d17ce52..2da8d7c789d898c5a65385af900d9a1712d9f908 100644
--- a/contrib/ldapc++/src/LDAPModifyRequest.h
+++ b/contrib/ldapc++/src/LDAPModifyRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPObjClass.cpp b/contrib/ldapc++/src/LDAPObjClass.cpp
index 978e7ec4c4246a66614d9fd8d327011078ca9e46..77f505c2d61c9951f205678c7dbf21bb562d54a8 100644
--- a/contrib/ldapc++/src/LDAPObjClass.cpp
+++ b/contrib/ldapc++/src/LDAPObjClass.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPObjClass.h b/contrib/ldapc++/src/LDAPObjClass.h
index b4221eb788c3e28d27072f9b30562c8949c318c7..624c37f275aa12db5b48b9937141839986373b7c 100644
--- a/contrib/ldapc++/src/LDAPObjClass.h
+++ b/contrib/ldapc++/src/LDAPObjClass.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebind.cpp b/contrib/ldapc++/src/LDAPRebind.cpp
index c42deb817e7114082fea78f520bd07ff3bc09a1f..89f46aade435e4869e6de34bc0d2839a36b36825 100644
--- a/contrib/ldapc++/src/LDAPRebind.cpp
+++ b/contrib/ldapc++/src/LDAPRebind.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebind.h b/contrib/ldapc++/src/LDAPRebind.h
index a2d9747918551247f0c0228c8c854681599ff169..f530baa19c9b935a1ff3349526b95fa666be9f5d 100644
--- a/contrib/ldapc++/src/LDAPRebind.h
+++ b/contrib/ldapc++/src/LDAPRebind.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebindAuth.cpp b/contrib/ldapc++/src/LDAPRebindAuth.cpp
index a77d8839a8c5a4f3385c56a019d35959e14a591c..de09b632487fa199e8f71e5b8d0607768f7e4ce8 100644
--- a/contrib/ldapc++/src/LDAPRebindAuth.cpp
+++ b/contrib/ldapc++/src/LDAPRebindAuth.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebindAuth.h b/contrib/ldapc++/src/LDAPRebindAuth.h
index b5afbd121f9ebb44dcc6393dc0677fd68b84ee2d..5491beba98a69c6713976c28ce3969f48945b8e8 100644
--- a/contrib/ldapc++/src/LDAPRebindAuth.h
+++ b/contrib/ldapc++/src/LDAPRebindAuth.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPReferenceList.cpp b/contrib/ldapc++/src/LDAPReferenceList.cpp
index 43032e8ad9482e6f6ce60654cd2d3f801ecfa279..1d4d7249008fa0035f71091cc3b8f3f7f562523f 100644
--- a/contrib/ldapc++/src/LDAPReferenceList.cpp
+++ b/contrib/ldapc++/src/LDAPReferenceList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPReferenceList.h b/contrib/ldapc++/src/LDAPReferenceList.h
index f3c03c18ccd679a348fba5bb03d2bc1f7bcdb187..34af7473cd0b74522277f0d409ff5c178bcd75da 100644
--- a/contrib/ldapc++/src/LDAPReferenceList.h
+++ b/contrib/ldapc++/src/LDAPReferenceList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRequest.cpp b/contrib/ldapc++/src/LDAPRequest.cpp
index 1023eb1da57b4fb0344f5bff2cf1f04271fa5a54..8ee156d26a17fd0037596c10bd7d8c06a7ad12c0 100644
--- a/contrib/ldapc++/src/LDAPRequest.cpp
+++ b/contrib/ldapc++/src/LDAPRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRequest.h b/contrib/ldapc++/src/LDAPRequest.h
index c263e90f926f3a625cd144b17e4c986a881a3d9f..46c3f87943afcdae26b907622cf027d79243e8c6 100644
--- a/contrib/ldapc++/src/LDAPRequest.h
+++ b/contrib/ldapc++/src/LDAPRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPResult.cpp b/contrib/ldapc++/src/LDAPResult.cpp
index 55a0d7a818f1bb7e0a169901bfca0f6f23f34740..c081baeb97b48c126766147624dda88be50944d3 100644
--- a/contrib/ldapc++/src/LDAPResult.cpp
+++ b/contrib/ldapc++/src/LDAPResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPResult.h b/contrib/ldapc++/src/LDAPResult.h
index 368050b544de4813d3f7f850f6966971a55b0576..7f73ac7715a83bcee6ae4b6d519debc1340a22b6 100644
--- a/contrib/ldapc++/src/LDAPResult.h
+++ b/contrib/ldapc++/src/LDAPResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSaslBindResult.cpp b/contrib/ldapc++/src/LDAPSaslBindResult.cpp
index e2d636352240b90cb1debbca3b65560b02d1b98a..1fe75caa2960b1aa18d5412cee33565c6cf82439 100644
--- a/contrib/ldapc++/src/LDAPSaslBindResult.cpp
+++ b/contrib/ldapc++/src/LDAPSaslBindResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSaslBindResult.h b/contrib/ldapc++/src/LDAPSaslBindResult.h
index b6a82ddff189a2354e1cda8477db9e0fd8d660b6..397a20858406d54678d2e17d8ff1a7780a7f911f 100644
--- a/contrib/ldapc++/src/LDAPSaslBindResult.h
+++ b/contrib/ldapc++/src/LDAPSaslBindResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSchema.cpp b/contrib/ldapc++/src/LDAPSchema.cpp
index 435cf2561251095295f190c4b9f88de2b5730c9c..03be0f967b08737ae85b37c9e5b1696e1b89f0b9 100644
--- a/contrib/ldapc++/src/LDAPSchema.cpp
+++ b/contrib/ldapc++/src/LDAPSchema.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSchema.h b/contrib/ldapc++/src/LDAPSchema.h
index 9fe0839b60b5c2b0b6c7ddd7a1f6cd686fa894a6..8380eb0389e359a1a3d385f40ae682910a1ee416 100644
--- a/contrib/ldapc++/src/LDAPSchema.h
+++ b/contrib/ldapc++/src/LDAPSchema.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchReference.cpp b/contrib/ldapc++/src/LDAPSearchReference.cpp
index 4c6a681743cb1e773bdfe29bc9befd10f66c325f..66234f21a150e74fef707534927d957b97e4c1cb 100644
--- a/contrib/ldapc++/src/LDAPSearchReference.cpp
+++ b/contrib/ldapc++/src/LDAPSearchReference.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchReference.h b/contrib/ldapc++/src/LDAPSearchReference.h
index c4573981a65e7b940a4bfcac95a23c923d5c6886..064599fb9baa791ac07f61b3f9ecdb6c51109ebb 100644
--- a/contrib/ldapc++/src/LDAPSearchReference.h
+++ b/contrib/ldapc++/src/LDAPSearchReference.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchRequest.cpp b/contrib/ldapc++/src/LDAPSearchRequest.cpp
index 8fa36f730fc592525c204aba6cded609633007a7..575c0c4c518dce1fa1c95353b9bd83db26ae6e8d 100644
--- a/contrib/ldapc++/src/LDAPSearchRequest.cpp
+++ b/contrib/ldapc++/src/LDAPSearchRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchRequest.h b/contrib/ldapc++/src/LDAPSearchRequest.h
index 0cb83b4e7218621b2610358f32b9dbf005e01175..7e01d7dcc40a530fb0a528f62154e553e5d16810 100644
--- a/contrib/ldapc++/src/LDAPSearchRequest.h
+++ b/contrib/ldapc++/src/LDAPSearchRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResult.cpp b/contrib/ldapc++/src/LDAPSearchResult.cpp
index da56a621fe2356bcf7c95e31b36cda4a84bc2594..240dc70f4ba2dc98e03989eb25b0e4fdfa18ba2d 100644
--- a/contrib/ldapc++/src/LDAPSearchResult.cpp
+++ b/contrib/ldapc++/src/LDAPSearchResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResult.h b/contrib/ldapc++/src/LDAPSearchResult.h
index 580084574950b8e08b6d8c65817aa9eca645a82d..829b88934d44137e208b436cb380f41df5ea5ede 100644
--- a/contrib/ldapc++/src/LDAPSearchResult.h
+++ b/contrib/ldapc++/src/LDAPSearchResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResults.cpp b/contrib/ldapc++/src/LDAPSearchResults.cpp
index 168dac9374aee5e0089d795b93168108530f6291..66f810d9ed16a4ee7943e25745ad8dc0aa7fa40c 100644
--- a/contrib/ldapc++/src/LDAPSearchResults.cpp
+++ b/contrib/ldapc++/src/LDAPSearchResults.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResults.h b/contrib/ldapc++/src/LDAPSearchResults.h
index a444415250d3216f68b162dc9d0e19f2b1fe893e..7a3bebe90b5211e26024dccbef3e315b650801bb 100644
--- a/contrib/ldapc++/src/LDAPSearchResults.h
+++ b/contrib/ldapc++/src/LDAPSearchResults.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrl.cpp b/contrib/ldapc++/src/LDAPUrl.cpp
index 0ff8c7e5827b679500186497339d6192e10a345b..21bdf66f5e7fc67bec3ee22bf92ce2d0c27840e7 100644
--- a/contrib/ldapc++/src/LDAPUrl.cpp
+++ b/contrib/ldapc++/src/LDAPUrl.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2006, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrl.h b/contrib/ldapc++/src/LDAPUrl.h
index b9b17ad2d324df4acf34f3b11b7e081c7f4a2ae6..fbbef6c23f9cf77fc0e7cc89a304079e04f573b3 100644
--- a/contrib/ldapc++/src/LDAPUrl.h
+++ b/contrib/ldapc++/src/LDAPUrl.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2006, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrlList.cpp b/contrib/ldapc++/src/LDAPUrlList.cpp
index a968905b3aa0273693b15c635e2a6836bad0a738..6481dcee847862133f0957cd2a8e7aa47a6e948e 100644
--- a/contrib/ldapc++/src/LDAPUrlList.cpp
+++ b/contrib/ldapc++/src/LDAPUrlList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2002 OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrlList.h b/contrib/ldapc++/src/LDAPUrlList.h
index aa883cae9f5de39eb5060d221d3248a7611eb08b..df42316d134548bf5d75eb46e7ea8a305eb6e237 100644
--- a/contrib/ldapc++/src/LDAPUrlList.h
+++ b/contrib/ldapc++/src/LDAPUrlList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifReader.cpp b/contrib/ldapc++/src/LdifReader.cpp
index 31cf76baa13be47d2bee82f80c9c419ade757dd2..6dd48762124592f358e8553adb226e3e7d19b925 100644
--- a/contrib/ldapc++/src/LdifReader.cpp
+++ b/contrib/ldapc++/src/LdifReader.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifReader.h b/contrib/ldapc++/src/LdifReader.h
index 16c0e455be57edf201d76e20285dea49aa9ca9aa..2577d96a48a03fc3b7d91b8668f8d15e67c7df3b 100644
--- a/contrib/ldapc++/src/LdifReader.h
+++ b/contrib/ldapc++/src/LdifReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifWriter.cpp b/contrib/ldapc++/src/LdifWriter.cpp
index 089484ee938179a504642ec50baeac5d87e227f9..e0ab94b0e5014f83d0d477c7a6af8f9fea424ad4 100644
--- a/contrib/ldapc++/src/LdifWriter.cpp
+++ b/contrib/ldapc++/src/LdifWriter.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifWriter.h b/contrib/ldapc++/src/LdifWriter.h
index ef07775ec9b97771f75460a537bdf1c33f5e5b09..e7636d41ef181755b0015b784df61a38ebac779b 100644
--- a/contrib/ldapc++/src/LdifWriter.h
+++ b/contrib/ldapc++/src/LdifWriter.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/Makefile.am b/contrib/ldapc++/src/Makefile.am
index ae715e68f4684379e3411ad9c17311c3bffa7841..2ccc7b242e4bb70145b2368be871328ed87e7817 100644
--- a/contrib/ldapc++/src/Makefile.am
+++ b/contrib/ldapc++/src/Makefile.am
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 
 ###
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 
diff --git a/contrib/ldapc++/src/Makefile.in b/contrib/ldapc++/src/Makefile.in
index 09aeda938bc063c5f40b8c485bebb0bce8120a80..71393a32142cdccda806e8a84cfcdeecea9d5efc 100644
--- a/contrib/ldapc++/src/Makefile.in
+++ b/contrib/ldapc++/src/Makefile.in
@@ -18,7 +18,7 @@
 # $OpenLDAP$
 
 ###
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 
 
diff --git a/contrib/ldapc++/src/SaslInteraction.cpp b/contrib/ldapc++/src/SaslInteraction.cpp
index 3549a450775a0851b67e6a75fb1497bc54841a8c..5417e75ff261c5e1c9d4bfe196bdb9b4bcc8fe5f 100644
--- a/contrib/ldapc++/src/SaslInteraction.cpp
+++ b/contrib/ldapc++/src/SaslInteraction.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/SaslInteraction.h b/contrib/ldapc++/src/SaslInteraction.h
index c19c6f561e3a9307d602604299060127081d1b1e..9d0f8040fd7178c01fb1e345d05fe99dc65d96eb 100644
--- a/contrib/ldapc++/src/SaslInteraction.h
+++ b/contrib/ldapc++/src/SaslInteraction.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/SaslInteractionHandler.cpp b/contrib/ldapc++/src/SaslInteractionHandler.cpp
index 35ae3640338098c29c72295447903dce92a37fe9..2710ebfd3015553fc346d5b1ffea0c71ae664001 100644
--- a/contrib/ldapc++/src/SaslInteractionHandler.cpp
+++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/SaslInteractionHandler.h b/contrib/ldapc++/src/SaslInteractionHandler.h
index 47437202ae77a53017dcaa36ffdd2dacd654d954..481d177bb6f044d01c5e61b862bd7486566ae6af 100644
--- a/contrib/ldapc++/src/SaslInteractionHandler.h
+++ b/contrib/ldapc++/src/SaslInteractionHandler.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/StringList.cpp b/contrib/ldapc++/src/StringList.cpp
index 1f0852e72bf1d2ed54502d0938b58c88261f180e..44dd1ed879011ccebb5a169ca3700ef72131e941 100644
--- a/contrib/ldapc++/src/StringList.cpp
+++ b/contrib/ldapc++/src/StringList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/StringList.h b/contrib/ldapc++/src/StringList.h
index 0e2c5b1f7fd43371d3fdad1cc2a6142f58cfd26b..591dbb5782be53929a2c47d6ec4bd07c96cbca04 100644
--- a/contrib/ldapc++/src/StringList.h
+++ b/contrib/ldapc++/src/StringList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/TlsOptions.cpp b/contrib/ldapc++/src/TlsOptions.cpp
index 3da227f874f014921f327712a44078a6675d35a5..9db8f7a2fa2fc6da7b6359321fe07343b5e46b5e 100644
--- a/contrib/ldapc++/src/TlsOptions.cpp
+++ b/contrib/ldapc++/src/TlsOptions.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2010, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/TlsOptions.h b/contrib/ldapc++/src/TlsOptions.h
index 0865fb240ca85a81f00a16b36f866956d5bfece9..b7a8f231b5bd08ca330a4f28237b022c0e384318 100644
--- a/contrib/ldapc++/src/TlsOptions.h
+++ b/contrib/ldapc++/src/TlsOptions.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2010, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #ifndef TLS_OPTIONS_H
diff --git a/contrib/ldapc++/src/debug.h b/contrib/ldapc++/src/debug.h
index 9aec5a78dd6e711e3b283ca00224c90fcf8b6327..a2af50fc49b5f3f07f8bbb971f77ee2aaafb256d 100644
--- a/contrib/ldapc++/src/debug.h
+++ b/contrib/ldapc++/src/debug.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/version.sh b/contrib/ldapc++/version.sh
index 7a5e4c3622c10b2d1d292211c0b0be05dd213867..16495a1d8c36fabe665603afdcd35e607838afc5 100755
--- a/contrib/ldapc++/version.sh
+++ b/contrib/ldapc++/version.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # $OpenLDAP$
 #
-# Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 DIR=`dirname $0`
 . $DIR/version.var
diff --git a/contrib/ldapc++/version.var b/contrib/ldapc++/version.var
index a03fa4da7f3078c2156ba5d71b28ec66bfcefa23..fc7bf17591abe097a0e59a04064fe76205adbc53 100644
--- a/contrib/ldapc++/version.var
+++ b/contrib/ldapc++/version.var
@@ -1,7 +1,7 @@
 #! /bin/sh
 # $OpenLDAP$
 #
-# Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 
 ol_cpp_api_rel_major=0
diff --git a/contrib/ldaptcl/COPYRIGHT b/contrib/ldaptcl/COPYRIGHT
index e9be9a737c53cb6449b5aafff64be1ab31a5660a..56f83319404f371d61a38bc94ce4a556e6855daa 100644
--- a/contrib/ldaptcl/COPYRIGHT
+++ b/contrib/ldaptcl/COPYRIGHT
@@ -1,3 +1,11 @@
+Copyright 1998-2011 The OpenLDAP Foundation.  All rights reserved.
+
+COPYING RESTRICTIONS APPLY.
+
+See COPYRIGHT and LICENSE files in the top-level directory of this
+distribution (i.e., ../../COPYRIGHT and ../../LICENSE, respectively).
+
+---
 NeoSoft Tcl client extensions to Lightweight Directory Access Protocol.
 
 Copyright (c) 1998-1999 NeoSoft, Inc.  
diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
deleted file mode 100644
index 22c4a1fa245ffad49fcfb77f9657176fcf760c52..0000000000000000000000000000000000000000
--- a/doc/guide/COPYRIGHT
+++ /dev/null
@@ -1,64 +0,0 @@
-Copyright 1998-2011 The OpenLDAP Foundation
-All rights reserved.
-
-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 in the file LICENSE in the
-top-level directory of the distribution or, alternatively, at
-<http://www.OpenLDAP.org/license.html>.
-
-OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-
-Individual files and/or contributed packages may be copyright by
-other parties and/or subject to additional restrictions.
-
-This work is derived from the University of Michigan LDAP v3.3
-distribution.  Information concerning this software is available
-at <http://www.umich.edu/~dirsvcs/ldap/ldap.html>.
-
-This work also contains materials derived from public sources.
-
-Additional information about OpenLDAP can be obtained at
-<http://www.openldap.org/>.
-
----
-
-Portions Copyright 1998-2008 Kurt D. Zeilenga.
-Portions Copyright 1998-2006 Net Boolean Incorporated.
-Portions Copyright 2001-2006 IBM Corporation.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted only as authorized by the OpenLDAP
-Public License.
-
----
-
-Portions Copyright 1999-2008 Howard Y.H. Chu.
-Portions Copyright 1999-2008 Symas Corporation.
-Portions Copyright 1998-2003 Hallvard B. Furuseth.
-Portions Copyright 2008-2009 Gavin Henry.
-Portions Copyright 2008-2009 Suretec Systems Ltd.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that this notice is preserved.
-The names of the copyright holders may not be used to endorse or
-promote products derived from this software without their specific
-prior written permission.  This software is provided ``as is''
-without express or implied warranty.
-
----
-
-Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that this notice is preserved and that due credit is given
-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.
-
diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
deleted file mode 100644
index 05ad7571e448b9d83ead5d4691274d9484574714..0000000000000000000000000000000000000000
--- a/doc/guide/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-The OpenLDAP Public License
-  Version 2.8, 17 August 2003
-
-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 in source form must retain copyright statements
-   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, and
-
-3. Redistributions must contain a verbatim copy of this document.
-
-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.
-
-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
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-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.
-
-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-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
-distribute verbatim copies of this document is granted.
diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index 1662d8d62b1629f979483f10b43652c6843c0f39..6fa9ac87978388259d5feb3e3ddbd5316f867ddb 100644
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -2,6 +2,8 @@
 # Copyright 1999-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
+# This file should match ../../../COPYRIGHT (except in formating)
+
 !if OPT_PP_HTML
 !define	copyright '[[c]] Copyright'
 !else
@@ -13,7 +15,7 @@ H1: OpenLDAP Software Copyright Notices
 H2: OpenLDAP Copyright Notice
 
 !block nofill
-[[copyright]] 1998-2008 The OpenLDAP Foundation.
+[[copyright]] 1998-2011 The OpenLDAP Foundation.
 {{All rights reserved.}}
 !endblock
 
@@ -43,7 +45,7 @@ Additional information about OpenLDAP software can be obtained at
 H2: Additional Copyright Notices
 
 !block nofill
-Portions [[copyright]] 1998-2008 Kurt D. Zeilenga.
+Portions [[copyright]] 1998-2011 Kurt D. Zeilenga.
 Portions [[copyright]] 1998-2006 Net Boolean Incorporated.
 Portions [[copyright]] 2001-2006 IBM Corporation.
 {{All rights reserved.}}
@@ -55,8 +57,8 @@ Public License}}.
 
 
 !block nofill
-Portions [[copyright]] 1999-2007 Howard Y.H. Chu.
-Portions [[copyright]] 1999-2007 Symas Corporation.
+Portions [[copyright]] 1999-2008 Howard Y.H. Chu.
+Portions [[copyright]] 1999-2008 Symas Corporation.
 Portions [[copyright]] 1998-2003 Hallvard B. Furuseth.
 Portions [[copyright]] 2007-2011 Gavin Henry.
 Portions [[copyright]] 2007-2011 Suretec Systems Limited.
diff --git a/doc/guide/release/license.sdf b/doc/guide/release/license.sdf
index f59cc50e4d32b382adad89b24843e10dc732b12e..36113a566974003d1896dc38bec4fbe2124a2c5e 100644
--- a/doc/guide/release/license.sdf
+++ b/doc/guide/release/license.sdf
@@ -8,7 +8,7 @@ H1: OpenLDAP Public License
 #<FONT FACE="Courier">
 #!endblock
 
-!include "../LICENSE" ; verbatim
+!include "../../../LICENSE" ; verbatim
 
 #!block inline
 #</FONT>