diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2a62151c3c3..bcdfb434602 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,7 @@
 2009-10-15  Glenn Morris  <rgm@gnu.org>
 
+	* emacsclient.c (print_help_and_exit): Fix bug report instructions.
+
 	* makefile.w32-in (echolisp): New rule.
 	(clean): Delete echolisp.tmp.
 
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 8bc3b8a144e..e818f2f9202 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -670,7 +670,7 @@ The following OPTIONS are accepted:\n\
 			mode and try connecting again\n"
 #endif /* not WINDOWSNT */
 "\n\
-Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
+Report bugs with M-x report-emacs-bug.\n", progname);
   exit (EXIT_SUCCESS);
 }