diff --git a/doc/gmsh.html b/doc/gmsh.html
index e57d6cc4d12b7eca313adcd1395ebbbcf60398ed..34b0dc15b2335ed550324acf87c77cd9d51e3569 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -107,8 +107,10 @@ Jean-Fran
 University of Louvain</a>). The <a href="/gmsh/doc/CREDITS.txt">CREDITS</a>
 file has more information.
 <p>
-Please use <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a> to send
-questions or bug reports.
+Please use the public mailing list <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a> 
+to send questions. Bug reports can be filed 
+<a href="https://geuz.org/trac/gmsh/report">here</a> (username:
+gmsh, password: gmsh).
 
 <h2><a name="Documentation"></a>Documentation</h2>
 
@@ -126,15 +128,12 @@ questions or bug reports.
   <li>Mailing lists:
     <ul>
       <li><a href="/mailman/listinfo/gmsh/">gmsh</a> is the public
-        mailing list for Gmsh users. You should send all questions,
-        bug reports, requests or pleas for changes related to Gmsh to
-        this list. The list is
-        archived <a href="/pipermail/gmsh/">here</a>.
+        mailing list for Gmsh discussions, and is the best place
+        to ask questions (and get answers!). The list is archived
+        <a href="/pipermail/gmsh/">here</a>.
       <li><a href="/mailman/listinfo/gmsh-announce/">gmsh-announce</a>
-        is a moderated (i.e. "read-only") list for announcements about
-        significant Gmsh events. You should subscribe to this list to
-        get information about software releases, important bug fixes
-        and other Gmsh-specific news. The list is archived
+        is a moderated ("read-only") list for announcements about
+        new releases or other Gmsh-specific news. The list is archived
         <a href="/pipermail/gmsh-announce/">here</a>.
     </ul>
 </ul>