Go back to "Maintainer: emacs-devel@gnu.org"

Restore lines saying "Maintainer: emacs-devel@gnu.org" when there is no special maintainer for a file. Although this wasn't documented it was common practice and removing the lines didn't have consensus.
author: Paul Eggert 2019-05-25 13:43:06 -0700
committer: Paul Eggert 2019-05-25 14:25:18 -0700
commit: f744797af1dd73a547dd204d7e79f084e6508517 (patch)
tree: 880520a7ce5a72a9cdcfd17a287e0129f3a98685
parent: 2843945c5fb7179b96bdab71528f57b2e4a30517 (diff)
download: emacs-f744797af1dd73a547dd204d7e79f084e6508517.tar.gz
emacs-f744797af1dd73a547dd204d7e79f084e6508517.zip
327 files changed, 342 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el
index 8329f3f581c..eb4843e3cbf 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;; Author: Gerd Moellmann <gerd@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint
 ;; Package: emacs
diff --git a/admin/find-gc.el b/admin/find-gc.el
index 9b925565dfb..bf93c4eedf4 100644
--- a/admin/find-gc.el
+++ b/admin/find-gc.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/admin/last-chance.el b/admin/last-chance.el
index ceed1c7cfa3..5f993be18e2 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint
 ;; Package: emacs
diff --git a/autogen.sh b/autogen.sh
index cff4a54be56..374f7a9fe2e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,7 @@
 ## Copyright (C) 2011-2019 Free Software Foundation, Inc.
 ## Author: Glenn Morris <rgm@gnu.org>
+## Maintainer: emacs-devel@gnu.org
 ## This file is part of GNU Emacs.
diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir
index 51f384aff8f..2dcac87b489 100755
--- a/build-aux/make-info-dir
+++ b/build-aux/make-info-dir
@@ -5,6 +5,7 @@
 ## Copyright (C) 2013-2019 Free Software Foundation, Inc.
 ## Author: Glenn Morris <rgm@gnu.org>
+## Maintainer: emacs-devel@gnu.org
 ## This file is part of GNU Emacs.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index be19da525ea..3c88ec661a9 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992, 2001-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev convenience
 ;; Package: emacs
diff --git a/lisp/align.el b/lisp/align.el
index aeb845a5613..443237b451b 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience languages lisp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/array.el b/lisp/array.el
index 28635d18af1..2fffe0197e8 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1987, 2000-2019 Free Software Foundation, Inc.
 ;; Author: David M. Brown
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index c2ebea70083..f7ecfe27bb1 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -6,6 +6,7 @@
 ;; Author: Charlie Martin <crm@cs.duke.edu>
 ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: convenience
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 4f09d583d74..744bcc36a85 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992-1996, 1999-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/bs.el b/lisp/bs.el
index c564da251b5..cd9524a440b 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index c8cd25caff7..5f889866361 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1987, 1993-1995, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Package: emacs
diff --git a/lisp/case-table.el b/lisp/case-table.el
index 7474d633236..c27e772b044 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1988, 1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Package: emacs
diff --git a/lisp/cdl.el b/lisp/cdl.el
index 36f72ef0510..752e59b5d49 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Ata Etemadi <ATAE@spva.physics.imperial.ac.uk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 79bb4b20ee3..2462662bbd8 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;; Author: David Ponce <david@dponce.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 10 Nov 2000
 ;; Keywords: syntax
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index 426b1a9f844..e61bc3edc6a 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: matching
 ;; This file is part of GNU Emacs.
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 9c29bb7c432..59bdc00c674 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index f949a8c1098..ed6f1bfb1ad 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes, lisp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/comint.el b/lisp/comint.el
index b6ed199327e..fb324d20e24 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -4,6 +4,7 @@
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;      Simon Marshall <simon@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes
 ;; Package: emacs
diff --git a/lisp/completion.el b/lisp/completion.el
index ff392dd8219..89285c74d41 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev convenience
 ;; Author: Jim Salem <alem@bbnplanet.com> of Thinking Machines Inc.
 ;;  (ideas suggested by Brewster Kahle)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index e65f19dd2e1..6d47e607ae6 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, faces
 ;; Package: emacs
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 9846aa8d99d..bc9d1d4f7d6 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, faces
 ;; Package: emacs
diff --git a/lisp/custom.el b/lisp/custom.el
index e2bf8718b62..29bf9e570a8 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, faces
 ;; Package: emacs
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index aa22d6c754e..fa43507461d 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -6,6 +6,7 @@
 ;; Author: Don Morrison
 ;;      Lars Lindberg
 ;; (according to ack.texi)
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 16 Mars 1992
 ;; Lindberg's last update version: 5.7
 ;; Keywords: abbrev expand completion convenience
diff --git a/lisp/delsel.el b/lisp/delsel.el
index a815b91c015..8f71bc65191 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Matthieu Devin <devin@lucid.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 14 Jul 92
 ;; Keywords: convenience emulations
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 2976b788f0a..8be2b94458a 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1994-1996, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Boris Goldowsky <boris@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: faces, i18n, Unicode, multilingual
 ;; This file is part of GNU Emacs.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 387bd4e004c..51749acb217 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Package: emacs
diff --git a/lisp/dired.el b/lisp/dired.el
index f137d4a5be0..ea1943de1db 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Package: emacs
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index f1676bbfa3a..4a597506774 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -5,6 +5,7 @@
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Based on a previous version by Howard Gayle
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Package: emacs
diff --git a/lisp/display-fill-column-indicator.el b/lisp/display-fill-column-indicator.el
index ec89adea218..6d5f5a9f894 100644
--- a/lisp/display-fill-column-indicator.el
+++ b/lisp/display-fill-column-indicator.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/display-line-numbers.el b/lisp/display-line-numbers.el
index ac01112215e..d38f2e69635 100644
--- a/lisp/display-line-numbers.el
+++ b/lisp/display-line-numbers.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 82bb7c9ef86..459a7238dcd 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: window, drag, drop
 ;; Package: emacs
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index bffd54006de..c575dd413fc 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1991, 1993, 1995-1996, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index 0bf10133c24..53de20b853a 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index ea530f991a7..cf1a8d3b73c 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: font, system-font, tool-bar-style
 ;; Package: emacs
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index ddfad25a382..6543e5f1978 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 8006d7bcd95..e932daf2f01 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 8fc8e1f15af..2a24c9857c2 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -4,6 +4,7 @@
 ;; Author: Richard Mlynarik
 ;; (according to ack.texi and authors.el)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/electric.el b/lisp/electric.el
index 1f4c132f922..07da2f1d9e7 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: K. Shane Hartman
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index dfd6d2e5b8f..2034f33d0e6 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1994, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 12 Dec 1992
 ;; Keywords: extensions, lisp, tools
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index a1739562f6f..d2a3a131d16 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -6,6 +6,7 @@
 ;;         Inge Wallin <inge@lysator.liu.se>
 ;;         Thomas Bellman <bellman@lysator.liu.se>
 ;;         Toby Cubitt <toby-predictive@dr-qubit.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 10 May 1991
 ;; Keywords: extensions, data structures, AVL, tree
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 344a0ba8f61..5e72dc3b400 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Rick Sladkey <jrs@world.std.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions, internal
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 02a9749f47a..44cca6136c0 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -4,6 +4,7 @@
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 811b485dc6f..842d1d48b45 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -4,6 +4,7 @@
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 95e287c806c..e76baf5ed0d 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5,6 +5,7 @@
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 21af4b6e631..58ca9d5f57e 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 ;; Author: Igor Kuzmin <kzuminig@iro.umontreal.ca>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index ea6efbf851d..10af440008d 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -4,6 +4,7 @@
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Created: July 1987
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, tools
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 259f240d297..8989aa07196 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, tools, maint
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 9f7beeaef51..6db0584b987 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -5,6 +5,7 @@
 ;; Inc.
 ;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index ed3c1fbaa94..3fc22247fa6 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -4,6 +4,7 @@
 ;; Author: Doug Cutting <doug@csli.stanford.edu>
 ;;      Jamie Zawinski <jwz@lucid.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index b8da76ccf0b..ab5553b4e83 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, tools, maint
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 1f8d31a3fcc..f0dcb51af89 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Barry A. Warsaw
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 26-Feb-1994
 ;; Keywords: debugging lisp tools
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 6ee378e8528..54c8afe62b4 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985-1987, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index 4a84cfa3e2d..d1bd46fb584 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 81adbd5d4f1..91c76158a31 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 14 Jul 1992
 ;; Keywords: docs
 ;; X-Bogus-Bureaucratic-Cruft: Gruad will get you if you don't watch out!
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 021708c588a..fa6dc98d04c 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985-1986, 1999-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, languages
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index f653f6c1099..38df920f17a 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994, 2000-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, languages
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index e8337a99c80..a688330b74a 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1991-1995, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, extensions
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 774df3f84e7..54e802edf4f 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -8,6 +8,8 @@
 ;; Package-Requires: ((emacs "25"))
 ;; Package: map
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 2753bbd5482..00f72e284ad 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 ;; Author: Simon Marshall <simon@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: strings, regexps, extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index 91c043fb3fb..c7d0268a77f 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index 4c90f47c914..6d1adae9749 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index ed32490ceee..8ef78fd69e6 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Author: Gerd Moellmann <gerd@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: strings, regexps, extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 8997b7501b2..3413cd1513c 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -7,6 +7,8 @@
 ;; Version: 2.21
 ;; Package: seq
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 33445835aed..b9ffe6a6fc6 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index f488bed3b0e..f1904e64efb 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el
index 968dc71f678..e1370c45911 100644
--- a/lisp/emacs-lisp/thunk.el
+++ b/lisp/emacs-lisp/thunk.el
@@ -7,6 +7,8 @@
 ;; Version: 1.0
 ;; Package: thunk
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/timer-list.el b/lisp/emacs-lisp/timer-list.el
index 3a791c2af44..55aa56b72e0 100644
--- a/lisp/emacs-lisp/timer-list.el
+++ b/lisp/emacs-lisp/timer-list.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 668da42a6ef..22ccc35103a 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index ca2d2a23c75..4249305feee 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Scott Draves <spot@cs.cmu.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: extensions
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 0a8351195f1..2f271c1f708 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993, 1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 15 Dec 1992
 ;; Keywords: tools, lisp
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 70d6b077ebc..13ca605dd00 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 05b4c010f68..0cded29193a 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -4,6 +4,7 @@
 ;; Author: Juanma Barranquero <lekktu@gmail.com>
 ;; Inspired by emacs-lock.el by Tom Wurgler <twurgler@goodyear.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/env.el b/lisp/env.el
index 30b63a8e552..5a4130eb3be 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1991, 1994, 2000-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes, unix
 ;; Package: emacs
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index 298cffb49ae..9e224e0b828 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
+;; Maintainer: emacs-devel@gnu.org
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index eb441c29b41..210830a2b49 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -4,6 +4,7 @@
 ;; Filename: erc-backend.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 2004-05-7
 ;; Keywords: IRC chat client internet
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 8e2a6b980d0..c8aa887a652 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1996-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: irc, button, url, regexp
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcButton
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index 3d99c259aad..210a7736cc0 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 3b362774b6b..e724e367ab1 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index b835191960e..a6b7532e1f3 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -6,6 +6,7 @@
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
 ;;         Noah Friedman <friedman@prep.ai.mit.edu>
 ;;         Per Persson <pp@sno.pp.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes
 ;; Created: 1994-01-23
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index 5784e63d7f8..a2c9336826a 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index ef876f464e3..934b52a938c 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -4,6 +4,7 @@
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcFilling
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 0d16aaf5412..884c594b9ed 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
+;; Maintainer: emacs-devel@gnu.org
 ;; Most code is taken verbatim from erc.el, see there for the original
 ;; authors.
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index ce0104b3054..149c858d2e8 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcIbuffer
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index 96b45899b49..d95e0eac0c7 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index e40dc1fc250..08f52f13647 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcImenu
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 18cc8b54252..896521eaf0a 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: irc
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index 765898da7b9..f0dbe69f791 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Old-Version: 1.0.0
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcLang
 ;; Keywords: comm languages processes
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index 6a2ba785ba4..d8d9e17c95a 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;; Author: Tom Tromey <tromey@redhat.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Old-Version: 0.1
 ;; Keywords: comm
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index fc12dc73ef5..4153f5c57bd 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 ;; Author: Lawrence Mitchell <wence@gmx.li>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet, logging
 ;; Created 2003-04-26
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 98ddebd0cfc..cc4b4a88f11 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, faces
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMatch
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index e13404ca133..8173829797b 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2002, 2004-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes, menu
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 252af715d72..87c3a61b663 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index e92da7b7253..eca8ad6a899 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002, 2004-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 9bd062a98d6..45dae899900 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index 4e7fed7b403..cb57883ae6f 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index e2489a8d0ee..dd2da85d0e8 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Sacha Chua <sacha@free.net.ph>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, convenience
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index e1c495c9036..2e0e54a030f 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, client, Internet
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 54f91d134cb..5459d8b01e5 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index f500f4c1278..886ba60eb47 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 38e0b2885bb..34f7ce62c74 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 833ad2f1e78..0a1e38fe248 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -4,6 +4,7 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 8df7ea9e4c1..69a83fa032b 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: irc
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcSpelling
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 541c67a74fb..860fdbb77ce 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes, timestamp
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcStamp
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 14e86c199a2..e51e6056fb9 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, faces
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcChannelTracking
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 73c7316b346..04174295520 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet, logging
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 20a91b7a30d..162b22e15c6 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index fc0f6128f6f..d1fa5c7f120 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -10,6 +10,7 @@
 ;;               Gergely Nagy (algernon@midgard.debian.net)
 ;;               David Edmondson (dme@dme.org)
 ;;               Kelvin White (kwhite@gnu.org)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet
 ;; Version: 5.3
diff --git a/lisp/expand.el b/lisp/expand.el
index 7eaf7fdab05..0c4d343090c 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev
 ;; This file is part of GNU Emacs.
diff --git a/lisp/faces.el b/lisp/faces.el
index 137ce99d5e6..89b598669c9 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 4e91a7affaf..08f72089450 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1995-1997, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 29 Mar 1993
 ;; Keywords: files, hypermedia, matching, mouse, convenience
diff --git a/lisp/files-x.el b/lisp/files-x.el
index 0d156db0e62..b71e9204f32 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;; Author: Juri Linkov <juri@jurta.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Package: emacs
diff --git a/lisp/files.el b/lisp/files.el
index 989d1cb4658..287ad14aecf 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985-1987, 1992-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 05c30dedf40..b74b4a8a400 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;; Author: Thomas Link <sanobast-emacs@yahoo.de>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: filesets convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 578f7653628..ef137be9bbf 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -5,6 +5,7 @@
 ;; Author: Roland McGrath <roland@gnu.org>,
 ;;         Sebastian Kremer <sk@thp.uni-koeln.de>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix
 ;; This file is part of GNU Emacs.
diff --git a/lisp/find-file.el b/lisp/find-file.el
index f93d2a02d74..87314086a4a 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -1,6 +1,7 @@
 ;;; find-file.el --- find a file corresponding to this one given a pattern
 ;; Author: Henry Guillaume <henri@tibco.com, henry@c032.aone.net.au>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: c, matching, tools
 ;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index 0b95efaf041..e92b6b4df2e 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Kevin Gallagher
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: hardware
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 2eae65a7928..3ef88fe686a 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 27 Jan 1994
 ;; Version: 1.10
 ;; Keywords: folding, outlines
diff --git a/lisp/follow.el b/lisp/follow.el
index 47e7aa4cd5e..acc2b26c550 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Anders Lindgren
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 1995-05-25
 ;; Keywords: display, window, minor-mode, convenience
diff --git a/lisp/font-core.el b/lisp/font-core.el
index da6c91bca5e..6b26f0cb92e 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, faces
 ;; Package: emacs
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b0e4598bac7..3991a4ee8ef 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -5,6 +5,7 @@
 ;; Author: Jamie Zawinski
 ;;      Richard Stallman
 ;;      Stefan Monnier
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, faces
 ;; Package: emacs
diff --git a/lisp/frame.el b/lisp/frame.el
index 8e0738f31c0..a8c230cb7b2 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1994, 1996-1997, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 632efa81a8d..92387a21571 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;; Author: Simon Josefsson <simon@josefsson.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: frames
 ;; Package: emacs
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 91b4104becf..de69168330d 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 9c90d6da148..a16d1e34b43 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Lynn Slater <lrs@indetech.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: Mon Oct  1 11:42:39 1990
 ;; Adapted-By: ESR
 ;; Package: emacs
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 304c45dad3c..6cc3f0d4f71 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/help.el b/lisp/help.el
index 0677368a4d6..42ff3755650 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/hexl.el b/lisp/hexl.el
index df501dfc68f..ee5a9c0fce2 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; This file is part of GNU Emacs.
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 17d3dc7d8d7..404f448e0d2 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Anders Holst <aho@sans.kth.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Version: 1.6
 ;; Keywords: abbrev convenience
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index e4fef214d65..1c09bc26f68 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author:  Dave Love <fx@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 1998-09-13
 ;; Keywords: faces, frames, emulations
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 1531415e741..c7a31a23e68 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: David Smith <maa036@lancaster.ac.uk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 25 Feb 1994
 ;; Keywords: lisp
diff --git a/lisp/iimage.el b/lisp/iimage.el
index 17b715a66b9..e51108ee28f 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;; Author: KOSEKI Yoshinori <kose@meadowy.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: multimedia
 ;; This file is part of GNU Emacs.
diff --git a/lisp/image.el b/lisp/image.el
index 6cc2cc39027..db113020866 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: multimedia
 ;; Package: emacs
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 6e16e131835..5084fe61eff 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -4,6 +4,7 @@
 ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se>
 ;;         Lars Lindberg <lli@sypro.cap.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 8 Feb 1994
 ;; Keywords: tools convenience
diff --git a/lisp/indent.el b/lisp/indent.el
index 1dbece73d6e..bf87d6af760 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 1995, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/info.el b/lisp/info.el
index 61803950d18..c211887a39a 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985-1986, 1992-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; This file is part of GNU Emacs.
diff --git a/lisp/informat.el b/lisp/informat.el
index 246b3b979b5..8108ffe42af 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1986, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; This file is part of GNU Emacs.
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index b317b8aad7f..395e6c4dcd0 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Howard Gayle
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 14da02c73d9..b573e1e47c5 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Howard Gayle
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index fd68137f2b3..543f2e33888 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -4,6 +4,7 @@
 ;; Author: Włodek Bzyl
 ;;         Ryszard Kubiak
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/international/utf7.el b/lisp/international/utf7.el
index f22fb8d38bc..73ee5ad27c3 100644
--- a/lisp/international/utf7.el
+++ b/lisp/international/utf7.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 ;; Author: Jon K Hellan <hellan@acm.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 5aaeae438a3..bb29c2914be 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-1997, 1999-2019 Free Software Foundation, Inc.
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: matching
 ;; Package: emacs
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index dc1836865b5..ee392b349e8 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 16 Apr 2004
 ;; Version: 1.5
 ;; Keywords: lisp
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index b6ff9f12f1e..3aa84f45b0d 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Jay K. Adams <jka@ece.cmu.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; Package: emacs
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 8c9dd8abb63..63fb449b48b 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Jay K. Adams <jka@ece.cmu.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; This file is part of GNU Emacs.
diff --git a/lisp/kermit.el b/lisp/kermit.el
index 77c2cbd4d60..f6ed1fbda1c 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Jeff Norden <jeff@colgate.csnet>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 15 Feb 1988
 ;; Keywords: comm
diff --git a/lisp/linum.el b/lisp/linum.el
index 6fe30571c60..0b4b0083ed6 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;; Author: Markus Triska <markus.triska@gmx.at>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Version: 0.9x
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 69f2c0bdcc3..4e5d8e0f38d 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1995, 1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index c43d1476229..67e8aa7d40a 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 17a37f15544..436f9e3e021 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix
 ;; This file is part of GNU Emacs.
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 7ab97ebffee..1f2c46834ec 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -4,6 +4,7 @@
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, dired
 ;; Package: emacs
diff --git a/lisp/macros.el b/lisp/macros.el
index b9020a299a5..4b38506d8a5 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev
 ;; Package: emacs
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 2a2ff3dec14..62094bfe2d7 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 2cd6d56b429..c637e242c42 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: K. Shane Hartman
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint mail
 ;; Package: emacs
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index ec17d669f3c..60689529974 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2005, 2007-2019 Free Software Foundation, Inc.
 ;; Written by: Paul Foley <mycroft@actrix.gen.nz> (1997-2002)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail, hashcash
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index e6108066656..c1e90c3dcb8 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Joe Wells <jbw@cs.bu.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: mail-utils
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index f561c088a2f..cbcbdfaeb2e 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail, news
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 17f4f0cba0c..d59df88c688 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -4,6 +4,7 @@
 ;; Software Foundation, Inc.
 ;; Author: Jamie Zawinski <jwz@lucid.com; now jwz@jwz.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 19 Oct 90
 ;; Keywords: mail
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 68e44f820c7..42896c18ebe 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1987, 1995-1997, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 3172c9760f7..10db110c70f 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Author:          1993-1998 Barry A. Warsaw
+;; Maintainer: emacs-devel@gnu.org
 ;; Created:         19-Apr-1993
 ;; Keywords: maint mail tools
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 4cf624cedd5..a53a77e47ee 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d0ebf7df479..91291b8d330 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1988, 1993-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index a9ce1e6feee..01d552469fa 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index ee71ab4f6e4..9427796a065 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1988, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index d32147f4af2..af528135ccb 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -4,6 +4,7 @@
 ;; Author: Alexander Pohoyda
 ;;      Alex Schroeder
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 4c429358995..ba0c2ae77c7 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index d95670849de..12d37615d6b 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1987, 1993-1994, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 18185ec6473..4a701038ac8 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 80cfbfd721a..79a322c1d91 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1993-1996, 2000-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 0db05570833..208ebb68017 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 317324613b9..ad69dca8c43 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993, 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: February 1993
 ;; Keywords: mail, news
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 499f16e9d23..bbf3c83c55f 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994, 1996, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index c409210a0c3..4d9ad67262a 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/makesum.el b/lisp/makesum.el
index 847e304e975..10ad78ea174 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; This file is part of GNU Emacs.
diff --git a/lisp/man.el b/lisp/man.el
index feb0e09ab18..d52ca2156d2 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; Adapted-By: ESR, pot
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index d12cdd731ab..4ff60ed9910 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Richard M. Stallman
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal, mouse
 ;; Package: emacs
diff --git a/lisp/misc.el b/lisp/misc.el
index 00807627007..4cf6cadf650 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Package: emacs
diff --git a/lisp/mouse.el b/lisp/mouse.el
index af53c05f573..8428c1e0139 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1993-1995, 1999-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware, mouse
 ;; Package: emacs
diff --git a/lisp/msb.el b/lisp/msb.el
index b626624fbc9..7a1a338fcc1 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1995, 1997-2019 Free Software Foundation, Inc.
 ;; Author: Lars Lindberg <lars.lindberg@home.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 8 Oct 1993
 ;; Lindberg's last update version: 3.34
 ;; Keywords: mouse buffer menu
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 81b654c9a9a..b0a1e1799f5 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; This file is part of GNU Emacs.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 0c63cbd5a45..aa31e25fa91 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 03 Apr 1995
 ;; Keywords: hypertext, hypermedia, mouse
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index d7fd0587475..c25d7873918 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1995, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Eric Ding <ericding@alum.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 15 Aug 1995
 ;; Keywords: mh-e, www, mouse, mail
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 2df473cf71a..75fc7d62211 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: April 1998
 ;; Keywords: comm
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index 19114508254..599e2305f77 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 465927dfdde..cf3634f7d92 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: William F. Schelter
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, comm
 ;; This file is part of GNU Emacs.
diff --git a/lisp/novice.el b/lisp/novice.el
index 1da4b71dc95..3da4e25810a 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1987, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal, help
 ;; This file is part of GNU Emacs.
diff --git a/lisp/obarray.el b/lisp/obarray.el
index fbab506cce3..c83d5d47241 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: obarray functions
 ;; Package: emacs
diff --git a/lisp/obsolete/abbrevlist.el b/lisp/obsolete/abbrevlist.el
index dfd7b2b492f..e2bf14f0dc1 100644
--- a/lisp/obsolete/abbrevlist.el
+++ b/lisp/obsolete/abbrevlist.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1986, 1992, 2001-2019 Free Software Foundation, Inc.
 ;; Suggested by a previous version by Gildea.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev
 ;; Package: emacs
 ;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/bruce.el b/lisp/obsolete/bruce.el
index 8044a0ef931..fba54c1ae04 100644
--- a/lisp/obsolete/bruce.el
+++ b/lisp/obsolete/bruce.el
@@ -4,6 +4,7 @@
 ;; Copyright (C) 1988, 1993, 1997, 2001-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; Created: Jan 1997
 ;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 10af6ab95fd..5180d4527be 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1994-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Simon Marshall <simon@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: faces files
 ;; Version: 3.14
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/gs.el b/lisp/obsolete/gs.el
index 24c9b67abd2..cfdc9dc67ce 100644
--- a/lisp/obsolete/gs.el
+++ b/lisp/obsolete/gs.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Obsolete-since: 26.1
diff --git a/lisp/obsolete/gulp.el b/lisp/obsolete/gulp.el
index 373ee35d8e0..bdb3406a3d9 100644
--- a/lisp/obsolete/gulp.el
+++ b/lisp/obsolete/gulp.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Sam Shteingold <shteingd@math.ucla.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint
 ;; Obsolete-since: 25.1
diff --git a/lisp/obsolete/info-edit.el b/lisp/obsolete/info-edit.el
index e520faf77bb..b64e84003fc 100644
--- a/lisp/obsolete/info-edit.el
+++ b/lisp/obsolete/info-edit.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985-1986, 1992-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index 51679280023..44f8528b201 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1994-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Simon Marshall <simon@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: faces files
 ;; Version: 2.11
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/ledit.el b/lisp/obsolete/ledit.el
index 91efa29320f..6383a4266d1 100644
--- a/lisp/obsolete/ledit.el
+++ b/lisp/obsolete/ledit.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages
 ;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index f2b081d672d..714b3fbb761 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
 ;; Obsolete-since: 23.2
diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index 9d0c5daf5ef..d1b702ed556 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
 ;; Obsolete-since: 23.2
diff --git a/lisp/obsolete/mailpost.el b/lisp/obsolete/mailpost.el
index 33cc43ccbe2..2f74faf1d6c 100644
--- a/lisp/obsolete/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -6,6 +6,7 @@
 ;; This file is part of GNU Emacs.
 ;; Author: Gary Delp <delp@huey.Udel.Edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 13 Jan 1986
 ;; Keywords: mail
 ;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/meese.el b/lisp/obsolete/meese.el
index 190db94f4b9..81739dfa6cb 100644
--- a/lisp/obsolete/meese.el
+++ b/lisp/obsolete/meese.el
@@ -5,6 +5,7 @@
 ;; This file is part of GNU Emacs.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/pc-mode.el b/lisp/obsolete/pc-mode.el
index 4908b51259c..6d1a456d61a 100644
--- a/lisp/obsolete/pc-mode.el
+++ b/lisp/obsolete/pc-mode.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
 ;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el
index 53537a09066..dfa80097b35 100644
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Alon Albert <alon@milcse.rtsg.mot.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 1993 Oct 6
 ;; Keywords: tools, processes
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el
index ba36f2dcdad..884cd3e4e45 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Bob Glickstein <bobg+sregex@zanshin.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/sup-mouse.el b/lisp/obsolete/sup-mouse.el
index 752ebf59d81..6bd42789253 100644
--- a/lisp/obsolete/sup-mouse.el
+++ b/lisp/obsolete/sup-mouse.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Wolfgang Rupprecht
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 21 Nov 1986
 ;; Keywords: hardware
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/terminal.el b/lisp/obsolete/terminal.el
index d0631b32f04..ce6f2309fd3 100644
--- a/lisp/obsolete/terminal.el
+++ b/lisp/obsolete/terminal.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Obsolete-since: 24.4
 ;; Keywords: comm, terminals
diff --git a/lisp/obsolete/yow.el b/lisp/obsolete/yow.el
index eddb3f90296..eeeaaec8124 100644
--- a/lisp/obsolete/yow.el
+++ b/lisp/obsolete/yow.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Richard Mlynarik
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; Obsolete-since: 24.4
diff --git a/lisp/outline.el b/lisp/outline.el
index 7783d37e0a6..74df77b8be7 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1986, 1993-1995, 1997, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: outlines
 ;; This file is part of GNU Emacs.
diff --git a/lisp/paren.el b/lisp/paren.el
index d00e7d9a812..13908d46eef 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
 ;; Author: rms@gnu.org
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, faces
 ;; This file is part of GNU Emacs.
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index fb310faf4c6..e461b37e362 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games, extensions
 ;; Created: Mon Mar 22 17:06:26 1993
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index fc76f2b724d..a5880c08847 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; This file is part of GNU Emacs.
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index e9c78f5e5c4..b1ab6703a48 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; This file is part of GNU Emacs.
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 562e5c0ad23..6d5553b3202 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR, Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: games
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index 1f2e2c0098a..d762290f0da 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -1,6 +1,7 @@
 ;;; hanoi.el --- towers of hanoi in Emacs
 ;; Author: Damon Anton Permezel
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ; Author (a) 1985, Damon Anton Permezel
diff --git a/lisp/play/life.el b/lisp/play/life.el
index 7d9f1475f38..6cce1e5643d 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Kyle Jones <kyleuunet.uu.net>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; This file is part of GNU Emacs.
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index c1394a31d7a..d884c0a2559 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1988, 1993, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; Created: May 1987
diff --git a/lisp/play/studly.el b/lisp/play/studly.el
index 6d54f6d08a8..ff1bf03e118 100644
--- a/lisp/play/studly.el
+++ b/lisp/play/studly.el
@@ -5,6 +5,7 @@
 ;; This file is part of GNU Emacs.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;;; Commentary:
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 491b780bd02..c56d16e305e 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1991, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools, languages
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index ff4ea1a0901..1a67a95927b 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: AWK, cc-mode, unix, languages
 ;; Package: cc-mode
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3930f09392a..1a0d9bdbb70 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -5,6 +5,7 @@
 ;; Authors: Roland McGrath <roland@gnu.org>,
 ;;          Daniel Pfeiffer <occitan@esperanto.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index fd3eec76090..ba007d67c0d 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -5,6 +5,7 @@
 ;; Author: Ilya Zakharevich
 ;;      Bob Olson
 ;;      Jonathan Rockway <jon@jrock.us>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, Perl
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 757f0f26072..d5803c77bb4 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Odd Gripenstam <gripenstamol@decus.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: DCL editing major-mode languages
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 0f44487d436..3faec4959bc 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 ;; Author: Gerd Moellmann <gerd@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: C++ tags tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index d62c1316ee3..cb1b17b4474 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985-1986, 1999-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, languages
 ;; Package: emacs
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 54ca135f277..910c320ab8f 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -4,6 +4,7 @@
 ;; Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index e09aaa3741b..716f40c1f3a 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 ;; Author: Nick Roberts <nickrob@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index d094c95fcfb..79178c4346e 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index f5680f263b6..4306f5daa02 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index c3ff23558c3..cffb749c3e8 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -4,6 +4,7 @@
 ;; Author: Thomas Neumann <tom@smart.bo.open.de>
 ;;      Eric S. Raymond <esr@snark.thyrsus.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: unix, tools
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 1dd5d51df80..a759709b5c8 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 ;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 09 Nov 2002
 ;; Version: 0.1
 ;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer Programming
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index 087d1f65fd3..aa412304c59 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -2,6 +2,7 @@
 ;; Author: Michael Schmidt <michael@pbinfo.UUCP>
 ;;      Tom Perrine <Perrin@LOGICON.ARPA>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 4d4e2e1cd45..8a7e24e5ada 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -4,6 +4,7 @@
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
 ;;         John Eaton <jwe@octave.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index f01d6b6bb2d..7cbd30a0d1d 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1990, 1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: William F. Mann
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: languages
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index bd56d1a7c78..2b057356b10 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 74e865bd0b8..188bc973d99 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6,6 +6,7 @@
 ;; URL: https://github.com/fgallina/python.el
 ;; Version: 0.26.1
 ;; Package-Requires: ((emacs "24.1") (cl-lib "1.0"))
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: Jul 2010
 ;; Keywords: languages
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 8f52a366783..853a3500ee1 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -5,6 +5,7 @@
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Version: 2.0f
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, unix
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 31315e229e0..0fd3d6d1bf4 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -4,6 +4,7 @@
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;;    Chris Lindblad <cjl@lcs.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages tcl modes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index 7ae47126a5c..62c42d39c6f 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1986-1987, 1989-1990, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, lisp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/register.el b/lisp/register.el
index d3825fe8e2a..775e1a2cc92 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1993-1994, 2001-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/replace.el b/lisp/replace.el
index 00b8be53281..9d1b7bf747d 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2019 Free
 ;; Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 0416845e9cf..22f9986efb5 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -4,6 +4,7 @@
 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
 ;; Created: Jan 1991
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/rot13.el b/lisp/rot13.el
index bdb2e4b5048..8f4044deac5 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 84cba61aab5..fb3b7483397 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1997, 2005-2019 Free Software Foundation, Inc.
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: minibuffer
 ;; Version: 24
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 960cace2069..730d31ead25 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Karl Fogel <kfogel@red-bean.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: July, 1993
 ;; Keywords: bookmarks, placeholders
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 4fc9df84609..dc0df7ab3fe 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1993-1995, 1999-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware
 ;; Package: emacs
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index 72127321c99..8281edb1720 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 2005-06-18
 ;; This file is part of GNU Emacs.
diff --git a/lisp/select.el b/lisp/select.el
index a8adc168f95..af6bf467e4a 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/server.el b/lisp/server.el
index f692673d4f1..436a44a7e94 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes
 ;; Changes by peck@sun.com and by rms.
diff --git a/lisp/shell.el b/lisp/shell.el
index 6e2ae85fcea..53570272111 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -5,6 +5,7 @@
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;      Simon Marshall <simon@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/simple.el b/lisp/simple.el
index c0e8d58c80c..4454791ad20 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985-1987, 1993-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 1d06b648a20..bce73d6bfef 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993-1996, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions, abbrev, languages, tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/sort.el b/lisp/sort.el
index 86cb1804a39..6ea1c440605 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Howie Kaye
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix
 ;; This file is part of GNU Emacs.
diff --git a/lisp/soundex.el b/lisp/soundex.el
index 9e4c79769d0..1f1f9caec3d 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Christian Plaunt <chris@bliss.berkeley.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: matching
 ;; Created: Sat May 15 14:48:18 1993
diff --git a/lisp/startup.el b/lisp/startup.el
index f853ceccc51..90046389d16 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 29daaa5690e..9265b8a52ea 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
 ;; Author: David Bakhash <cadet@alum.mit.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, mouse, extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/subr.el b/lisp/subr.el
index c97d9b96bd9..05fb9fea68f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 1f4be160f8e..14b292d4414 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -1,6 +1,7 @@
 ;;; t-mouse.el --- mouse support within the text terminal
 ;; Author: Nick Roberts <nickrob@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mouse gpm linux
 ;; Copyright (C) 1994-1995, 1998, 2006-2019 Free Software Foundation,
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 345771e19cd..37cd8fb2fdd 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/talk.el b/lisp/talk.el
index b5c77a9332c..0b7d5db01e1 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, frames
 ;; This file is part of GNU Emacs.
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index c75fe7c3730..599da9ac807 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1990-1991, 1993-2019 Free Software Foundation, Inc.
 ;; Author: Jamie Zawinski <jwz@lucid.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 04 Apr 1990
 ;; Keywords: unix
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index d7fceb83085..b7a778fc004 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: terminals
 ;; This file is part of GNU Emacs.
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index c434ea6b9cb..09275991cf5 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Morten Welinder <terra@diku.dk>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 2718aecb9af..307586f2213 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 ;; Author: Eli Zaretskii
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: terminals, faces
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index de822326fb3..7a5d3ef7758 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -4,6 +4,7 @@
 ;; Author: Henry Kautz
 ;; (according to authors.el)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: bib
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 46dbcfef460..c285491a305 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2019 Free
 ;; Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Package: emacs
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index a06f8edd6f8..d18916dfd01 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index f351b870261..ff3d2420df4 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1991, 1993, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Robert J. Chassell
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: docs convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index e5964d175dd..f33d4df4d19 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index bc92121599c..220ef2d7fd6 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp convenience
 ;; Package: emacs
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 8a1af3af250..92a6b907859 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Package: emacs
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 79039bc1980..bc85372de68 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience wp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 03b1b048a16..3ba52e61ea6 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Henry Kautz <kautz@research.att.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: bib, tex
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 3d4d0d2b06e..f13e1d7161d 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992, 1996, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: bib
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index efc11084fe6..67ecd3ced81 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1999-2001, 2003-2019 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 29 Mar 1999
 ;; Version: 2.0
 ;; Keywords: data memory todo pim
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index d0586fd9fce..75f20722b05 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: James Clark <jjc@jclark.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR, Daniel Pfeiffer <occitan@esperanto.org>,
 ;;             F.Potorti@cnuce.cnr.it
 ;; Keywords: wp, hypermedia, comm, languages
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 8611b735ba9..9c91d27b944 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2019 Free
 ;; Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tex
 ;; Contributions over the years by William F. Schelter, Dick King,
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 5a54e0d2d17..4110dfb8e8e 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint, tex, docs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 54306d2b74c..71cdcab57ef 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -5,6 +5,7 @@
 ;; Author: Robert J. Chassell
 ;; Date:   [See date below for texinfo-version]
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint, tex, docs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 4f49c7f5d17..134f82b14e0 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1989-1992, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Robert J. Chassell
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint, tex, docs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index ac292e463b1..e676a5dae20 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1992, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Package: emacs
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index 8c904f5d0ec..e0bfd24557b 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index e0184a7ccb3..60a20e2d188 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1991-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions, matching, mouse
 ;; Created: Thu Mar 28 13:48:23 1991
diff --git a/lisp/thread.el b/lisp/thread.el
index 3242d1dade6..e8f3cc7da6a 100644
--- a/lisp/thread.el
+++ b/lisp/thread.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 ;; Author: Gemini Lasswell <gazally@runbox.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: thread, tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index dd0491a66a3..6a17a756548 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: Multimedia
 ;; This file is part of GNU Emacs.
diff --git a/lisp/time.el b/lisp/time.el
index c2f60d31bd4..35157c5e807 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -3,6 +3,8 @@
 ;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/tmm.el b/lisp/tmm.el
index bb96b5a46a0..44f04eab87b 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1994-1996, 2000-2019 Free Software Foundation, Inc.
 ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index e42818218e0..37ebb5cbe7c 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 29612b36c20..3dd9e341351 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Dick King <king@reasoning.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Created: 15 May 86
 ;; Package: emacs
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index dba313453ff..a4cf0f0ec01 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc.
 ;; Author: Bill Perry <wmperry@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: url, vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 00d784a9b40..54360840784 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1997-1998, 2004-2019 Free Software Foundation, Inc.
 ;; Author: Bill Perry <wmperry@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, data, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index a11f5147afc..00803a103a0 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1999, 2001, 2004-2019 Free Software Foundation, Inc.
 ;; Author: Bill Perry <wmperry@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, data, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index dbcc9a6168c..a46e7bb3855 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Bill Perry <wmperry@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, data, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/url/url.el b/lisp/url/url.el
index eafac8a1929..5242d42f04c 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author: Bill Perry <wmperry@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, data, processes, hypermedia
 ;; This file is part of GNU Emacs.
diff --git a/lisp/userlock.el b/lisp/userlock.el
index c4178ac42af..f077bc9ad62 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -4,6 +4,7 @@
 ;; Author: Richard King
 ;; (according to authors.el)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 5cd4f46ed58..f9efd44c5c7 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2019 Free
 ;; Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 2811d4691b7..02c08af8b20 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience files vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index bee36592a1a..523be87bc49 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -5,6 +5,7 @@
 ;; Author: Frank Bresz
 ;; (according to authors.el)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, vc, tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 15f234fda62..84838135fcc 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author:     Martin Lorentzson  <emwson@emw.ericsson.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; Package: vc
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 3ab8c496408..ee1646cae5a 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -4,6 +4,7 @@
 ;; Author: Dave Love <fx@gnu.org>
 ;;         Riccardo Murri <riccardo.murri@gmail.com>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; Created: Sept 2006
 ;; Package: vc
diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el
index 37c71f98641..f05e8efff90 100644
--- a/lisp/vc/vc-filewise.el
+++ b/lisp/vc/vc-filewise.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index f1b603b2a93..876d824ceac 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 ;; Author: Ivan Kanis
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; Package: vc
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 1871e1e95c5..07b3d86b518 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index ee227b19a39..598e98250ac 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 0d27528e515..4e9f5a025fb 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index b708cd41a79..f8475925b02 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index d9fb8290d2b..b992a8ebe09 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1992-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Author:     FSF (see below for full credits)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 7673d9b7b86..3e8b6ee838e 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -4,6 +4,7 @@
 ;; Inc.
 ;; Author:   Peter Stephenson <pws@ibmth.df.unipi.it>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: virtual cursor, convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/version.el b/lisp/version.el
index d5bc3eb984a..d13d8c31e80 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/view.el b/lisp/view.el
index c8d5f0de205..e74ce1e8888 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -4,6 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: K. Shane Hartman
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index 6678f49dfcf..d7b5f0a803e 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware
 ;; This file is part of GNU Emacs.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 713c8575c7d..b9f98cdc4c7 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; Package: emacs
diff --git a/lisp/window.el b/lisp/window.el
index 7e6a48460e5..2c9d177d0a2 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1989, 1992-1994, 2000-2019 Free Software
 ;; Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/woman.el b/lisp/woman.el
index 57354478fb0..39d9b806d27 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, unix
 ;; Adapted-By: Eli Zaretskii <eliz@gnu.org>
 ;; Version: 0.551
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 31d409c8389..e4e2dec3b82 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: window, drag, drop
 ;; Package: emacs
diff --git a/test/lisp/emacs-lisp/map-tests.el b/test/lisp/emacs-lisp/map-tests.el
index 5e044d4be81..a54af8059b3 100644
--- a/test/lisp/emacs-lisp/map-tests.el
+++ b/test/lisp/emacs-lisp/map-tests.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 ;; Author: Nicolas Petton <nicolas@petton.fr>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el
index 8f66ba4f92f..ef05e2b389d 100644
--- a/test/lisp/emacs-lisp/seq-tests.el
+++ b/test/lisp/emacs-lisp/seq-tests.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 ;; Author: Nicolas Petton <nicolas@petton.fr>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/thunk-tests.el b/test/lisp/emacs-lisp/thunk-tests.el
index 69bfc196383..caa2c415460 100644
--- a/test/lisp/emacs-lisp/thunk-tests.el
+++ b/test/lisp/emacs-lisp/thunk-tests.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 ;; Author: Nicolas Petton <nicolas@petton.fr>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el
index 2e9483074e0..e31ac6a4d48 100644
--- a/test/lisp/help-fns-tests.el
+++ b/test/lisp/help-fns-tests.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/md4-tests.el b/test/lisp/md4-tests.el
index 56b09c14de5..9712411419a 100644
--- a/test/lisp/md4-tests.el
+++ b/test/lisp/md4-tests.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 ;; Author: Mark Oteiza <mvoteiza@udel.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/org/org-tests.el b/test/lisp/org/org-tests.el
index 33f9e459464..4b82aa8382f 100644
--- a/test/lisp/org/org-tests.el
+++ b/test/lisp/org/org-tests.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/soundex-tests.el b/test/lisp/soundex-tests.el
index 4de45f9d53a..d8d79b85cea 100644
--- a/test/lisp/soundex-tests.el
+++ b/test/lisp/soundex-tests.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el
index d809b64634f..676d461076b 100644
--- a/test/lisp/vc/diff-mode-tests.el
+++ b/test/lisp/vc/diff-mode-tests.el
@@ -1,6 +1,7 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 ;; Author: Dima Kogan <dima@secretsauce.net>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/vc/smerge-mode-tests.el b/test/lisp/vc/smerge-mode-tests.el
index 67f64689220..032afa9dc24 100644
--- a/test/lisp/vc/smerge-mode-tests.el
+++ b/test/lisp/vc/smerge-mode-tests.el
@@ -1,5 +1,7 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index 04c869ed935..8fa16cdccb1 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 ;; Author: Glenn Morris <rgm@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/vc/vc-hg-tests.el b/test/lisp/vc/vc-hg-tests.el
index 7fc84610a01..1bdc3204c03 100644
--- a/test/lisp/vc/vc-hg-tests.el
+++ b/test/lisp/vc/vc-hg-tests.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/xdg-tests.el b/test/lisp/xdg-tests.el
index b8bd606ec11..1b678a0abbf 100644
--- a/test/lisp/xdg-tests.el
+++ b/test/lisp/xdg-tests.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 ;; Author: Mark Oteiza <mvoteiza@udel.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index f257910877b..d813642f780 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 ;; Author: Eli Zaretskii
+;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 ;; This program is free software: you can redistribute it and/or modify
diff --git a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
index 30ad34099b7..250aeb1cf26 100644
--- a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
+++ b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
@@ -4,6 +4,7 @@
 ;; Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools
 ;; This file is part of GNU Emacs.
diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el
index d92ebcbeab5..f1d1110283d 100644
--- a/test/src/lcms-tests.el
+++ b/test/src/lcms-tests.el
@@ -2,6 +2,8 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software: you can redistribute it and/or modify
author	Paul Eggert	2019-05-25 13:43:06 -0700
committer	Paul Eggert	2019-05-25 14:25:18 -0700
commit	f744797af1dd73a547dd204d7e79f084e6508517 (patch)
tree	880520a7ce5a72a9cdcfd17a287e0129f3a98685
parent	2843945c5fb7179b96bdab71528f57b2e4a30517 (diff)
download	emacs-f744797af1dd73a547dd204d7e79f084e6508517.tar.gz emacs-f744797af1dd73a547dd204d7e79f084e6508517.zip