diff --git a/include/ac/alloca.h b/include/ac/alloca.h
index d63b6d372d..c8b980633a 100644
--- a/include/ac/alloca.h
+++ b/include/ac/alloca.h
@@ -1,7 +1,8 @@
 /* Generic alloca.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/assert.h b/include/ac/assert.h
index 3c9dc4e5f1..f8df48be5f 100644
--- a/include/ac/assert.h
+++ b/include/ac/assert.h
@@ -1,7 +1,8 @@
 /* Generic assert.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/bytes.h b/include/ac/bytes.h
index 409b68c9f8..bbc9129686 100644
--- a/include/ac/bytes.h
+++ b/include/ac/bytes.h
@@ -1,7 +1,8 @@
 /* Generic bytes.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/crypt.h b/include/ac/crypt.h
index 83c3b8238c..5b0c68b043 100644
--- a/include/ac/crypt.h
+++ b/include/ac/crypt.h
@@ -1,7 +1,8 @@
 /* Generic crypt.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/ctype.h b/include/ac/ctype.h
index 0a029275a6..023f7e0cb0 100644
--- a/include/ac/ctype.h
+++ b/include/ac/ctype.h
@@ -1,7 +1,8 @@
 /* Generic ctype.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/dirent.h b/include/ac/dirent.h
index 9b74d1dae4..08fd7e8186 100644
--- a/include/ac/dirent.h
+++ b/include/ac/dirent.h
@@ -1,7 +1,8 @@
 /* Generic dirent.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/errno.h b/include/ac/errno.h
index 88bf1b04e6..889d3c0eb4 100644
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -1,7 +1,8 @@
 /* Generic errno.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/krb.h b/include/ac/krb.h
index 85483e324d..b29948903f 100644
--- a/include/ac/krb.h
+++ b/include/ac/krb.h
@@ -1,7 +1,8 @@
 /* Generic krb.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/krb5.h b/include/ac/krb5.h
index 7f7aad8108..89c3ebf58e 100644
--- a/include/ac/krb5.h
+++ b/include/ac/krb5.h
@@ -1,7 +1,8 @@
 /* Generic krb.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/localize.h b/include/ac/localize.h
index a96c72c955..721a5f4f61 100644
--- a/include/ac/localize.h
+++ b/include/ac/localize.h
@@ -1,7 +1,8 @@
 /* localize.h (i18n/l10n) */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/param.h b/include/ac/param.h
index ff06eb3664..7991a74f5a 100644
--- a/include/ac/param.h
+++ b/include/ac/param.h
@@ -1,7 +1,8 @@
 /* Generic param.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/regex.h b/include/ac/regex.h
index 15eb37552c..6f3c915b79 100644
--- a/include/ac/regex.h
+++ b/include/ac/regex.h
@@ -1,7 +1,8 @@
 /* Generic Regex */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/setproctitle.h b/include/ac/setproctitle.h
index b8911ae0d7..6450f7b348 100644
--- a/include/ac/setproctitle.h
+++ b/include/ac/setproctitle.h
@@ -1,7 +1,8 @@
 /* Generic setproctitle.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/signal.h b/include/ac/signal.h
index ce7829e011..a29b992204 100644
--- a/include/ac/signal.h
+++ b/include/ac/signal.h
@@ -1,7 +1,8 @@
 /* Generic signal.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/socket.h b/include/ac/socket.h
index 48468530c8..090ee8fbc2 100644
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -1,7 +1,8 @@
 /* Generic socket.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/stdarg.h b/include/ac/stdarg.h
index f82732ac83..ffa8f4ab75 100644
--- a/include/ac/stdarg.h
+++ b/include/ac/stdarg.h
@@ -1,7 +1,8 @@
 /* Generic stdarg.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/stdlib.h b/include/ac/stdlib.h
index ca610dae5f..41e3f42d82 100644
--- a/include/ac/stdlib.h
+++ b/include/ac/stdlib.h
@@ -1,7 +1,8 @@
 /* Generic stdlib.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/string.h b/include/ac/string.h
index dbe1262d49..764dfc4484 100644
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,7 +1,8 @@
 /* Generic string.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/sysexits.h b/include/ac/sysexits.h
index 390eea6721..46707f2348 100644
--- a/include/ac/sysexits.h
+++ b/include/ac/sysexits.h
@@ -1,7 +1,8 @@
 /* Generic sysexits */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/syslog.h b/include/ac/syslog.h
index 7b37ce016c..b36108ddfd 100644
--- a/include/ac/syslog.h
+++ b/include/ac/syslog.h
@@ -1,7 +1,8 @@
 /* Generic syslog.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/termios.h b/include/ac/termios.h
index fe9fb5f0ce..1c532aed15 100644
--- a/include/ac/termios.h
+++ b/include/ac/termios.h
@@ -1,7 +1,8 @@
 /* Generic termios.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/time.h b/include/ac/time.h
index 71dfbf1034..da0bb58040 100644
--- a/include/ac/time.h
+++ b/include/ac/time.h
@@ -1,7 +1,8 @@
 /* Generic time.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index e9588b751d..a266dd83e2 100644
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -1,7 +1,8 @@
 /* Generic unistd.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/ac/wait.h b/include/ac/wait.h
index 3e34aaa4b7..da27f52956 100644
--- a/include/ac/wait.h
+++ b/include/ac/wait.h
@@ -1,7 +1,8 @@
 /* Generic wait.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without