Fixes for "Maintainer:" and related lines

Mostly, this just removes "Maintainer: emacs-devel@gnu.org" lines, which are not that useful. It also cleans up and regularizes a few similar lines.
author: Paul Eggert 2019-05-19 21:29:13 -0700
committer: Paul Eggert 2019-05-19 21:34:27 -0700
commit: bef1be873009d6e9f5a097396179f63a565bb6fd (patch)
tree: 227e495b83b50b965c65f26b3bb979e877726530 /lisp
parent: 20241e2c764263ebf31cfb0c6a7a0d3b9ba52429 (diff)
download: emacs-bef1be873009d6e9f5a097396179f63a565bb6fd.tar.gz
emacs-bef1be873009d6e9f5a097396179f63a565bb6fd.zip
339 files changed, 42 insertions, 360 deletions
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3c88ec661a9..be19da525ea 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -3,7 +3,6 @@
 ;; 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 443237b451b..aeb845a5613 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -3,7 +3,6 @@
 ;; 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 2fffe0197e8..28635d18af1 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -3,7 +3,6 @@
 ;; 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 f7ecfe27bb1..c2ebea70083 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -6,7 +6,6 @@
 ;; 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 744bcc36a85..4f09d583d74 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -3,7 +3,6 @@
 ;; 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 cd9524a440b..c564da251b5 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -2,7 +2,6 @@
 ;; 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 5f889866361..c8cd25caff7 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -3,7 +3,6 @@
 ;; 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 c27e772b044..7474d633236 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -3,7 +3,6 @@
 ;; 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 752e59b5d49..36f72ef0510 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -3,7 +3,6 @@
 ;; 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/cedet.el b/lisp/cedet/cedet.el
index b3d4a5def2e..9260cfb47dc 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
+;; Maintainer: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 2.0
 ;; Keywords: OO, lisp
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 0fb9eca7536..15ab50c72ac 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Maintainer: Eric Ludlam
+;; Maintainer: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 2462662bbd8..79bb4b20ee3 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -3,7 +3,6 @@
 ;; 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/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index c530329baed..c5849ffc973 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -2,8 +2,8 @@
 ;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
-;; Author: Richard Kim  <emacs18@gmail.com>
+;; Author: Richard Kim <emacs18@gmail.com>
-;; Maintainer: Richard Kim  <emacs18@gmail.com>
+;; Maintainer: Richard Kim <emacs18@gmail.com>
 ;; Created: June 2002
 ;; Keywords: syntax
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index e61bc3edc6a..426b1a9f844 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -2,7 +2,6 @@
 ;; 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 59bdc00c674..9c29bb7c432 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -3,7 +3,6 @@
 ;; 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 ed6f1bfb1ad..f949a8c1098 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -4,7 +4,6 @@
 ;; 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 d21cc1378f7..3939371ab85 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -4,7 +4,6 @@
 ;; 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 89285c74d41..ff392dd8219 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -3,7 +3,6 @@
 ;; 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/composite.el b/lisp/composite.el
index d2df3d1e922..87f563030bd 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -7,7 +7,7 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Author: Kenichi HANDA <handa@etl.go.jp>
+;; Author: Kenichi Handa <handa@gnu.org>
 ;; (according to ack.texi)
 ;; Keywords: mule, multilingual, character composition
 ;; Package: emacs
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 6d47e607ae6..e65f19dd2e1 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3,7 +3,6 @@
 ;; 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 bc9d1d4f7d6..9846aa8d99d 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -3,7 +3,6 @@
 ;; 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 29bf9e570a8..e2bf8718b62 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -4,7 +4,6 @@
 ;; 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 2159f96028f..f1fae18e74b 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -6,7 +6,6 @@
 ;; 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 8f71bc65191..a815b91c015 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -4,7 +4,6 @@
 ;; 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 8be2b94458a..2976b788f0a 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -3,7 +3,6 @@
 ;; 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 aae521287e3..305cfd4f321 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -4,7 +4,6 @@
 ;; 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 ea1943de1db..f137d4a5be0 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4,7 +4,6 @@
 ;; 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 4a597506774..f1676bbfa3a 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -5,7 +5,6 @@
 ;; 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 6d5f5a9f894..ec89adea218 100644
--- a/lisp/display-fill-column-indicator.el
+++ b/lisp/display-fill-column-indicator.el
@@ -2,7 +2,6 @@
 ;; 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 d38f2e69635..ac01112215e 100644
--- a/lisp/display-line-numbers.el
+++ b/lisp/display-line-numbers.el
@@ -2,7 +2,6 @@
 ;; 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 459a7238dcd..82bb7c9ef86 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -3,7 +3,6 @@
 ;; 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 c575dd413fc..bffd54006de 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -3,7 +3,6 @@
 ;; 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 53de20b853a..0bf10133c24 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -2,7 +2,6 @@
 ;; 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 cf1a8d3b73c..ea530f991a7 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -3,7 +3,6 @@
 ;; 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 6543e5f1978..ddfad25a382 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -4,7 +4,6 @@
 ;; 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 e932daf2f01..8006d7bcd95 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -3,7 +3,6 @@
 ;; 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 2a24c9857c2..8fc8e1f15af 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -4,7 +4,6 @@
 ;; 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 07da2f1d9e7..1f4c132f922 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -4,7 +4,6 @@
 ;; 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 2034f33d0e6..dfd6d2e5b8f 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3,7 +3,6 @@
 ;; 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 d2a3a131d16..a1739562f6f 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -6,7 +6,6 @@
 ;;         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 5e72dc3b400..344a0ba8f61 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -4,7 +4,6 @@
 ;; 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 44cca6136c0..02a9749f47a 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -4,7 +4,6 @@
 ;; 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 842d1d48b45..811b485dc6f 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -4,7 +4,6 @@
 ;; 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 e76baf5ed0d..95e287c806c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5,7 +5,6 @@
 ;; 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 58ca9d5f57e..21af4b6e631 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -3,7 +3,6 @@
 ;; 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 10af440008d..ea6efbf851d 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -4,7 +4,6 @@
 ;; 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 8989aa07196..259f240d297 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -3,7 +3,6 @@
 ;; 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 6db0584b987..9f7beeaef51 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -5,7 +5,6 @@
 ;; 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 3fc22247fa6..ed3c1fbaa94 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -4,7 +4,6 @@
 ;; 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 ab5553b4e83..b8da76ccf0b 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4,7 +4,6 @@
 ;; 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/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 188d99e14cb..23f303bc28a 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 ;; Author: Noah Friedman <friedman@splode.com>
-;; Maintainer: friedman@splode.com
+;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: extensions
 ;; Created: 1995-10-06
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index f0dcb51af89..1f8d31a3fcc 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -4,7 +4,6 @@
 ;; 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/ewoc.el b/lisp/emacs-lisp/ewoc.el
index c33b46501ff..597afdd66f2 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -4,7 +4,7 @@
 ;; Author: Per Cederqvist <ceder@lysator.liu.se>
 ;;      Inge Wallin <inge@lysator.liu.se>
-;; Maintainer: monnier@gnu.org
+;; Maintainer: Stefan Monnier <monnier@gnu.org>
 ;; Created: 3 Aug 1992
 ;; Keywords: extensions, lisp
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 54c8afe62b4..6ee378e8528 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -2,7 +2,6 @@
 ;; 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 d1bd46fb584..4a84cfa3e2d 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -3,7 +3,6 @@
 ;; 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 91c76158a31..81adbd5d4f1 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -4,7 +4,6 @@
 ;; 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 fa6dc98d04c..021708c588a 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -2,7 +2,6 @@
 ;; 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 38df920f17a..f653f6c1099 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -3,7 +3,6 @@
 ;; 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 a688330b74a..e8337a99c80 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -3,7 +3,6 @@
 ;; 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 54e802edf4f..774df3f84e7 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -8,8 +8,6 @@
 ;; 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 00f72e284ad..2753bbd5482 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -3,7 +3,6 @@
 ;; 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 c7d0268a77f..91c043fb3fb 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -2,7 +2,6 @@
 ;; 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 6d1adae9749..4c90f47c914 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -2,8 +2,6 @@
 ;; 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 fdd24317c6a..9d9028d87d5 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -3,7 +3,6 @@
 ;; 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 3413cd1513c..8997b7501b2 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -7,8 +7,6 @@
 ;; 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 b9ffe6a6fc6..33445835aed 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -2,7 +2,6 @@
 ;; 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 f1904e64efb..f488bed3b0e 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -2,7 +2,6 @@
 ;; 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/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 29b481849e2..8d2f8217c61 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -2,8 +2,8 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
-;; Author: Jonathan Yavner <jyavner@engineer.com>
+;; Author: Jonathan Yavner <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
+;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: spreadsheet lisp utility
 ;; Package: testcover
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 571f53c7957..daae3ad43bc 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -2,8 +2,8 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
-;; Author: Jonathan Yavner <jyavner@engineer.com>
+;; Author: Jonathan Yavner <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
+;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: safety lisp utility
 ;; Package: testcover
diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el
index e1370c45911..968dc71f678 100644
--- a/lisp/emacs-lisp/thunk.el
+++ b/lisp/emacs-lisp/thunk.el
@@ -7,8 +7,6 @@
 ;; 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 55aa56b72e0..3a791c2af44 100644
--- a/lisp/emacs-lisp/timer-list.el
+++ b/lisp/emacs-lisp/timer-list.el
@@ -2,7 +2,6 @@
 ;; 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 22ccc35103a..668da42a6ef 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -2,7 +2,6 @@
 ;; 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 4249305feee..ca2d2a23c75 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -4,7 +4,6 @@
 ;; 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 2f271c1f708..0a8351195f1 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -3,7 +3,6 @@
 ;; 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 13ca605dd00..70d6b077ebc 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -2,7 +2,6 @@
 ;; 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 0cded29193a..05b4c010f68 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -4,7 +4,6 @@
 ;; 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 5a4130eb3be..30b63a8e552 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -2,7 +2,6 @@
 ;; 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 9e224e0b828..298cffb49ae 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -3,7 +3,6 @@
 ;; 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 210830a2b49..eb441c29b41 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -4,7 +4,6 @@
 ;; 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 c8aa887a652..8e2a6b980d0 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -3,7 +3,6 @@
 ;; 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 210a7736cc0..3d99c259aad 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -2,8 +2,6 @@
 ;; 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 e724e367ab1..3b362774b6b 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -3,7 +3,6 @@
 ;; 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 a6b7532e1f3..b835191960e 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -6,7 +6,6 @@
 ;; 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 a2c9336826a..5784e63d7f8 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -3,7 +3,6 @@
 ;; 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 934b52a938c..ef876f464e3 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -4,7 +4,6 @@
 ;; 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 884c594b9ed..0d16aaf5412 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -3,7 +3,6 @@
 ;; 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 149c858d2e8..ce0104b3054 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -3,7 +3,6 @@
 ;; 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 d95e0eac0c7..96b45899b49 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -3,7 +3,6 @@
 ;; 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 08f52f13647..e40dc1fc250 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -4,7 +4,6 @@
 ;; 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 896521eaf0a..18cc8b54252 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -3,7 +3,6 @@
 ;; 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 f0dbe69f791..765898da7b9 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -3,7 +3,6 @@
 ;; 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 d8d9e17c95a..6a2ba785ba4 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -3,7 +3,6 @@
 ;; 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 4153f5c57bd..fc12dc73ef5 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -3,7 +3,6 @@
 ;; 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 cc4b4a88f11..98ddebd0cfc 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -3,7 +3,6 @@
 ;; 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 8173829797b..e13404ca133 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -3,7 +3,6 @@
 ;; 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 87c3a61b663..252af715d72 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -3,7 +3,6 @@
 ;; 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 eca8ad6a899..e92da7b7253 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -3,7 +3,6 @@
 ;; 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 45dae899900..9bd062a98d6 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -3,7 +3,6 @@
 ;; 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 cb57883ae6f..4e7fed7b403 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -2,8 +2,6 @@
 ;; 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 dd2da85d0e8..e2489a8d0ee 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -3,7 +3,6 @@
 ;; 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 2e0e54a030f..e1c495c9036 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -4,7 +4,6 @@
 ;; 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 5459d8b01e5..54f91d134cb 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -3,7 +3,6 @@
 ;; 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 886ba60eb47..f500f4c1278 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -2,8 +2,6 @@
 ;; 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 34f7ce62c74..38e0b2885bb 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -2,8 +2,6 @@
 ;; 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 0a1e38fe248..833ad2f1e78 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -4,7 +4,6 @@
 ;; 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 69a83fa032b..8df7ea9e4c1 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -3,7 +3,6 @@
 ;; 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 860fdbb77ce..541c67a74fb 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -3,7 +3,6 @@
 ;; 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 e51e6056fb9..14e86c199a2 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -3,7 +3,6 @@
 ;; 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 04174295520..73c7316b346 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -3,7 +3,6 @@
 ;; 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 162b22e15c6..20a91b7a30d 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -3,7 +3,6 @@
 ;; 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 d1fa5c7f120..fc0f6128f6f 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -10,7 +10,6 @@
 ;;               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 0c4d343090c..7eaf7fdab05 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -3,7 +3,6 @@
 ;; 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 89b598669c9..137ce99d5e6 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2,7 +2,6 @@
 ;; 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 08f72089450..4e91a7affaf 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -3,7 +3,6 @@
 ;; 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 b71e9204f32..0d156db0e62 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -3,7 +3,6 @@
 ;; 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 1dec0ed7ca9..21fa6143e3d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2,7 +2,6 @@
 ;; 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 b74b4a8a400..05c30dedf40 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -3,7 +3,6 @@
 ;; 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 ef137be9bbf..578f7653628 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -5,7 +5,6 @@
 ;; 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 87314086a4a..f93d2a02d74 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -1,7 +1,6 @@
 ;;; 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 e92b6b4df2e..0b95efaf041 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -4,7 +4,6 @@
 ;; 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 3ef88fe686a..2eae65a7928 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -3,7 +3,6 @@
 ;; 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 acc2b26c550..47e7aa4cd5e 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -4,7 +4,6 @@
 ;; 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 6b26f0cb92e..da6c91bca5e 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -2,7 +2,6 @@
 ;; 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 3991a4ee8ef..b0e4598bac7 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -5,7 +5,6 @@
 ;; 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 a8c230cb7b2..8e0738f31c0 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -3,7 +3,6 @@
 ;; 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 92387a21571..632efa81a8d 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -3,7 +3,6 @@
 ;; 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 50d69e70de4..9d997368074 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -3,7 +3,6 @@
 ;; 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 a16d1e34b43..9c90d6da148 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -3,7 +3,6 @@
 ;; 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 6cc3f0d4f71..304c45dad3c 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -3,7 +3,6 @@
 ;; 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 42ff3755650..0677368a4d6 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -3,7 +3,6 @@
 ;; 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 ee5a9c0fce2..df501dfc68f 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -4,7 +4,6 @@
 ;; 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 404f448e0d2..17d3dc7d8d7 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -3,7 +3,6 @@
 ;; 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 1c09bc26f68..e4fef214d65 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -3,7 +3,6 @@
 ;; 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/icomplete.el b/lisp/icomplete.el
index 10fd3a698c5..698025e5504 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1992-1994, 1997, 1999, 2001-2019 Free Software
 ;; Foundation, Inc.
-;; Author: Ken Manheimer <klm@i.am>
+;; Author: Ken Manheimer <ken dot manheimer at gmail...>
-;; Maintainer: Ken Manheimer <klm@i.am>
+;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Created: Mar 1993 Ken Manheimer, klm@nist.gov - first release to usenet
 ;; Keywords: help, abbrev
diff --git a/lisp/ielm.el b/lisp/ielm.el
index c7a31a23e68..1531415e741 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -3,7 +3,6 @@
 ;; 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 e51108ee28f..17b715a66b9 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -3,7 +3,6 @@
 ;; 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 db113020866..6cc2cc39027 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -2,7 +2,6 @@
 ;; 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 5084fe61eff..6e16e131835 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -4,7 +4,6 @@
 ;; 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 bf87d6af760..1dbece73d6e 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -2,7 +2,6 @@
 ;; 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 c211887a39a..61803950d18 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2,7 +2,6 @@
 ;; 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 8108ffe42af..246b3b979b5 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -2,7 +2,6 @@
 ;; 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/isearch-x.el b/lisp/international/isearch-x.el
index 6c2a2dc9b99..c12e7b39a8d 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -8,8 +8,8 @@
 ;; Keywords: i18n, multilingual, isearch
-;; Author: Kenichi HANDA <handa@etl.go.jp>
+;; Author: Kenichi Handa <handa@gnu.org>
-;; Maintainer: Kenichi HANDA <handa@etl.go.jp>
+;; Maintainer: Kenichi Handa <handa@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 395e6c4dcd0..b317b8aad7f 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -4,7 +4,6 @@
 ;; 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 b573e1e47c5..14da02c73d9 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -4,7 +4,6 @@
 ;; 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 543f2e33888..fd68137f2b3 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -4,7 +4,6 @@
 ;; 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/quail.el b/lisp/international/quail.el
index 3266b93b446..2683118aafe 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -6,9 +6,9 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Author: Kenichi HANDA <handa@etl.go.jp>
+;; Author: Kenichi Handa <handa@gnu.org>
-;;         Naoto TAKAHASHI <ntakahas@etl.go.jp>
+;;         Naoto Takahashi <ntakahas@etl.go.jp>
-;; Maintainer: Kenichi HANDA <handa@etl.go.jp>
+;; Maintainer: Kenichi Handa <handa@gnu.org>
 ;; Keywords: mule, multilingual, input method, i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/international/utf7.el b/lisp/international/utf7.el
index 0e67a62aa6b..f22fb8d38bc 100644
--- a/lisp/international/utf7.el
+++ b/lisp/international/utf7.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 ;; Author: Jon K Hellan <hellan@acm.org>
-;; Maintainer: bugs@gnus.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index bb29c2914be..5aaeae438a3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -3,7 +3,6 @@
 ;; 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 ee392b349e8..dc1836865b5 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -3,7 +3,6 @@
 ;; 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 3aa84f45b0d..b6ff9f12f1e 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -4,7 +4,6 @@
 ;; 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 63fb449b48b..8c9dd8abb63 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -4,7 +4,6 @@
 ;; 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 f6ed1fbda1c..77c2cbd4d60 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -3,7 +3,6 @@
 ;; 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/language/cyrillic.el b/lisp/language/cyrillic.el
index 75d4249423c..564ac5f5921 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -9,7 +9,7 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
-;; Author: Kenichi Handa <handa@etl.go.jp>
+;; Author: Kenichi Handa <handa@gnu.org>
 ;; Keywords: multilingual, Cyrillic, i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 8c38175972f..fedbca4eb69 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -525,7 +525,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ.")))
    (set-case-syntax ?ı "w" table)))
 ;; Polish ISO 8859-2 environment.
-;; Maintainer: Wlodek Bzyl <matwb@univ.gda.pl>
+;; Maintainer: Włodek Bzyl <matwb@univ.gda.pl>
 ;; Keywords: multilingual, Polish
 (set-language-info-alist
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index d63e9b465fa..894a01502c6 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -5,7 +5,7 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Maintainer:  Kenichi Handa <handa@m17n.org>
+;; Maintainer:  Kenichi Handa <handa@gnu.org>
 ;;              KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords:    multilingual, i18n, Indian
diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el
index e67dd093430..94c6ab98979 100644
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -4,7 +4,7 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Author: Kenichi HANDA <handa@etl.go.jp>
+;; Author: Kenichi Handa <handa@gnu.org>
 ;; Keywords: thai, word break, emacs
diff --git a/lisp/leim/quail/py-punct.el b/lisp/leim/quail/py-punct.el
index eed70a82eec..49ea66effbb 100644
--- a/lisp/leim/quail/py-punct.el
+++ b/lisp/leim/quail/py-punct.el
@@ -6,7 +6,7 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Author: Ken'ichi HANDA <handa@etl.go.jp>
+;; Author: Ken'ichi Handa <handa@gnu.org>
 ;; Keywords: multilingual, input method, Chinese
diff --git a/lisp/leim/quail/pypunct-b5.el b/lisp/leim/quail/pypunct-b5.el
index 45597a4ef6f..9f4e73c9f05 100644
--- a/lisp/leim/quail/pypunct-b5.el
+++ b/lisp/leim/quail/pypunct-b5.el
@@ -5,7 +5,7 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Author: Ken'ichi HANDA <handa@etl.go.jp>
+;; Author: Ken'ichi Handa <handa@gnu.org>
 ;; Keywords: multilingual, input method, Chinese
diff --git a/lisp/linum.el b/lisp/linum.el
index 0b4b0083ed6..6fe30571c60 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -3,7 +3,6 @@
 ;; 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 4e5d8e0f38d..69f2c0bdcc3 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -3,7 +3,6 @@
 ;; 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 67e8aa7d40a..c43d1476229 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -3,7 +3,6 @@
 ;; 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 436f9e3e021..17a37f15544 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -3,7 +3,6 @@
 ;; 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 1f2c46834ec..7ab97ebffee 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -4,7 +4,6 @@
 ;; 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 4b38506d8a5..b9020a299a5 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -3,7 +3,6 @@
 ;; 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 62094bfe2d7..2a2ff3dec14 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -2,7 +2,6 @@
 ;; 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 c637e242c42..2cd6d56b429 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 ;; Author: K. Shane Hartman
-;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint mail
 ;; Package: emacs
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index a90d9c46578..180e32bee4c 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1657,7 +1657,7 @@ local gurus."
 (declare-function smtp-via-smtp "ext:smtp" (sender recipients smtp-text-buffer))
 (defvar smtp-server)
-;; FLIM's smtp.el pointed out to me by Kenichi Handa <handa@etl.go.jp>
+;; FLIM's smtp.el pointed out to me by Kenichi Handa <handa@gnu.org>
 (defun feedmail-buffer-to-smtp (prepped errors-to addr-listoid)
  "Function which actually calls smtp-via-smtp to send buffer as e-mail."
  (feedmail-say-debug ">in-> feedmail-buffer-to-smtp %s" addr-listoid)
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 60689529974..ec17d669f3c 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -3,7 +3,6 @@
 ;; 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 c1e90c3dcb8..e6108066656 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -4,7 +4,6 @@
 ;; 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 cbcbdfaeb2e..f561c088a2f 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -2,7 +2,6 @@
 ;; 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 d59df88c688..17f4f0cba0c 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -4,7 +4,6 @@
 ;; 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 42896c18ebe..68e44f820c7 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -3,7 +3,6 @@
 ;; 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 10db110c70f..3172c9760f7 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -3,7 +3,6 @@
 ;; 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 a53a77e47ee..4cf624cedd5 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -4,7 +4,6 @@
 ;; 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 91291b8d330..d0ebf7df479 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3,7 +3,6 @@
 ;; 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 01d552469fa..a9ce1e6feee 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -2,7 +2,6 @@
 ;; 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 9427796a065..ee71ab4f6e4 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -3,7 +3,6 @@
 ;; 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 af528135ccb..d32147f4af2 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -4,7 +4,6 @@
 ;; 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 ba0c2ae77c7..4c429358995 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -2,7 +2,6 @@
 ;; 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 12d37615d6b..d95670849de 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -3,7 +3,6 @@
 ;; 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 4a701038ac8..18185ec6473 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -4,7 +4,6 @@
 ;; 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 79a322c1d91..80cfbfd721a 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -3,7 +3,6 @@
 ;; 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 208ebb68017..0db05570833 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -3,7 +3,6 @@
 ;; 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 ad69dca8c43..317324613b9 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -3,7 +3,6 @@
 ;; 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 bbf3c83c55f..499f16e9d23 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -3,7 +3,6 @@
 ;; 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 4d9ad67262a..c409210a0c3 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -2,7 +2,6 @@
 ;; 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 10ad78ea174..847e304e975 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -2,7 +2,6 @@
 ;; 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 d52ca2156d2..feb0e09ab18 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -4,7 +4,6 @@
 ;; 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 4ff60ed9910..d12cdd731ab 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -3,7 +3,6 @@
 ;; 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 4cf6cadf650..00807627007 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -2,7 +2,6 @@
 ;; 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 8428c1e0139..af53c05f573 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2,7 +2,6 @@
 ;; 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 7a1a338fcc1..b626624fbc9 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -3,7 +3,6 @@
 ;; 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/mwheel.el b/lisp/mwheel.el
index 23f491db0fc..86788fc69a3 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -1,7 +1,7 @@
 ;;; mwheel.el --- Wheel mouse support
 ;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
-;; Maintainer: William M. Perry <wmperry@gnu.org>
+;; Maintainer: Bill Perry <wmperry@gnu.org>
 ;; Keywords: mouse
 ;; Package: emacs
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index b0a1e1799f5..81b654c9a9a 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4,7 +4,6 @@
 ;; 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 aa31e25fa91..0c63cbd5a45 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -3,7 +3,6 @@
 ;; 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 c25d7873918..d7fd0587475 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -3,7 +3,6 @@
 ;; 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 75fc7d62211..2df473cf71a 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -3,7 +3,6 @@
 ;; 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 599e2305f77..19114508254 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -3,7 +3,6 @@
 ;; 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/socks.el b/lisp/net/socks.el
index 6356707a1db..c9f74190957 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996-2000, 2002, 2007-2019 Free Software Foundation,
 ;; Inc.
-;; Author: William M. Perry <wmperry@gnu.org>
+;; Author: Bill Perry <wmperry@gnu.org>
 ;;         Dave Love <fx@gnu.org>
 ;; Keywords: comm, firewalls
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index cf3634f7d92..465927dfdde 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -4,7 +4,6 @@
 ;; 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/newcomment.el b/lisp/newcomment.el
index ab2be080a33..ac706b949ba 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 ;; Author: code extracted from Emacs-20's simple.el
-;; Maintainer: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Maintainer: Stefan Monnier <monnier@gnu.org>
 ;; Keywords: comment uncomment
 ;; Package: emacs
diff --git a/lisp/novice.el b/lisp/novice.el
index 3da4e25810a..1da4b71dc95 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -3,7 +3,6 @@
 ;; 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 c83d5d47241..fbab506cce3 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -2,7 +2,6 @@
 ;; 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 e2bf14f0dc1..dfd7b2b492f 100644
--- a/lisp/obsolete/abbrevlist.el
+++ b/lisp/obsolete/abbrevlist.el
@@ -3,7 +3,6 @@
 ;; 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 fba54c1ae04..8044a0ef931 100644
--- a/lisp/obsolete/bruce.el
+++ b/lisp/obsolete/bruce.el
@@ -4,7 +4,6 @@
 ;; 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 5180d4527be..10af6ab95fd 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -3,7 +3,6 @@
 ;; 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 cfdc9dc67ce..24c9b67abd2 100644
--- a/lisp/obsolete/gs.el
+++ b/lisp/obsolete/gs.el
@@ -2,7 +2,6 @@
 ;; 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 bdb3406a3d9..373ee35d8e0 100644
--- a/lisp/obsolete/gulp.el
+++ b/lisp/obsolete/gulp.el
@@ -3,7 +3,6 @@
 ;; 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 b64e84003fc..e520faf77bb 100644
--- a/lisp/obsolete/info-edit.el
+++ b/lisp/obsolete/info-edit.el
@@ -2,7 +2,6 @@
 ;; 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 44f8528b201..51679280023 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -3,7 +3,6 @@
 ;; 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 6383a4266d1..91efa29320f 100644
--- a/lisp/obsolete/ledit.el
+++ b/lisp/obsolete/ledit.el
@@ -2,7 +2,6 @@
 ;; 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 714b3fbb761..f2b081d672d 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -2,7 +2,6 @@
 ;; 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 d1b702ed556..9d0c5daf5ef 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -2,7 +2,6 @@
 ;; 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 2f74faf1d6c..33cc43ccbe2 100644
--- a/lisp/obsolete/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -6,7 +6,6 @@
 ;; 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 81739dfa6cb..190db94f4b9 100644
--- a/lisp/obsolete/meese.el
+++ b/lisp/obsolete/meese.el
@@ -5,7 +5,6 @@
 ;; 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 6d1a456d61a..4908b51259c 100644
--- a/lisp/obsolete/pc-mode.el
+++ b/lisp/obsolete/pc-mode.el
@@ -2,7 +2,6 @@
 ;; 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 dfa80097b35..53537a09066 100644
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -3,7 +3,6 @@
 ;; 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 884cd3e4e45..ba36f2dcdad 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -3,7 +3,6 @@
 ;; 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 6bd42789253..752ebf59d81 100644
--- a/lisp/obsolete/sup-mouse.el
+++ b/lisp/obsolete/sup-mouse.el
@@ -3,7 +3,6 @@
 ;; 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 ce6f2309fd3..d0631b32f04 100644
--- a/lisp/obsolete/terminal.el
+++ b/lisp/obsolete/terminal.el
@@ -4,7 +4,6 @@
 ;; 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 5cbb2ef21e3..eddb3f90296 100644
--- a/lisp/obsolete/yow.el
+++ b/lisp/obsolete/yow.el
@@ -2,7 +2,6 @@
 ;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
-;; Maintainer: emacs-devel@gnu.org
 ;; Author: Richard Mlynarik
 ;; Keywords: games
 ;; Obsolete-since: 24.4
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 74312bc20f8..9126647e7c3 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 ;; Author: David O'Toole <dto@gnu.org>
-;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
+;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: hypermedia, outlines, wp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/outline.el b/lisp/outline.el
index 74df77b8be7..7783d37e0a6 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -3,7 +3,6 @@
 ;; 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 13908d46eef..d00e7d9a812 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -3,7 +3,6 @@
 ;; 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 e461b37e362..fb310faf4c6 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -3,7 +3,6 @@
 ;; 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 a5880c08847..fc76f2b724d 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -2,7 +2,6 @@
 ;; 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 b1ab6703a48..e9c78f5e5c4 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -3,7 +3,6 @@
 ;; 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 6d5553b3202..562e5c0ad23 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -4,7 +4,6 @@
 ;; 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 d762290f0da..1f2e2c0098a 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -1,7 +1,6 @@
 ;;; 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 6cce1e5643d..7d9f1475f38 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -3,7 +3,6 @@
 ;; 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 d884c0a2559..c1394a31d7a 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -2,7 +2,6 @@
 ;; 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 ff1bf03e118..6d54f6d08a8 100644
--- a/lisp/play/studly.el
+++ b/lisp/play/studly.el
@@ -5,7 +5,6 @@
 ;; This file is part of GNU Emacs.
-;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;;; Commentary:
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index e01f1e8ecbe..50f7b4c0093 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -5,7 +5,7 @@
 ;; Author: Rolf Ebert      <ebert@inf.enst.fr>
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Emmanuel Briot  <briot@gnat.com>
-;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
+;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
 ;; Keywords: languages ada
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index c56d16e305e..491b780bd02 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -3,7 +3,6 @@
 ;; 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 1a67a95927b..ff4ea1a0901 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -4,7 +4,6 @@
 ;; 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 1a0d9bdbb70..3930f09392a 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -5,7 +5,6 @@
 ;; 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 ba007d67c0d..fd3eec76090 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -5,7 +5,6 @@
 ;; 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 d5803c77bb4..757f0f26072 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -3,7 +3,6 @@
 ;; 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 3faec4959bc..0f44487d436 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3,7 +3,6 @@
 ;; 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 cb1b17b4474..d62c1316ee3 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -2,7 +2,6 @@
 ;; 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 910c320ab8f..54ca135f277 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -4,7 +4,6 @@
 ;; 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 716f40c1f3a..e09aaa3741b 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3,7 +3,6 @@
 ;; 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 79178c4346e..d094c95fcfb 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -4,7 +4,6 @@
 ;; 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 4306f5daa02..f5680f263b6 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -4,7 +4,6 @@
 ;; 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 cffb749c3e8..c3ff23558c3 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -4,7 +4,6 @@
 ;; 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 a759709b5c8..1dd5d51df80 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -3,7 +3,6 @@
 ;; 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 aa412304c59..087d1f65fd3 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -2,7 +2,6 @@
 ;; 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 8a7e24e5ada..4d4e2e1cd45 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -4,7 +4,6 @@
 ;; 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 7cbd30a0d1d..f01d6b6bb2d 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -3,7 +3,6 @@
 ;; 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 2b057356b10..bd56d1a7c78 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -2,7 +2,6 @@
 ;; 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 188bc973d99..74e865bd0b8 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6,7 +6,6 @@
 ;; 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 853a3500ee1..8f52a366783 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -5,7 +5,6 @@
 ;; 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 ffb3d41ab62..31315e229e0 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -2,7 +2,6 @@
 ;; Copyright (C) 1994, 1998-2019 Free Software Foundation, Inc.
-;; Maintainer: emacs-devel@gnu.org
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;;    Chris Lindblad <cjl@lcs.mit.edu>
 ;; Keywords: languages tcl modes
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index 62c42d39c6f..7ae47126a5c 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -3,7 +3,6 @@
 ;; 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/ps-bdf.el b/lisp/ps-bdf.el
index be80b4a15b6..2e75e53fc26 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -9,7 +9,7 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
-;; Author: Kenichi Handa <handa@m17n.org>
+;; Author: Kenichi Handa <handa@gnu.org>
 ;; (according to ack.texi)
 ;; Keywords: wp, BDF, font, PostScript
 ;; Package: ps-print
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index 20631338902..d248556ccda 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;;      Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;; Maintainer: Kenichi Handa <handa@gnu.org> (multi-byte characters)
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index c88d6d26797..537ba9627d5 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;;      Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;; Maintainer: Kenichi Handa <handa@gnu.org> (multi-byte characters)
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript, multibyte, mule
 ;; Package: ps-print
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 59ac84a3639..d0d9cbe4481 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -5,8 +5,8 @@
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;      Jacques Duthen (was <duthen@cegelec-red.fr>)
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;;      Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;; Maintainer: Kenichi Handa <handa@gnu.org> (multi-byte characters)
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
 ;; Version: 7.3.5
@@ -1405,7 +1405,7 @@ Please send all bug fixes and enhancements to
 ;; prologue code suggestion, for odd/even printing suggestion and for
 ;; `ps-prologue-file' enhancement.
 ;;
-;; Thanks to Ken'ichi Handa <handa@m17n.org> for multi-byte buffer handling.
+;; Thanks to Ken'ichi Handa <handa@gnu.org> for multi-byte buffer handling.
 ;;
 ;; Thanks to Matthew O Persico <Matthew.Persico@lazard.com> for line number on
 ;; empty columns.
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index 784b4356b47..99c17c7293e 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -5,8 +5,8 @@
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;      Jacques Duthen (was <duthen@cegelec-red.fr>)
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;;      Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;; Maintainer: Kenichi Handa <handa@gnu.org> (multi-byte characters)
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/register.el b/lisp/register.el
index 775e1a2cc92..d3825fe8e2a 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -3,7 +3,6 @@
 ;; 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 9d1b7bf747d..00b8be53281 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -3,7 +3,6 @@
 ;; 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 22f9986efb5..0416845e9cf 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -4,7 +4,6 @@
 ;; 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 8f4044deac5..bdb2e4b5048 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -3,7 +3,6 @@
 ;; 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 fb3b7483397..84cba61aab5 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -3,7 +3,6 @@
 ;; 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 730d31ead25..960cace2069 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -3,7 +3,6 @@
 ;; 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 dc0df7ab3fe..4fc9df84609 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -2,7 +2,6 @@
 ;; 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 8281edb1720..72127321c99 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -3,7 +3,6 @@
 ;; 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 af6bf467e4a..a8adc168f95 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -2,7 +2,6 @@
 ;; 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 436a44a7e94..f692673d4f1 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -4,7 +4,6 @@
 ;; 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/ses.el b/lisp/ses.el
index 73157d6f5f0..7fdacc77c9c 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
-;; Maintainer: Vincent Belaïche  <vincentb1@users.sourceforge.net>
+;; Maintainer: Vincent Belaïche <vincentb1@users.sourceforge.net>
 ;; Keywords: spreadsheet Dijkstra
 ;; This file is part of GNU Emacs.
diff --git a/lisp/shell.el b/lisp/shell.el
index 53570272111..6e2ae85fcea 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -5,7 +5,6 @@
 ;; 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 4454791ad20..c0e8d58c80c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2,7 +2,6 @@
 ;; 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 bce73d6bfef..1d06b648a20 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -3,7 +3,6 @@
 ;; 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 6ea1c440605..86cb1804a39 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -4,7 +4,6 @@
 ;; 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 1f1f9caec3d..9e4c79769d0 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -3,7 +3,6 @@
 ;; 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 421a6ea37db..a88118e3b9a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -3,7 +3,6 @@
 ;; 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 9265b8a52ea..29daaa5690e 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -3,7 +3,6 @@
 ;; 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 05fb9fea68f..c97d9b96bd9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3,7 +3,6 @@
 ;; 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 14b292d4414..1f4be160f8e 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -1,7 +1,6 @@
 ;;; 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 37cd8fb2fdd..345771e19cd 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -2,7 +2,6 @@
 ;; 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 0b7d5db01e1..b5c77a9332c 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -2,7 +2,6 @@
 ;; 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 599da9ac807..c75fe7c3730 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -3,7 +3,6 @@
 ;; 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 b7a778fc004..d7fceb83085 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -2,7 +2,6 @@
 ;; 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 09275991cf5..c434ea6b9cb 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -4,7 +4,6 @@
 ;; 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 307586f2213..2718aecb9af 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -3,7 +3,6 @@
 ;; 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 7a5d3ef7758..de822326fb3 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -4,7 +4,6 @@
 ;; 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 c285491a305..46dbcfef460 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -3,7 +3,6 @@
 ;; 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 d18916dfd01..a06f8edd6f8 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -3,7 +3,6 @@
 ;; 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 ff3d2420df4..f351b870261 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -3,7 +3,6 @@
 ;; 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 f33d4df4d19..e5964d175dd 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -3,7 +3,6 @@
 ;; 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 220ef2d7fd6..bc92121599c 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -2,7 +2,6 @@
 ;; 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 92a6b907859..8a1af3af250 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -3,7 +3,6 @@
 ;; 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 b5208494674..0b508547314 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -3,7 +3,6 @@
 ;; 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 3ba52e61ea6..03b1b048a16 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -3,7 +3,6 @@
 ;; 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 f13e1d7161d..3d4d0d2b06e 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -3,7 +3,6 @@
 ;; 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 67ecd3ced81..efc11084fe6 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -3,7 +3,6 @@
 ;; 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 1b064fb825f..1826129f0b3 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -4,7 +4,6 @@
 ;; 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/table.el b/lisp/textmodes/table.el
index f27c7058e71..256fac63421 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -590,7 +590,7 @@
 ;; attempt of implementing the table feature to Emacs.  This greatly
 ;; motivated me to follow through to its completion.
 ;;
-;; Kenichi Handa <handa@etl.go.jp> kindly guided me through to
+;; Kenichi Handa <handa@gnu.org> kindly guided me through to
 ;; overcome many technical issues while I was struggling with quail
 ;; related internationalization problems.
 ;;
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 9c91d27b944..8611b735ba9 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -3,7 +3,6 @@
 ;; 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 9ccc73ad48a..5a54e0d2d17 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
-;; Maintainer: bug-texinfo@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 71cdcab57ef..54306d2b74c 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -5,7 +5,6 @@
 ;; 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 e960e992a89..4f49c7f5d17 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1989-1992, 2001-2019 Free Software Foundation, Inc.
 ;; Author: Robert J. Chassell
-;; Maintainer: bug-texinfo@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 e676a5dae20..ac292e463b1 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -3,7 +3,6 @@
 ;; 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 e0bfd24557b..8c904f5d0ec 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -2,7 +2,6 @@
 ;; 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 60a20e2d188..e0184a7ccb3 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -3,7 +3,6 @@
 ;; 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 e8f3cc7da6a..3242d1dade6 100644
--- a/lisp/thread.el
+++ b/lisp/thread.el
@@ -3,7 +3,6 @@
 ;; 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 6a17a756548..dd0491a66a3 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -3,7 +3,6 @@
 ;; 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 35157c5e807..c2f60d31bd4 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -3,8 +3,6 @@
 ;; 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 44f04eab87b..bb96b5a46a0 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -3,7 +3,6 @@
 ;; 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 37ebb5cbe7c..e42818218e0 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -2,7 +2,6 @@
 ;; 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 3dd9e341351..29612b36c20 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -4,7 +4,6 @@
 ;; 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 a4cf0f0ec01..dba313453ff 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -3,7 +3,6 @@
 ;; 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 54360840784..00d784a9b40 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -3,7 +3,6 @@
 ;; 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 00803a103a0..a11f5147afc 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -3,7 +3,6 @@
 ;; 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 a46e7bb3855..dbcc9a6168c 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -4,7 +4,6 @@
 ;; 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 5242d42f04c..eafac8a1929 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -4,7 +4,6 @@
 ;; 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 f077bc9ad62..c4178ac42af 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -4,7 +4,6 @@
 ;; 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 f9efd44c5c7..5cd4f46ed58 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -3,7 +3,6 @@
 ;; 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 02c08af8b20..2811d4691b7 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -3,7 +3,6 @@
 ;; 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 523be87bc49..bee36592a1a 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -5,7 +5,6 @@
 ;; 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 84838135fcc..15f234fda62 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -3,7 +3,6 @@
 ;; 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 ee1646cae5a..3ab8c496408 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -4,7 +4,6 @@
 ;; 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-cvs.el b/lisp/vc/vc-cvs.el
index 626e190c1e8..cc1845a59f6 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995, 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-dispatcher.el b/lisp/vc/vc-dispatcher.el
index c4b327a3f01..579448b31ca 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;; Author:     FSF (see below for full credits)
-;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; Package: vc
diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el
index f05e8efff90..37c71f98641 100644
--- a/lisp/vc/vc-filewise.el
+++ b/lisp/vc/vc-filewise.el
@@ -3,7 +3,6 @@
 ;; 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 876d824ceac..f1b603b2a93 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -3,7 +3,6 @@
 ;; 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 07b3d86b518..1871e1e95c5 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -3,7 +3,6 @@
 ;; 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 598e98250ac..ee227b19a39 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -3,7 +3,6 @@
 ;; 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 4e9f5a025fb..0d27528e515 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -3,7 +3,6 @@
 ;; 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 f8475925b02..b708cd41a79 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -3,7 +3,6 @@
 ;; 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 b992a8ebe09..d9fb8290d2b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3,7 +3,6 @@
 ;; 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 3e8b6ee838e..7673d9b7b86 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -4,7 +4,6 @@
 ;; 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 d13d8c31e80..d5bc3eb984a 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -3,7 +3,6 @@
 ;; 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 e74ce1e8888..c8d5f0de205 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -4,7 +4,6 @@
 ;; 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 d7b5f0a803e..6678f49dfcf 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -3,7 +3,6 @@
 ;; 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 b9f98cdc4c7..713c8575c7d 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -3,7 +3,6 @@
 ;; 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 2c9d177d0a2..7e6a48460e5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3,7 +3,6 @@
 ;; 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 39d9b806d27..57354478fb0 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3,7 +3,6 @@
 ;; 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 e4e2dec3b82..31d409c8389 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -3,7 +3,6 @@
 ;; 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
author	Paul Eggert	2019-05-19 21:29:13 -0700
committer	Paul Eggert	2019-05-19 21:34:27 -0700
commit	bef1be873009d6e9f5a097396179f63a565bb6fd (patch)
tree	227e495b83b50b965c65f26b3bb979e877726530 /lisp
parent	20241e2c764263ebf31cfb0c6a7a0d3b9ba52429 (diff)
download	emacs-bef1be873009d6e9f5a097396179f63a565bb6fd.tar.gz emacs-bef1be873009d6e9f5a097396179f63a565bb6fd.zip