diff --git a/LICENSE b/LICENSE
index ed95d35512..785b75b0e5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -908,26 +908,22 @@ License: ISC
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 License: OpenLDAP
- /* Portions Copyright 1998-2002 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.
-  *
-  * 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/
-  */
+ 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 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/
diff --git a/debian/copyright b/debian/copyright
index 8de170bc00..fd4bb8a3f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -905,26 +905,22 @@ License: ISC
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 License: OpenLDAP
- /* Portions Copyright 1998-2002 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.
-  *
-  * 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/
-  */
+ 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 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/