diff --git a/doc/bug.template b/doc/bug.template
index 2010e03348479d308d96c8ed71b7e1bf331ffdf3..7ae808d4ba57062eefc05d0eee719465e53b7f70 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -1,10 +1,14 @@
If PostgreSQL failed to compile on your computer or you found a bug that
-is likely to be specific to one platform then please fill out this form
+is likely to be specific to one platform, then please fill out this form
and e-mail it to pgsql-ports@postgresql.org.
-To report any other bug, fill out the form below and e-mail it to
+To report non-porting-related bugs, fill out the form below and e-mail it to
pgsql-bugs@postgresql.org.
+If your bug report has security implications and you'd prefer that it not
+become immediately visible in public archives, don't send it to pgsql-bugs.
+Security issues can be reported privately to security@postgresql.org.
+
If you not only found the problem but solved it and generated a patch
then e-mail it to pgsql-patches@postgresql.org instead. Please use the
command "diff -c" to generate the patch.
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index f48305bc5de59b6886c9086aa5efd0288bc249b2..94100815bc8341c5207be87e692e56f474799af0 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.19 2004/08/24 00:06:50 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.20 2005/01/30 21:31:48 tgl Exp $
-->
<sect1 id="bug-reporting">
@@ -309,6 +309,13 @@ $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.19 2004/08/24 00:06:50 neilc E
<email>pgsql-bugs@postgresql.org</email> mailing list.
</para>
+ <para>
+ If your bug report has security implications and you'd prefer that it
+ not become immediately visible in public archives, don't send it to
+ <literal>pgsql-bugs</literal>. Security issues can be
+ reported privately to <email>security@postgresql.org</email>.
+ </para>
+
<para>
Do not send bug reports to any of the user mailing lists, such as
<email>pgsql-sql@postgresql.org</email> or
@@ -324,8 +331,8 @@ $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.19 2004/08/24 00:06:50 neilc E
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
- discussion
- about your bug report on <literal>pgsql-hackers</literal>, if the problem needs more review.
+ discussion about your bug report on <literal>pgsql-hackers</literal>,
+ if the problem needs more review.
</para>
<para>