diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 9f5d3cfdb61..ee518fb9b6b 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1953,9 +1953,9 @@ export MANPATH
   <para>
    If you have installation problems on a platform that is known
    to be supported according to recent build farm results, please report
-   it to <email>pgsql-bugs@postgresql.org</email>.  If you are interested
+   it to <email>pgsql-bugs@lists.postgresql.org</email>.  If you are interested
    in porting <productname>PostgreSQL</productname> to a new platform,
-   <email>pgsql-hackers@postgresql.org</email> is the appropriate place
+   <email>pgsql-hackers@lists.postgresql.org</email> is the appropriate place
    to discuss that.
   </para>
  </sect1>
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index a6b5fe2b638..02ed975ec2f 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -296,7 +296,7 @@
 
   <para>
    In general, send bug reports to the bug report mailing list at
-   <email>pgsql-bugs@postgresql.org</email>.
+   <email>pgsql-bugs@lists.postgresql.org</email>.
    You are requested to use a descriptive subject for your email
    message, perhaps parts of the error message.
   </para>
@@ -306,7 +306,7 @@
    at the project's
    <ulink url="https://www.postgresql.org/">web site</ulink>.
    Entering a bug report this way causes it to be mailed to the
-   <email>pgsql-bugs@postgresql.org</email> mailing list.
+   <email>pgsql-bugs@lists.postgresql.org</email> mailing list.
   </para>
 
   <para>
@@ -318,8 +318,8 @@
 
   <para>
    Do not send bug reports to any of the user mailing lists, such as
-   <email>pgsql-sql@postgresql.org</email> or
-   <email>pgsql-general@postgresql.org</email>.
+   <email>pgsql-sql@lists.postgresql.org</email> or
+   <email>pgsql-general@lists.postgresql.org</email>.
    These mailing lists are for answering
    user questions, and their subscribers normally do not wish to receive
    bug reports. More importantly, they are unlikely to fix them.
@@ -327,7 +327,7 @@
 
   <para>
    Also, please do <emphasis>not</emphasis> send reports to
-   the developers' mailing list <email>pgsql-hackers@postgresql.org</email>.
+   the developers' mailing list <email>pgsql-hackers@lists.postgresql.org</email>.
    This list is for discussing the
    development of <productname>PostgreSQL</productname>, and it would be nice
    if we could keep the bug reports separate. We might choose to take up a
@@ -337,14 +337,14 @@
 
   <para>
    If you have a problem with the documentation, the best place to report it
-   is the documentation mailing list <email>pgsql-docs@postgresql.org</email>.
+   is the documentation mailing list <email>pgsql-docs@lists.postgresql.org</email>.
    Please be specific about what part of the documentation you are unhappy
    with.
   </para>
 
   <para>
    If your bug is a portability problem on a non-supported platform,
-   send mail to <email>pgsql-hackers@postgresql.org</email>,
+   send mail to <email>pgsql-hackers@lists.postgresql.org</email>,
    so we (and you) can work on
    porting <productname>PostgreSQL</productname> to your platform.
   </para>
diff --git a/doc/src/sgml/stylesheet-hh.xsl b/doc/src/sgml/stylesheet-hh.xsl
index 09a95041d6f..ae9c0c47c72 100644
--- a/doc/src/sgml/stylesheet-hh.xsl
+++ b/doc/src/sgml/stylesheet-hh.xsl
@@ -15,7 +15,7 @@
 <xsl:param name="make.valid.html" select="1"></xsl:param>
 <xsl:param name="generate.id.attributes" select="1"></xsl:param>
 <xsl:param name="generate.legalnotice.link" select="1"></xsl:param>
-<xsl:param name="link.mailto.url">pgsql-docs@postgresql.org</xsl:param>
+<xsl:param name="link.mailto.url">pgsql-docs@lists.postgresql.org</xsl:param>
 <xsl:param name="chunker.output.indent" select="'yes'"/>
 <xsl:param name="chunk.quietly" select="1"></xsl:param>
 
diff --git a/doc/src/sgml/stylesheet-html-common.xsl b/doc/src/sgml/stylesheet-html-common.xsl
index 17b7230d2c1..8942d994725 100644
--- a/doc/src/sgml/stylesheet-html-common.xsl
+++ b/doc/src/sgml/stylesheet-html-common.xsl
@@ -14,7 +14,7 @@
 <!-- Parameters -->
 <xsl:param name="make.valid.html" select="1"></xsl:param>
 <xsl:param name="generate.id.attributes" select="1"></xsl:param>
-<xsl:param name="link.mailto.url">pgsql-docs@postgresql.org</xsl:param>
+<xsl:param name="link.mailto.url">pgsql-docs@lists.postgresql.org</xsl:param>
 <xsl:param name="toc.max.depth">2</xsl:param>
 
 
diff --git a/doc/src/sgml/xml2.sgml b/doc/src/sgml/xml2.sgml
index 0a0f13d02d6..560faa000ec 100644
--- a/doc/src/sgml/xml2.sgml
+++ b/doc/src/sgml/xml2.sgml
@@ -25,7 +25,7 @@
    you are encouraged to try converting your applications.  If you
    find that some of the functionality of this module is not
    available in an adequate form with the newer API, please explain
-   your issue to <email>pgsql-hackers@postgresql.org</email> so that the deficiency
+   your issue to <email>pgsql-hackers@lists.postgresql.org</email> so that the deficiency
    can be addressed.
   </para>
  </sect2>