--- a/doc/interpreter/bugs.txi	Mon Sep 27 13:50:01 2004 +0000
+++ b/doc/interpreter/bugs.txi	Fri Oct 01 18:12:11 2004 +0000
@@ -235,7 +235,7 @@
 for you.
 
 If for some reason you cannot use Octave's @code{bug_report} function,
-send bug reports for Octave to @email{bug-octave@@bevo.che.wisc.edu}.
+send bug reports for Octave to @email{bug@@octave.org}.
 
 @strong{Do not send bug reports to @samp{help-octave}}.  Most users of
 Octave do not want to receive bug reports.  Those that do have asked to
@@ -461,15 +461,15 @@
 @appendixsec How To Get Help with Octave
 @cindex help, where to find
 
-The mailing list @email{help-octave@@bevo.che.wisc.edu} exists for the
-discussion of matters related to using and installing Octave.  If would
-like to join the discussion, please send a short note to
-@email{help-octave@strong{-request}@@bevo.che.wisc.edu}.
+The mailing list @email{help@@octave.org} exists for the discussion of
+matters related to using and installing Octave.  If would like to join
+the discussion, please send a short note to
+@email{help@strong{-request}@@octave.org}.
 
 @strong{Please do not} send requests to be added or removed from the
 mailing list, or other administrative trivia to the list itself.
 
 If you think you have found a bug in the installation procedure,
 however, you should send a complete bug report for the problem to
-@email{bug-octave@@bevo.che.wisc.edu}.  @xref{Bug Reporting}, for
+@email{bug@@octave.org}.  @xref{Bug Reporting}, for
 information that will help you to submit a useful report.