diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index 694e9c4a6d..964942fd47 100644
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -24,7 +24,7 @@
  * is preserved.
  */
 /* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
+ * ASN.1 fragments are from RFC 2251; see RFC 2251 for full legal notices.
  */
 
 /* ACKNOWLEDGEMENTS:
diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 0e16cd7d8c..09fa94e01e 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -3,6 +3,7 @@
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Portions Copyright 1999 Lars Uffmann.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -16,6 +17,9 @@
 /* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  */
+/* Significant additional contributors include:
+ *    Lars Uffman
+ */
 
 #include "portable.h"
 
@@ -45,20 +49,6 @@ int ldap_int_inet4or6 = AF_INET;
 #  endif
 #endif
 
-/*
- * nonblock connect code
- * written by Lars Uffmann, <lars.uffmann@mediaway.net>.
- *
- * Copyright 1999, Lars Uffmann, All rights reserved.
- * This software is not subject to any license of my employer
- * mediaWays GmbH.
- *
- * OpenLDAP COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- *
- * Read about the rationale in ldap_connect_timeout: 
- * ftp://koobera.math.uic.edu/www/docs/connect.html.
- */
-
 #ifdef LDAP_DEBUG
 
 #define osip_debug(ld,fmt,arg1,arg2,arg3) \
diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 1e53542543..72d5be2ef8 100644
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -2,6 +2,7 @@
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Portions Copyright 1998 A. Hartgers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,16 +13,6 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Copyright 1998, A. Hartgers, All rights reserved.
- * This software is not subject to any license of Eindhoven University of
- * Technology, since it was written in my spare time.
- *			
- * 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.
- */ 
-
 /* ACKNOWLEDGEMENTS:
  * This work was initially developed by Bart Hartgers for inclusion in
  * OpenLDAP Software.