diff --git a/NON-AUTOTOOLS-BUILD b/NON-AUTOTOOLS-BUILD
index 0026606c1..3abb3b04c 100644
--- a/NON-AUTOTOOLS-BUILD
+++ b/NON-AUTOTOOLS-BUILD
@@ -429,3 +429,4 @@ programs contain some VMS-specific code.
 ===========================
 Last Updated: 16 April 2024
 ===========================
+
diff --git a/README b/README
index 58cd418df..311229d20 100644
--- a/README
+++ b/README
@@ -964,7 +964,7 @@ The distribution should contain the files listed below.
   vms/pcre2.h_patch       )
   vms/stdint.h            )
 
-Philip Hazel
-Email local part: Philip.Hazel
-Email domain: gmail.com
-Last updated: 15 April 2024
+===========================
+Last Updated: 15 April 2024
+===========================
+
diff --git a/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt
index 0026606c1..3abb3b04c 100644
--- a/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/doc/html/NON-AUTOTOOLS-BUILD.txt
@@ -429,3 +429,4 @@ programs contain some VMS-specific code.
 ===========================
 Last Updated: 16 April 2024
 ===========================
+
diff --git a/doc/html/README.txt b/doc/html/README.txt
index 58cd418df..311229d20 100644
--- a/doc/html/README.txt
+++ b/doc/html/README.txt
@@ -964,7 +964,7 @@ The distribution should contain the files listed below.
   vms/pcre2.h_patch       )
   vms/stdint.h            )
 
-Philip Hazel
-Email local part: Philip.Hazel
-Email domain: gmail.com
-Last updated: 15 April 2024
+===========================
+Last Updated: 15 April 2024
+===========================
+
diff --git a/doc/html/pcre2.html b/doc/html/pcre2.html
index 4cb83dc18..e727fc52f 100644
--- a/doc/html/pcre2.html
+++ b/doc/html/pcre2.html
@@ -16,7 +16,7 @@ <h1>pcre2 man page</h1>
 <li><a name="TOC1" href="#SEC1">INTRODUCTION</a>
 <li><a name="TOC2" href="#SEC2">SECURITY CONSIDERATIONS</a>
 <li><a name="TOC3" href="#SEC3">USER DOCUMENTATION</a>
-<li><a name="TOC4" href="#SEC4">AUTHOR</a>
+<li><a name="TOC4" href="#SEC4">AUTHORS</a>
 <li><a name="TOC5" href="#SEC5">REVISION</a>
 </ul>
 <br><a name="SEC1" href="#TOC1">INTRODUCTION</a><br>
@@ -190,18 +190,18 @@ <h1>pcre2 man page</h1>
 In the "man" and HTML formats, there is also a short page for each C library
 function, listing its arguments and results.
 </P>
-<br><a name="SEC4" href="#TOC1">AUTHOR</a><br>
+<br><a name="SEC4" href="#TOC1">AUTHORS</a><br>
 <P>
-Philip Hazel
-<br>
-Retired from University Computing Service
-<br>
-Cambridge, England.
-<br>
+The current maintainers of PCRE2 are Nicholas Wilson and Zoltan Herczeg.
+</P>
+<P>
+PCRE2 was written by Philip Hazel, of the University Computing Service,
+Cambridge, England. Many others have also contributed.
 </P>
 <P>
-Putting an actual email address here is a spam magnet. If you want to email me,
-use my two names separated by a dot at gmail.com.
+To contact the maintainers, please use the GitHub issues tracker or PCRE2
+mailing list, as described at the project page:
+<a href="https://github.com/PCRE2Project/pcre2">https://github.com/PCRE2Project/pcre2</a>
 </P>
 <br><a name="SEC5" href="#TOC1">REVISION</a><br>
 <P>
diff --git a/doc/pcre2.3 b/doc/pcre2.3
index fa914502e..54293f939 100644
--- a/doc/pcre2.3
+++ b/doc/pcre2.3
@@ -186,17 +186,20 @@ In the "man" and HTML formats, there is also a short page for each C library
 function, listing its arguments and results.
 .
 .
-.SH AUTHOR
+.SH AUTHORS
 .rs
 .sp
-.nf
-Philip Hazel
-Retired from University Computing Service
-Cambridge, England.
-.fi
+The current maintainers of PCRE2 are Nicholas Wilson and Zoltan Herczeg.
+.P
+PCRE2 was written by Philip Hazel, of the University Computing Service,
+Cambridge, England. Many others have also contributed.
 .P
-Putting an actual email address here is a spam magnet. If you want to email me,
-use my two names separated by a dot at gmail.com.
+To contact the maintainers, please use the GitHub issues tracker or PCRE2
+mailing list, as described at the project page:
+.\" HTML <a href="https://github.com/PCRE2Project/pcre2">
+.\" </a>
+https://github.com/PCRE2Project/pcre2
+.\"
 .
 .
 .SH REVISION
diff --git a/doc/pcre2.txt b/doc/pcre2.txt
index 1b7604a4d..7168fe50c 100644
--- a/doc/pcre2.txt
+++ b/doc/pcre2.txt
@@ -170,14 +170,17 @@ USER DOCUMENTATION
        library function, listing its arguments and results.
 
 
-AUTHOR
+AUTHORS
 
-       Philip Hazel
-       Retired from University Computing Service
-       Cambridge, England.
+       The  current  maintainers  of PCRE2 are Nicholas Wilson and Zoltan Her-
+       czeg.
+
+       PCRE2 was written by Philip Hazel, of the University Computing Service,
+       Cambridge, England. Many others have also contributed.
 
-       Putting  an  actual email address here is a spam magnet. If you want to
-       email me, use my two names separated by a dot at gmail.com.
+       To contact the maintainers, please use the  GitHub  issues  tracker  or
+       PCRE2    mailing    list,   as   described   at   the   project   page:
+       https://github.com/PCRE2Project/pcre2
 
 
 REVISION