diff --git a/HTMLparser.c b/HTMLparser.c
index bea933e9..a9628f86 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -12,7 +12,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/HTMLtree.c b/HTMLtree.c
index edc10672..cffa5296 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 
diff --git a/SAX2.c b/SAX2.c
index 542118af..b5a221b4 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <daniel@veillard.com>
+ * Author: Daniel Veillard
  */
 
 
diff --git a/buf.c b/buf.c
index b7ce1676..c61a463d 100644
--- a/buf.c
+++ b/buf.c
@@ -9,7 +9,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/c14n.c b/c14n.c
index 8db0dbcc..6a9bebea 100644
--- a/c14n.c
+++ b/c14n.c
@@ -7,7 +7,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Author: Aleksey Sanin <aleksey@aleksey.com>
+ * Author: Aleksey Sanin
  */
 #define IN_LIBXML
 #include "libxml.h"
diff --git a/catalog.c b/catalog.c
index ca76af28..d76d6ed5 100644
--- a/catalog.c
+++ b/catalog.c
@@ -9,7 +9,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel.Veillard@imag.fr
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/chvalid.c b/chvalid.c
index fb2c715a..a3a6c043 100644
--- a/chvalid.c
+++ b/chvalid.c
@@ -7,7 +7,6 @@
  *
  * Generation date: Mon Mar 27 11:09:48 2006
  * Sources: chvalid.def
- * William Brack <wbrack@mmm.com.hk>
  */
 
 #define IN_LIBXML
diff --git a/debugXML.c b/debugXML.c
index 19959199..4e120311 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <daniel@veillard.com>
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/dict.c b/dict.c
index e241d2fa..4bce6539 100644
--- a/dict.c
+++ b/dict.c
@@ -13,7 +13,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
  * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
  *
- * Author: daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/encoding.c b/encoding.c
index c4271996..a8a35101 100644
--- a/encoding.c
+++ b/encoding.c
@@ -15,9 +15,9 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  *
- * Original code for IsoLatin1 and UTF-16 by "Martin J. Duerst" <duerst@w3.org>
+ * Original code for IsoLatin1 and UTF-16 by Martin J. Duerst
  */
 
 #define IN_LIBXML
diff --git a/entities.c b/entities.c
index 9963d13e..a5804133 100644
--- a/entities.c
+++ b/entities.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 /* To avoid EBCDIC trouble when parsing on zOS */
diff --git a/error.c b/error.c
index bf055a40..4c09587c 100644
--- a/error.c
+++ b/error.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <daniel@veillard.com>
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/globals.c b/globals.c
index e0b05a24..ed347879 100644
--- a/globals.c
+++ b/globals.c
@@ -3,9 +3,6 @@
  *            of the library
  *
  * See Copyright for the status of this software.
- *
- * Gary Pennington <Gary.Pennington@uk.sun.com>
- * daniel@veillard.com
  */
 
 #define IN_LIBXML
diff --git a/include/libxml/c14n.h b/include/libxml/c14n.h
index 8ccd1cef..c8493648 100644
--- a/include/libxml/c14n.h
+++ b/include/libxml/c14n.h
@@ -12,7 +12,7 @@
 
  * Copy: See Copyright for the status of this software.
  *
- * Author: Aleksey Sanin <aleksey@aleksey.com>
+ * Author: Aleksey Sanin
  */
 #ifndef __XML_C14N_H__
 #define __XML_C14N_H__
diff --git a/include/libxml/chvalid.h b/include/libxml/chvalid.h
index 8225c95e..bca624df 100644
--- a/include/libxml/chvalid.h
+++ b/include/libxml/chvalid.h
@@ -8,7 +8,6 @@
  *
  * Generation date: Mon Mar 27 11:09:48 2006
  * Sources: chvalid.def
- * Author: William Brack <wbrack@mmm.com.hk>
  */
 
 #ifndef __XML_CHVALID_H__
diff --git a/include/libxml/hash.h b/include/libxml/hash.h
index 135b6966..a5f2c562 100644
--- a/include/libxml/hash.h
+++ b/include/libxml/hash.h
@@ -4,8 +4,6 @@
  *		various places in the library.
  *
  * Copy: See Copyright for the status of this software.
- *
- * Author: Bjorn Reese <bjorn.reese@systematic.dk>
  */
 
 #ifndef __XML_HASH_H__
diff --git a/include/libxml/list.h b/include/libxml/list.h
index 1fa76aff..b48025a4 100644
--- a/include/libxml/list.h
+++ b/include/libxml/list.h
@@ -5,7 +5,7 @@
  *
  * Copy: See Copyright for the status of this software.
  *
- * Author: Gary Pennington <Gary.Pennington@uk.sun.com>
+ * Author: Gary Pennington
  */
 
 #ifndef __XML_LINK_INCLUDE__
diff --git a/include/libxml/xmlwriter.h b/include/libxml/xmlwriter.h
index 55f88bc7..69e25563 100644
--- a/include/libxml/xmlwriter.h
+++ b/include/libxml/xmlwriter.h
@@ -4,7 +4,7 @@
  *
  * Copy: See Copyright for the status of this software.
  *
- * Author: Alfred Mickautsch <alfred@mickautsch.de>
+ * Author: Alfred Mickautsch
  */
 
 #ifndef __XML_XMLWRITER_H__
diff --git a/include/private/xzlib.h b/include/private/xzlib.h
index 8505ef32..1c5cf30b 100644
--- a/include/private/xzlib.h
+++ b/include/private/xzlib.h
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Anders F Bjorklund <afb@users.sourceforge.net>
+ * Author: Anders F Bjorklund
  */
 
 #ifndef LIBXML2_XZLIB_H
diff --git a/list.c b/list.c
index dce97905..a6fc2caa 100644
--- a/list.c
+++ b/list.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
  * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
  *
- * Author: Gary.Pennington@uk.sun.com
+ * Author: Gary Pennington
  */
 
 #define IN_LIBXML
diff --git a/parser.c b/parser.c
index ec3ba264..977782f1 100644
--- a/parser.c
+++ b/parser.c
@@ -27,7 +27,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 /* To avoid EBCDIC trouble when parsing on zOS */
diff --git a/parserInternals.c b/parserInternals.c
index 015f2e3a..bcec6b76 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/pattern.c b/pattern.c
index cfa07d37..d480c156 100644
--- a/pattern.c
+++ b/pattern.c
@@ -8,7 +8,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 /*
diff --git a/relaxng.c b/relaxng.c
index 1d31395a..de1617fd 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <veillard@redhat.com>
+ * Author: Daniel Veillard
  */
 
 /**
diff --git a/runsuite.c b/runsuite.c
index 52fc6a1a..3135412a 100644
--- a/runsuite.c
+++ b/runsuite.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #include "libxml.h"
diff --git a/runtest.c b/runtest.c
index 84518ae9..b20f9b4e 100644
--- a/runtest.c
+++ b/runtest.c
@@ -8,7 +8,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define XML_DEPRECATED
diff --git a/runxmlconf.c b/runxmlconf.c
index 10feb0b8..0cff2d83 100644
--- a/runxmlconf.c
+++ b/runxmlconf.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #include "libxml.h"
diff --git a/schematron.c b/schematron.c
index 6835cbb2..2a8c15ee 100644
--- a/schematron.c
+++ b/schematron.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <daniel@veillard.com>
+ * Author: Daniel Veillard
  */
 
 /*
diff --git a/shell.c b/shell.c
index e1507724..3ca6f73a 100644
--- a/shell.c
+++ b/shell.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <daniel@veillard.com>
+ * Author: Daniel Veillard
  */
 
 #include "libxml.h"
diff --git a/testModule.c b/testModule.c
index 4baf4265..58190d94 100644
--- a/testModule.c
+++ b/testModule.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * joelwreed@comcast.net
+ * Author: Joel W. Reed
  */
 
 #define XML_DEPRECATED
diff --git a/testlimits.c b/testlimits.c
index 1fc1aaf9..3f572ea6 100644
--- a/testlimits.c
+++ b/testlimits.c
@@ -7,7 +7,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #include "libxml.h"
diff --git a/testrecurse.c b/testrecurse.c
index 478cb974..10bc84b6 100644
--- a/testrecurse.c
+++ b/testrecurse.c
@@ -7,7 +7,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define XML_DEPRECATED_MEMBER
diff --git a/threads.c b/threads.c
index b36b31f2..261c07bb 100644
--- a/threads.c
+++ b/threads.c
@@ -3,8 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Gary Pennington <Gary.Pennington@uk.sun.com>
- * daniel@veillard.com
+ * Author: Gary Pennington, Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/tools/genChRanges.py b/tools/genChRanges.py
index 4e229d19..567b31b4 100755
--- a/tools/genChRanges.py
+++ b/tools/genChRanges.py
@@ -215,7 +215,6 @@ header.write(
  *
  * Generation date: %s
  * Sources: %s
- * Author: William Brack <wbrack@mmm.com.hk>
  */
 
 #ifndef __XML_CHVALID_H__
@@ -272,7 +271,6 @@ output.write(
  *
  * Generation date: %s
  * Sources: %s
- * William Brack <wbrack@mmm.com.hk>
  */
 
 #define IN_LIBXML
diff --git a/tools/genUnicode.py b/tools/genUnicode.py
index f3e361a4..67fef622 100755
--- a/tools/genUnicode.py
+++ b/tools/genUnicode.py
@@ -210,7 +210,6 @@ output.write(
  *
  * Generation date: %s
  * Sources: %s
- * Daniel Veillard <veillard@redhat.com>
  */
 
 #define IN_LIBXML
diff --git a/tree.c b/tree.c
index 7050cede..4a4f18b1 100644
--- a/tree.c
+++ b/tree.c
@@ -6,7 +6,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  *
  */
 
diff --git a/uri.c b/uri.c
index 05cf93b6..955d5c86 100644
--- a/uri.c
+++ b/uri.c
@@ -5,7 +5,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/valid.c b/valid.c
index 34d7ca3b..a6153b3f 100644
--- a/valid.c
+++ b/valid.c
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/xinclude.c b/xinclude.c
index a4d0fb96..73b94916 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -6,7 +6,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/xlink.c b/xlink.c
index ab4a3af2..03f31b25 100644
--- a/xlink.c
+++ b/xlink.c
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 
diff --git a/xmlIO.c b/xmlIO.c
index 37aec1b7..d88c8120 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/xmlcatalog.c b/xmlcatalog.c
index 8b37852f..c694905c 100644
--- a/xmlcatalog.c
+++ b/xmlcatalog.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #include "libxml.h"
diff --git a/xmllint.c b/xmllint.c
index 93fce9f9..8f7b05e6 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #include "libxml.h"
diff --git a/xmlmemory.c b/xmlmemory.c
index 4ac22cdc..0078e211 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -1,7 +1,7 @@
 /*
  * xmlmemory.c:  libxml memory allocator wrapper.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/xmlmodule.c b/xmlmodule.c
index 407227c1..fe516909 100644
--- a/xmlmodule.c
+++ b/xmlmodule.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * joelwreed@comcast.net
+ * Author: Joel W. Reed
  *
  * http://www.fortran-2000.com/ArnaudRecipes/sharedlib.html
  */
diff --git a/xmlreader.c b/xmlreader.c
index 180f29a4..bb5616ce 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -7,7 +7,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 /*
diff --git a/xmlregexp.c b/xmlregexp.c
index 69ef983e..08c4d664 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -11,7 +11,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <veillard@redhat.com>
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/xmlsave.c b/xmlsave.c
index a031067c..a3722ef8 100644
--- a/xmlsave.c
+++ b/xmlsave.c
@@ -3,7 +3,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/xmlschemas.c b/xmlschemas.c
index c95194a0..c3d938d9 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <veillard@redhat.com>
+ * Author: Daniel Veillard
  */
 
 /*
diff --git a/xmlschemastypes.c b/xmlschemastypes.c
index b4f95a0e..f7f601a9 100644
--- a/xmlschemastypes.c
+++ b/xmlschemastypes.c
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Daniel Veillard <veillard@redhat.com>
+ * Author: Daniel Veillard
  */
 
 /* To avoid EBCDIC trouble when parsing on zOS */
diff --git a/xmlstring.c b/xmlstring.c
index 5f03e07a..c8f7e3fd 100644
--- a/xmlstring.c
+++ b/xmlstring.c
@@ -7,10 +7,9 @@
  *
  * See Copyright for the status of this software.
  *
- * UTF8 string routines from:
- * William Brack <wbrack@mmm.com.hk>
+ * UTF8 string routines from: William Brack
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 #define IN_LIBXML
diff --git a/xmlunicode.c b/xmlunicode.c
index cb9bb992..2f17f014 100644
--- a/xmlunicode.c
+++ b/xmlunicode.c
@@ -8,7 +8,6 @@
  *
  * Generation date: Tue Mar  4 16:29:31 2025
  * Sources: Blocks-4.0.1.txt UnicodeData-4.0.1.txt
- * Daniel Veillard <veillard@redhat.com>
  */
 
 #define IN_LIBXML
diff --git a/xmlwriter.c b/xmlwriter.c
index ee7904bb..342f9502 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -5,7 +5,7 @@
  * For license and disclaimer see the license and disclaimer of
  * libxml2.
  *
- * alfred@mickautsch.de
+ * Author: Alfred Mickautsch
  */
 
 #define IN_LIBXML
diff --git a/xpath.c b/xpath.c
index 520e350d..e944cdf1 100644
--- a/xpath.c
+++ b/xpath.c
@@ -10,8 +10,7 @@
  *
  * See Copyright for the status of this software
  *
- * Author: daniel@veillard.com
- *
+ * Author: Daniel Veillard
  */
 
 /* To avoid EBCDIC trouble when parsing on zOS */
diff --git a/xpointer.c b/xpointer.c
index 8b4d4e57..993335d2 100644
--- a/xpointer.c
+++ b/xpointer.c
@@ -11,7 +11,7 @@
  *
  * See Copyright for the status of this software.
  *
- * daniel@veillard.com
+ * Author: Daniel Veillard
  */
 
 /* To avoid EBCDIC trouble when parsing on zOS */
diff --git a/xzlib.c b/xzlib.c
index f3b05393..db636b03 100644
--- a/xzlib.c
+++ b/xzlib.c
@@ -4,7 +4,7 @@
  *
  * See Copyright for the status of this software.
  *
- * Anders F Bjorklund <afb@users.sourceforge.net>
+ * Author: Anders F Bjorklund
  */
 #define IN_LIBXML
 #include "libxml.h"