2 files changed, 12 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1527c98f052..3241d3953c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
+        * emacs.c (emacs_version): Use PACKAGE_VERSION rather than VERSION.
+        (emacs_bugreport): New variable.
+        (usage_message): Use PACKAGE_BUGREPORT.
+        (syms_of_emacs) <report-emacs-bug-address>: New variable.
+
         * emacs.c (syms_of_emacs) <system-configuration-features>: New var.
 
 2014-03-27  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/emacs.c b/src/emacs.c
index 07deccd16ec..56096016d41 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -105,8 +105,9 @@ extern void moncontrol (int mode);
 #include <sys/personality.h>
 #endif
 
-static const char emacs_version[] = VERSION;
+static const char emacs_version[] = PACKAGE_VERSION;
 static const char emacs_copyright[] = COPYRIGHT;
+static const char emacs_bugreport[] = PACKAGE_BUGREPORT;
 
 /* Empty lisp strings.  To avoid having to build any others.  */
 Lisp_Object empty_unibyte_string, empty_multibyte_string;
@@ -324,7 +325,7 @@ abbreviation for a --option.\n\
 Various environment variables and window system resources also affect\n\
 the operation of Emacs.  See the main documentation.\n\
 \n\
-Report bugs to bug-gnu-emacs@gnu.org.  First, please see the Bugs\n\
+Report bugs to " PACKAGE_BUGREPORT ".  First, please see the Bugs\n\
 section of the Emacs manual or the file BUGS.\n"
   };
 
@@ -2543,6 +2544,10 @@ This is nil during initialization.  */);
                doc: /* Version numbers of this version of Emacs.  */);
   Vemacs_version = build_string (emacs_version);
 
+  DEFVAR_LISP ("report-emacs-bug-address", Vreport_emacs_bug_address,
+               doc: /* Address of mailing list for GNU Emacs bugs.  */);
+  Vreport_emacs_bug_address = build_string (emacs_bugreport);
+
   DEFVAR_LISP ("dynamic-library-alist", Vdynamic_library_alist,
     doc: /* Alist of dynamic libraries vs external files implementing them.
 Each element is a list (LIBRARY FILE...), where the car is a symbol