3 files changed, 6 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24f17f004f5..8c008185424 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
+        * cus-start.el (report-emacs-bug-address): Set custom properties.
+        * mail/emacsbug.el (report-emacs-bug-address):
+        Variable is now defined in emacs.c.
+
         * mail/emacsbug.el (report-emacs-bug):
         Include system-configuration-features.
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 7fbddbe1c45..ee09c433f33 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -198,6 +198,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 
              ;; editfns.c
              (user-full-name mail string)
+             ;; emacs.c
+             (report-emacs-bug-address emacsbug string)
              ;; eval.c
              (max-specpdl-size limits integer)
              (max-lisp-eval-depth limits integer)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 54f7b6a21ea..91451504cab 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -43,11 +43,6 @@
 (define-obsolete-variable-alias 'report-emacs-bug-pretest-address
   'report-emacs-bug-address "24.1")
 
-(defcustom report-emacs-bug-address "bug-gnu-emacs@gnu.org"
-  "Address of mailing list for GNU Emacs bugs."
-  :group 'emacsbug
-  :type 'string)
-
 (defcustom report-emacs-bug-no-confirmation nil
   "If non-nil, suppress the confirmations asked for the sake of novice users."
   :group 'emacsbug