diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 093eec3..053a9e4 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1450,6 +1450,7 @@ If YANK is non-nil, include the original article."
     (goto-char (point-min))
     (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
     (forward-line 1)
+    (insert (format "Package: %s\n" gnus-bug-package))
     (insert (gnus-version) "\n"
 	    (emacs-version) "\n")
     (when (and (boundp 'nntp-server-type)
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 6c48a11..29080fe 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2632,9 +2632,13 @@ such as a mark that says whether an article is stored in the cache
 (defvar gnus-have-read-active-file nil)
 
 (defconst gnus-maintainer
-  "bugs@gnus.org (The Gnus Bugfixing Girls + Boys)"
+  "submit@debbugs.gnu.org (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
+(defconst gnus-bug-package
+  "gnus"
+  "The package to use in the bug submission.")
+
 (defvar gnus-info-nodes
   '((gnus-group-mode "(gnus)Group Buffer")
     (gnus-summary-mode "(gnus)Summary Buffer")