unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Paul Eggert <eggert@cs.ucla.edu>
To: rms@gnu.org
Cc: brandelune@gmail.com, emacs-devel@gnu.org
Subject: Omitting "Maintainer:" (was: Robert J. Chasell reference ...)
Date: Sun, 19 May 2019 09:32:43 -0700	[thread overview]
Message-ID: <2807078f-19a8-4648-3c65-31772934171c@cs.ucla.edu> (raw)
In-Reply-To: <E1hS74f-0005a9-Tv@fencepost.gnu.org>

[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]

Richard Stallman wrote:

> Listing bug-texinfo as maintainer is not useful since I am struggling
> to find someone eo maintain Texinfo.  Sad to say, the only thing we
> can do is list no maintainer for texinfmt.el.

Easy to do, though we list bug-reporting addresses elsewhere too. For example, 
"Maintainer: bug-texinfo@gnu.org" also appears in lisp/textmodes/texnfo-upd.el.

Come to think of it, the "Maintainer:" comments are no longer worth the effort 
of keeping them up-to-date, now that we have a version-control system that keeps 
track of authors and committers automatically. For example, all 327 instances of 
"Maintainer: emacs-devel@gnu.org" in the source code are useless, and the 
remaining "Maintainer:" instances are easily (and more-accurately) determined 
from the commit logs. If we had removed "Maintainer:" comments before now, that 
would have saved me work here, and removing these comments now will save us work 
in the future, all things considered. Proposed patch attached.

> Aside from that, please change "passed away" to "died".
> As a founding member of the anti-euphemism league, I must insist.

I removed that sentence in the master branch, as the exact date of death doesn't 
matter to the manual, and put in (1946--2017) after his name to briefly indicate 
that Bob's no longer with us.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Remove-Maintainer-comments.patch --]
[-- Type: text/x-patch; name="0001-Remove-Maintainer-comments.patch", Size: 250512 bytes --]

From a049585f499c1654feb6b3f1f67972840b1bd9fe Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 19 May 2019 09:29:55 -0700
Subject: [PATCH] Remove "Maintainer:" comments

---
 .gitlab-ci.yml                                         | 1 -
 admin/authors.el                                       | 2 --
 admin/cus-test.el                                      | 1 -
 admin/find-gc.el                                       | 2 --
 admin/grammars/grammar.wy                              | 1 -
 admin/grammars/java-tags.wy                            | 1 -
 admin/grammars/python.wy                               | 1 -
 admin/last-chance.el                                   | 1 -
 autogen.sh                                             | 1 -
 build-aux/make-info-dir                                | 1 -
 doc/lispref/tips.texi                                  | 1 -
 etc/edt-user.el                                        | 1 -
 leim/SKK-DIC/SKK-JISYO.L                               | 1 -
 lisp/abbrev.el                                         | 1 -
 lisp/align.el                                          | 1 -
 lisp/allout-widgets.el                                 | 1 -
 lisp/allout.el                                         | 1 -
 lisp/ansi-color.el                                     | 1 -
 lisp/array.el                                          | 1 -
 lisp/autoinsert.el                                     | 1 -
 lisp/bindings.el                                       | 1 -
 lisp/bookmark.el                                       | 1 -
 lisp/bs.el                                             | 1 -
 lisp/buff-menu.el                                      | 1 -
 lisp/calendar/appt.el                                  | 1 -
 lisp/calendar/cal-china.el                             | 1 -
 lisp/calendar/cal-coptic.el                            | 1 -
 lisp/calendar/cal-dst.el                               | 1 -
 lisp/calendar/cal-french.el                            | 1 -
 lisp/calendar/cal-hebrew.el                            | 1 -
 lisp/calendar/cal-islam.el                             | 1 -
 lisp/calendar/cal-iso.el                               | 1 -
 lisp/calendar/cal-julian.el                            | 1 -
 lisp/calendar/cal-mayan.el                             | 1 -
 lisp/calendar/cal-menu.el                              | 1 -
 lisp/calendar/cal-move.el                              | 1 -
 lisp/calendar/cal-persia.el                            | 1 -
 lisp/calendar/cal-tex.el                               | 1 -
 lisp/calendar/cal-x.el                                 | 1 -
 lisp/calendar/calendar.el                              | 1 -
 lisp/calendar/diary-lib.el                             | 1 -
 lisp/calendar/holidays.el                              | 1 -
 lisp/calendar/lunar.el                                 | 1 -
 lisp/calendar/solar.el                                 | 1 -
 lisp/calendar/todo-mode.el                             | 1 -
 lisp/case-table.el                                     | 1 -
 lisp/cdl.el                                            | 1 -
 lisp/cedet/cedet.el                                    | 1 -
 lisp/cedet/mode-local.el                               | 1 -
 lisp/cedet/semantic/bovine/grammar.el                  | 1 -
 lisp/cedet/semantic/grammar.el                         | 1 -
 lisp/cedet/semantic/imenu.el                           | 1 -
 lisp/cedet/semantic/senator.el                         | 1 -
 lisp/cedet/semantic/wisent.el                          | 1 -
 lisp/cedet/semantic/wisent/comp.el                     | 1 -
 lisp/cedet/semantic/wisent/grammar.el                  | 1 -
 lisp/cedet/semantic/wisent/java-tags.el                | 1 -
 lisp/cedet/semantic/wisent/python.el                   | 1 -
 lisp/cedet/semantic/wisent/wisent.el                   | 1 -
 lisp/char-fold.el                                      | 1 -
 lisp/chistory.el                                       | 1 -
 lisp/cmuscheme.el                                      | 1 -
 lisp/comint.el                                         | 1 -
 lisp/completion.el                                     | 1 -
 lisp/cus-edit.el                                       | 1 -
 lisp/cus-theme.el                                      | 1 -
 lisp/custom.el                                         | 1 -
 lisp/dabbrev.el                                        | 1 -
 lisp/delim-col.el                                      | 1 -
 lisp/delsel.el                                         | 1 -
 lisp/descr-text.el                                     | 1 -
 lisp/dired-aux.el                                      | 1 -
 lisp/dired-x.el                                        | 1 -
 lisp/dired.el                                          | 1 -
 lisp/disp-table.el                                     | 1 -
 lisp/display-fill-column-indicator.el                  | 1 -
 lisp/display-line-numbers.el                           | 1 -
 lisp/dnd.el                                            | 1 -
 lisp/doc-view.el                                       | 1 -
 lisp/dos-fns.el                                        | 1 -
 lisp/dos-vars.el                                       | 1 -
 lisp/dos-w32.el                                        | 1 -
 lisp/dynamic-setting.el                                | 1 -
 lisp/ebuff-menu.el                                     | 1 -
 lisp/echistory.el                                      | 1 -
 lisp/edmacro.el                                        | 1 -
 lisp/ehelp.el                                          | 1 -
 lisp/electric.el                                       | 1 -
 lisp/emacs-lisp/advice.el                              | 1 -
 lisp/emacs-lisp/avl-tree.el                            | 1 -
 lisp/emacs-lisp/backquote.el                           | 1 -
 lisp/emacs-lisp/byte-opt.el                            | 1 -
 lisp/emacs-lisp/byte-run.el                            | 1 -
 lisp/emacs-lisp/bytecomp.el                            | 1 -
 lisp/emacs-lisp/cconv.el                               | 1 -
 lisp/emacs-lisp/cl-indent.el                           | 1 -
 lisp/emacs-lisp/debug.el                               | 1 -
 lisp/emacs-lisp/derived.el                             | 1 -
 lisp/emacs-lisp/disass.el                              | 1 -
 lisp/emacs-lisp/easy-mmode.el                          | 1 -
 lisp/emacs-lisp/edebug.el                              | 1 -
 lisp/emacs-lisp/eldoc.el                               | 1 -
 lisp/emacs-lisp/elp.el                                 | 1 -
 lisp/emacs-lisp/ewoc.el                                | 1 -
 lisp/emacs-lisp/find-func.el                           | 1 -
 lisp/emacs-lisp/float-sup.el                           | 1 -
 lisp/emacs-lisp/helper.el                              | 1 -
 lisp/emacs-lisp/lisp-mnt.el                            | 1 -
 lisp/emacs-lisp/lisp-mode.el                           | 1 -
 lisp/emacs-lisp/lisp.el                                | 1 -
 lisp/emacs-lisp/map-ynp.el                             | 1 -
 lisp/emacs-lisp/map.el                                 | 2 --
 lisp/emacs-lisp/regexp-opt.el                          | 1 -
 lisp/emacs-lisp/regi.el                                | 1 -
 lisp/emacs-lisp/ring.el                                | 1 -
 lisp/emacs-lisp/rmc.el                                 | 1 -
 lisp/emacs-lisp/rx.el                                  | 1 -
 lisp/emacs-lisp/seq.el                                 | 2 --
 lisp/emacs-lisp/subr-x.el                              | 1 -
 lisp/emacs-lisp/syntax.el                              | 1 -
 lisp/emacs-lisp/tcover-ses.el                          | 1 -
 lisp/emacs-lisp/tcover-unsafep.el                      | 1 -
 lisp/emacs-lisp/testcover.el                           | 1 -
 lisp/emacs-lisp/thunk.el                               | 2 --
 lisp/emacs-lisp/timer-list.el                          | 1 -
 lisp/emacs-lisp/timer.el                               | 1 -
 lisp/emacs-lisp/tq.el                                  | 1 -
 lisp/emacs-lisp/trace.el                               | 1 -
 lisp/emacs-lisp/unsafep.el                             | 1 -
 lisp/emacs-lisp/warnings.el                            | 1 -
 lisp/emacs-lock.el                                     | 1 -
 lisp/emulation/edt-lk201.el                            | 1 -
 lisp/emulation/edt-mapper.el                           | 1 -
 lisp/emulation/edt-pc.el                               | 1 -
 lisp/emulation/edt-vt100.el                            | 1 -
 lisp/emulation/edt.el                                  | 1 -
 lisp/env.el                                            | 1 -
 lisp/erc/erc-autoaway.el                               | 1 -
 lisp/erc/erc-backend.el                                | 1 -
 lisp/erc/erc-button.el                                 | 1 -
 lisp/erc/erc-capab.el                                  | 2 --
 lisp/erc/erc-compat.el                                 | 1 -
 lisp/erc/erc-dcc.el                                    | 1 -
 lisp/erc/erc-ezbounce.el                               | 1 -
 lisp/erc/erc-fill.el                                   | 1 -
 lisp/erc/erc-goodies.el                                | 1 -
 lisp/erc/erc-ibuffer.el                                | 1 -
 lisp/erc/erc-identd.el                                 | 1 -
 lisp/erc/erc-imenu.el                                  | 1 -
 lisp/erc/erc-join.el                                   | 1 -
 lisp/erc/erc-lang.el                                   | 1 -
 lisp/erc/erc-list.el                                   | 1 -
 lisp/erc/erc-log.el                                    | 1 -
 lisp/erc/erc-match.el                                  | 1 -
 lisp/erc/erc-menu.el                                   | 1 -
 lisp/erc/erc-netsplit.el                               | 1 -
 lisp/erc/erc-networks.el                               | 1 -
 lisp/erc/erc-notify.el                                 | 1 -
 lisp/erc/erc-page.el                                   | 2 --
 lisp/erc/erc-pcomplete.el                              | 1 -
 lisp/erc/erc-replace.el                                | 1 -
 lisp/erc/erc-ring.el                                   | 1 -
 lisp/erc/erc-services.el                               | 2 --
 lisp/erc/erc-sound.el                                  | 2 --
 lisp/erc/erc-speedbar.el                               | 1 -
 lisp/erc/erc-spelling.el                               | 1 -
 lisp/erc/erc-stamp.el                                  | 1 -
 lisp/erc/erc-track.el                                  | 1 -
 lisp/erc/erc-truncate.el                               | 1 -
 lisp/erc/erc-xdcc.el                                   | 1 -
 lisp/erc/erc.el                                        | 1 -
 lisp/expand.el                                         | 1 -
 lisp/faces.el                                          | 1 -
 lisp/ffap.el                                           | 1 -
 lisp/files-x.el                                        | 1 -
 lisp/files.el                                          | 1 -
 lisp/filesets.el                                       | 1 -
 lisp/find-dired.el                                     | 1 -
 lisp/find-file.el                                      | 1 -
 lisp/flow-ctrl.el                                      | 1 -
 lisp/foldout.el                                        | 1 -
 lisp/follow.el                                         | 1 -
 lisp/font-core.el                                      | 1 -
 lisp/font-lock.el                                      | 1 -
 lisp/frame.el                                          | 1 -
 lisp/fringe.el                                         | 1 -
 lisp/gnus/gnus-diary.el                                | 1 -
 lisp/gnus/nndiary.el                                   | 1 -
 lisp/gnus/spam.el                                      | 1 -
 lisp/help-fns.el                                       | 1 -
 lisp/help-macro.el                                     | 1 -
 lisp/help-mode.el                                      | 1 -
 lisp/help.el                                           | 1 -
 lisp/hexl.el                                           | 1 -
 lisp/hfy-cmap.el                                       | 1 -
 lisp/hippie-exp.el                                     | 1 -
 lisp/hl-line.el                                        | 1 -
 lisp/htmlfontify.el                                    | 1 -
 lisp/ibuf-ext.el                                       | 1 -
 lisp/ibuf-macs.el                                      | 1 -
 lisp/ibuffer.el                                        | 1 -
 lisp/icomplete.el                                      | 1 -
 lisp/ielm.el                                           | 1 -
 lisp/iimage.el                                         | 1 -
 lisp/image.el                                          | 1 -
 lisp/imenu.el                                          | 1 -
 lisp/indent.el                                         | 1 -
 lisp/info.el                                           | 1 -
 lisp/informat.el                                       | 1 -
 lisp/international/isearch-x.el                        | 1 -
 lisp/international/iso-ascii.el                        | 1 -
 lisp/international/iso-transl.el                       | 1 -
 lisp/international/ogonek.el                           | 1 -
 lisp/international/quail.el                            | 1 -
 lisp/international/utf7.el                             | 1 -
 lisp/isearch.el                                        | 1 -
 lisp/isearchb.el                                       | 1 -
 lisp/jka-cmpr-hook.el                                  | 1 -
 lisp/jka-compr.el                                      | 1 -
 lisp/jsonrpc.el                                        | 1 -
 lisp/kermit.el                                         | 1 -
 lisp/language/czech.el                                 | 1 -
 lisp/language/european.el                              | 1 -
 lisp/language/ind-util.el                              | 1 -
 lisp/language/indian.el                                | 1 -
 lisp/language/slovak.el                                | 1 -
 lisp/leim/quail/czech.el                               | 1 -
 lisp/leim/quail/latin-pre.el                           | 1 -
 lisp/leim/quail/sami.el                                | 1 -
 lisp/leim/quail/slovak.el                              | 1 -
 lisp/linum.el                                          | 1 -
 lisp/loadhist.el                                       | 1 -
 lisp/loadup.el                                         | 1 -
 lisp/lpr.el                                            | 1 -
 lisp/ls-lisp.el                                        | 1 -
 lisp/macros.el                                         | 1 -
 lisp/mail/blessmail.el                                 | 1 -
 lisp/mail/emacsbug.el                                  | 1 -
 lisp/mail/hashcash.el                                  | 1 -
 lisp/mail/mail-extr.el                                 | 1 -
 lisp/mail/mail-utils.el                                | 1 -
 lisp/mail/mailabbrev.el                                | 1 -
 lisp/mail/mailalias.el                                 | 1 -
 lisp/mail/mspools.el                                   | 1 -
 lisp/mail/reporter.el                                  | 1 -
 lisp/mail/rfc822.el                                    | 1 -
 lisp/mail/rmail.el                                     | 1 -
 lisp/mail/rmailedit.el                                 | 1 -
 lisp/mail/rmailkwd.el                                  | 1 -
 lisp/mail/rmailmm.el                                   | 1 -
 lisp/mail/rmailmsc.el                                  | 1 -
 lisp/mail/rmailout.el                                  | 1 -
 lisp/mail/rmailsort.el                                 | 1 -
 lisp/mail/rmailsum.el                                  | 1 -
 lisp/mail/sendmail.el                                  | 1 -
 lisp/mail/smtpmail.el                                  | 2 --
 lisp/mail/supercite.el                                 | 1 -
 lisp/mail/undigest.el                                  | 1 -
 lisp/mail/unrmail.el                                   | 1 -
 lisp/makesum.el                                        | 1 -
 lisp/man.el                                            | 1 -
 lisp/master.el                                         | 1 -
 lisp/menu-bar.el                                       | 1 -
 lisp/mh-e/mh-acros.el                                  | 1 -
 lisp/mh-e/mh-alias.el                                  | 1 -
 lisp/mh-e/mh-buffers.el                                | 1 -
 lisp/mh-e/mh-comp.el                                   | 1 -
 lisp/mh-e/mh-compat.el                                 | 1 -
 lisp/mh-e/mh-e.el                                      | 1 -
 lisp/mh-e/mh-folder.el                                 | 1 -
 lisp/mh-e/mh-funcs.el                                  | 1 -
 lisp/mh-e/mh-gnus.el                                   | 1 -
 lisp/mh-e/mh-identity.el                               | 1 -
 lisp/mh-e/mh-inc.el                                    | 1 -
 lisp/mh-e/mh-junk.el                                   | 1 -
 lisp/mh-e/mh-letter.el                                 | 1 -
 lisp/mh-e/mh-limit.el                                  | 1 -
 lisp/mh-e/mh-mime.el                                   | 1 -
 lisp/mh-e/mh-print.el                                  | 1 -
 lisp/mh-e/mh-scan.el                                   | 1 -
 lisp/mh-e/mh-search.el                                 | 1 -
 lisp/mh-e/mh-seq.el                                    | 1 -
 lisp/mh-e/mh-show.el                                   | 1 -
 lisp/mh-e/mh-speed.el                                  | 1 -
 lisp/mh-e/mh-thread.el                                 | 1 -
 lisp/mh-e/mh-tool-bar.el                               | 1 -
 lisp/mh-e/mh-utils.el                                  | 1 -
 lisp/mh-e/mh-xface.el                                  | 1 -
 lisp/midnight.el                                       | 1 -
 lisp/misc.el                                           | 1 -
 lisp/mouse.el                                          | 1 -
 lisp/msb.el                                            | 1 -
 lisp/mwheel.el                                         | 1 -
 lisp/net/ange-ftp.el                                   | 1 -
 lisp/net/browse-url.el                                 | 1 -
 lisp/net/eudc-bob.el                                   | 1 -
 lisp/net/eudc-export.el                                | 1 -
 lisp/net/eudc-hotlist.el                               | 1 -
 lisp/net/eudc-vars.el                                  | 1 -
 lisp/net/eudc.el                                       | 1 -
 lisp/net/eudcb-bbdb.el                                 | 1 -
 lisp/net/eudcb-ldap.el                                 | 1 -
 lisp/net/eudcb-mab.el                                  | 1 -
 lisp/net/goto-addr.el                                  | 1 -
 lisp/net/ldap.el                                       | 1 -
 lisp/net/ntlm.el                                       | 1 -
 lisp/net/pop3.el                                       | 1 -
 lisp/net/quickurl.el                                   | 1 -
 lisp/net/rlogin.el                                     | 1 -
 lisp/net/telnet.el                                     | 1 -
 lisp/net/tramp-cache.el                                | 1 -
 lisp/net/tramp-sh.el                                   | 1 -
 lisp/net/tramp-uu.el                                   | 1 -
 lisp/net/tramp.el                                      | 1 -
 lisp/net/trampver.el                                   | 1 -
 lisp/newcomment.el                                     | 1 -
 lisp/novice.el                                         | 1 -
 lisp/obarray.el                                        | 1 -
 lisp/obsolete/abbrevlist.el                            | 1 -
 lisp/obsolete/bruce.el                                 | 1 -
 lisp/obsolete/cc-compat.el                             | 1 -
 lisp/obsolete/eudcb-ph.el                              | 1 -
 lisp/obsolete/fast-lock.el                             | 1 -
 lisp/obsolete/gs.el                                    | 1 -
 lisp/obsolete/gulp.el                                  | 1 -
 lisp/obsolete/info-edit.el                             | 1 -
 lisp/obsolete/iswitchb.el                              | 1 -
 lisp/obsolete/lazy-lock.el                             | 1 -
 lisp/obsolete/ledit.el                                 | 1 -
 lisp/obsolete/levents.el                               | 1 -
 lisp/obsolete/longlines.el                             | 1 -
 lisp/obsolete/lucid.el                                 | 1 -
 lisp/obsolete/mailpost.el                              | 1 -
 lisp/obsolete/meese.el                                 | 1 -
 lisp/obsolete/otodo-mode.el                            | 1 -
 lisp/obsolete/pc-mode.el                               | 1 -
 lisp/obsolete/rcompile.el                              | 1 -
 lisp/obsolete/sregex.el                                | 1 -
 lisp/obsolete/sup-mouse.el                             | 1 -
 lisp/obsolete/terminal.el                              | 1 -
 lisp/obsolete/tpu-edt.el                               | 1 -
 lisp/obsolete/tpu-extras.el                            | 1 -
 lisp/obsolete/tpu-mapper.el                            | 1 -
 lisp/obsolete/vc-arch.el                               | 1 -
 lisp/obsolete/yow.el                                   | 1 -
 lisp/org/org-crypt.el                                  | 1 -
 lisp/org/org-mouse.el                                  | 1 -
 lisp/org/org-protocol.el                               | 1 -
 lisp/org/org.el                                        | 1 -
 lisp/org/ox-publish.el                                 | 1 -
 lisp/outline.el                                        | 1 -
 lisp/paren.el                                          | 1 -
 lisp/play/5x5.el                                       | 1 -
 lisp/play/animate.el                                   | 1 -
 lisp/play/cookie1.el                                   | 1 -
 lisp/play/dissociate.el                                | 1 -
 lisp/play/doctor.el                                    | 1 -
 lisp/play/gomoku.el                                    | 1 -
 lisp/play/hanoi.el                                     | 1 -
 lisp/play/life.el                                      | 1 -
 lisp/play/spook.el                                     | 1 -
 lisp/play/studly.el                                    | 1 -
 lisp/play/zone.el                                      | 1 -
 lisp/printing.el                                       | 1 -
 lisp/progmodes/ada-mode.el                             | 1 -
 lisp/progmodes/ada-prj.el                              | 1 -
 lisp/progmodes/ada-stmt.el                             | 1 -
 lisp/progmodes/ada-xref.el                             | 1 -
 lisp/progmodes/asm-mode.el                             | 1 -
 lisp/progmodes/cc-align.el                             | 1 -
 lisp/progmodes/cc-awk.el                               | 1 -
 lisp/progmodes/cc-bytecomp.el                          | 1 -
 lisp/progmodes/cc-cmds.el                              | 1 -
 lisp/progmodes/cc-defs.el                              | 1 -
 lisp/progmodes/cc-engine.el                            | 1 -
 lisp/progmodes/cc-fonts.el                             | 3 +--
 lisp/progmodes/cc-guess.el                             | 1 -
 lisp/progmodes/cc-langs.el                             | 1 -
 lisp/progmodes/cc-menus.el                             | 1 -
 lisp/progmodes/cc-mode.el                              | 3 +--
 lisp/progmodes/cc-styles.el                            | 1 -
 lisp/progmodes/cc-vars.el                              | 1 -
 lisp/progmodes/cfengine.el                             | 1 -
 lisp/progmodes/compile.el                              | 1 -
 lisp/progmodes/cperl-mode.el                           | 1 -
 lisp/progmodes/dcl-mode.el                             | 1 -
 lisp/progmodes/ebnf-abn.el                             | 1 -
 lisp/progmodes/ebnf-bnf.el                             | 1 -
 lisp/progmodes/ebnf-dtd.el                             | 1 -
 lisp/progmodes/ebnf-ebx.el                             | 1 -
 lisp/progmodes/ebnf-iso.el                             | 1 -
 lisp/progmodes/ebnf-otz.el                             | 1 -
 lisp/progmodes/ebnf-yac.el                             | 1 -
 lisp/progmodes/ebnf2ps.el                              | 1 -
 lisp/progmodes/ebrowse.el                              | 1 -
 lisp/progmodes/elisp-mode.el                           | 1 -
 lisp/progmodes/etags.el                                | 1 -
 lisp/progmodes/f90.el                                  | 1 -
 lisp/progmodes/flymake-proc.el                         | 1 -
 lisp/progmodes/flymake.el                              | 1 -
 lisp/progmodes/fortran.el                              | 1 -
 lisp/progmodes/gdb-mi.el                               | 1 -
 lisp/progmodes/glasses.el                              | 1 -
 lisp/progmodes/grep.el                                 | 1 -
 lisp/progmodes/gud.el                                  | 1 -
 lisp/progmodes/hideif.el                               | 1 -
 lisp/progmodes/idlw-complete-structtag.el              | 1 -
 lisp/progmodes/idlw-help.el                            | 1 -
 lisp/progmodes/idlw-shell.el                           | 1 -
 lisp/progmodes/idlw-toolbar.el                         | 1 -
 lisp/progmodes/idlwave.el                              | 1 -
 lisp/progmodes/js.el                                   | 1 -
 lisp/progmodes/make-mode.el                            | 1 -
 lisp/progmodes/mixal-mode.el                           | 1 -
 lisp/progmodes/modula2.el                              | 1 -
 lisp/progmodes/octave.el                               | 1 -
 lisp/progmodes/opascal.el                              | 1 -
 lisp/progmodes/perl-mode.el                            | 1 -
 lisp/progmodes/prog-mode.el                            | 1 -
 lisp/progmodes/prolog.el                               | 1 -
 lisp/progmodes/ps-mode.el                              | 1 -
 lisp/progmodes/python.el                               | 1 -
 lisp/progmodes/sh-script.el                            | 1 -
 lisp/progmodes/simula.el                               | 1 -
 lisp/progmodes/sql.el                                  | 1 -
 lisp/progmodes/tcl.el                                  | 1 -
 lisp/progmodes/vera-mode.el                            | 1 -
 lisp/progmodes/vhdl-mode.el                            | 1 -
 lisp/progmodes/xscheme.el                              | 1 -
 lisp/ps-def.el                                         | 1 -
 lisp/ps-mule.el                                        | 1 -
 lisp/ps-print.el                                       | 1 -
 lisp/ps-samp.el                                        | 1 -
 lisp/rect.el                                           | 1 -
 lisp/register.el                                       | 1 -
 lisp/replace.el                                        | 1 -
 lisp/reposition.el                                     | 1 -
 lisp/rot13.el                                          | 1 -
 lisp/ruler-mode.el                                     | 1 -
 lisp/savehist.el                                       | 1 -
 lisp/saveplace.el                                      | 1 -
 lisp/scroll-bar.el                                     | 1 -
 lisp/scroll-lock.el                                    | 1 -
 lisp/select.el                                         | 1 -
 lisp/server.el                                         | 1 -
 lisp/ses.el                                            | 1 -
 lisp/shell.el                                          | 1 -
 lisp/simple.el                                         | 1 -
 lisp/skeleton.el                                       | 1 -
 lisp/sort.el                                           | 1 -
 lisp/soundex.el                                        | 1 -
 lisp/startup.el                                        | 1 -
 lisp/strokes.el                                        | 1 -
 lisp/subr.el                                           | 1 -
 lisp/t-mouse.el                                        | 1 -
 lisp/tabify.el                                         | 1 -
 lisp/talk.el                                           | 1 -
 lisp/tar-mode.el                                       | 1 -
 lisp/term.el                                           | 1 -
 lisp/term/common-win.el                                | 1 -
 lisp/term/pc-win.el                                    | 1 -
 lisp/term/tty-colors.el                                | 1 -
 lisp/textmodes/artist.el                               | 1 -
 lisp/textmodes/bib-mode.el                             | 1 -
 lisp/textmodes/bibtex.el                               | 1 -
 lisp/textmodes/css-mode.el                             | 1 -
 lisp/textmodes/fill.el                                 | 1 -
 lisp/textmodes/flyspell.el                             | 1 -
 lisp/textmodes/less-css-mode.el                        | 1 -
 lisp/textmodes/makeinfo.el                             | 1 -
 lisp/textmodes/nroff-mode.el                           | 1 -
 lisp/textmodes/page.el                                 | 1 -
 lisp/textmodes/paragraphs.el                           | 1 -
 lisp/textmodes/picture.el                              | 1 -
 lisp/textmodes/refbib.el                               | 1 -
 lisp/textmodes/refer.el                                | 1 -
 lisp/textmodes/refill.el                               | 1 -
 lisp/textmodes/reftex-auc.el                           | 1 -
 lisp/textmodes/reftex-cite.el                          | 1 -
 lisp/textmodes/reftex-dcr.el                           | 1 -
 lisp/textmodes/reftex-global.el                        | 1 -
 lisp/textmodes/reftex-index.el                         | 1 -
 lisp/textmodes/reftex-parse.el                         | 1 -
 lisp/textmodes/reftex-ref.el                           | 1 -
 lisp/textmodes/reftex-sel.el                           | 1 -
 lisp/textmodes/reftex-toc.el                           | 1 -
 lisp/textmodes/reftex-vars.el                          | 1 -
 lisp/textmodes/reftex.el                               | 1 -
 lisp/textmodes/remember.el                             | 1 -
 lisp/textmodes/rst.el                                  | 1 -
 lisp/textmodes/sgml-mode.el                            | 1 -
 lisp/textmodes/tex-mode.el                             | 1 -
 lisp/textmodes/texinfmt.el                             | 1 -
 lisp/textmodes/texinfo.el                              | 1 -
 lisp/textmodes/texnfo-upd.el                           | 1 -
 lisp/textmodes/text-mode.el                            | 1 -
 lisp/textmodes/underline.el                            | 1 -
 lisp/thingatpt.el                                      | 1 -
 lisp/thread.el                                         | 1 -
 lisp/thumbs.el                                         | 1 -
 lisp/time-stamp.el                                     | 1 -
 lisp/time.el                                           | 1 -
 lisp/timezone.el                                       | 1 -
 lisp/tmm.el                                            | 1 -
 lisp/tree-widget.el                                    | 1 -
 lisp/tutorial.el                                       | 1 -
 lisp/type-break.el                                     | 1 -
 lisp/uniquify.el                                       | 1 -
 lisp/url/url-dav.el                                    | 1 -
 lisp/url/url-gw.el                                     | 1 -
 lisp/url/url-http.el                                   | 1 -
 lisp/url/url-util.el                                   | 1 -
 lisp/url/url.el                                        | 1 -
 lisp/userlock.el                                       | 1 -
 lisp/vc/add-log.el                                     | 1 -
 lisp/vc/compare-w.el                                   | 1 -
 lisp/vc/diff.el                                        | 1 -
 lisp/vc/pcvs.el                                        | 1 -
 lisp/vc/vc-annotate.el                                 | 1 -
 lisp/vc/vc-bzr.el                                      | 1 -
 lisp/vc/vc-cvs.el                                      | 1 -
 lisp/vc/vc-dav.el                                      | 1 -
 lisp/vc/vc-dispatcher.el                               | 1 -
 lisp/vc/vc-filewise.el                                 | 1 -
 lisp/vc/vc-hg.el                                       | 1 -
 lisp/vc/vc-hooks.el                                    | 1 -
 lisp/vc/vc-rcs.el                                      | 1 -
 lisp/vc/vc-sccs.el                                     | 1 -
 lisp/vc/vc-src.el                                      | 1 -
 lisp/vc/vc-svn.el                                      | 1 -
 lisp/vc/vc.el                                          | 1 -
 lisp/vcursor.el                                        | 1 -
 lisp/version.el                                        | 1 -
 lisp/view.el                                           | 1 -
 lisp/vt-control.el                                     | 1 -
 lisp/vt100-led.el                                      | 1 -
 lisp/whitespace.el                                     | 1 -
 lisp/wid-edit.el                                       | 1 -
 lisp/window.el                                         | 1 -
 lisp/woman.el                                          | 1 -
 lisp/x-dnd.el                                          | 1 -
 lisp/xml.el                                            | 1 -
 test/lisp/emacs-lisp/map-tests.el                      | 1 -
 test/lisp/emacs-lisp/seq-tests.el                      | 1 -
 test/lisp/emacs-lisp/thunk-tests.el                    | 1 -
 test/lisp/help-fns-tests.el                            | 1 -
 test/lisp/jsonrpc-tests.el                             | 1 -
 test/lisp/md4-tests.el                                 | 1 -
 test/lisp/org/org-tests.el                             | 2 --
 test/lisp/soundex-tests.el                             | 2 --
 test/lisp/vc/diff-mode-tests.el                        | 1 -
 test/lisp/vc/smerge-mode-tests.el                      | 2 --
 test/lisp/vc/vc-bzr-tests.el                           | 1 -
 test/lisp/vc/vc-hg-tests.el                            | 1 -
 test/lisp/xdg-tests.el                                 | 1 -
 test/manual/biditest.el                                | 1 -
 test/manual/etags/el-src/emacs/lisp/progmodes/etags.el | 1 -
 test/src/lcms-tests.el                                 | 2 --
 558 files changed, 2 insertions(+), 574 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92efcf6497..4434e8070e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,6 @@
 # any particular service that uses that protocol.  Also, it is intended for
 # evaluation purposes, thus possibly temporary.
 
-# Maintainer: tzz@lifelogs.com
 # URL: https://emba.gnu.org/emacs/emacs
 
 image: debian:stretch
diff --git a/admin/authors.el b/admin/authors.el
index a3f8bdde84..8329f3f581 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1,10 +1,8 @@
-
 ;;; authors.el --- utility for maintaining Emacs's AUTHORS file
 
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
-;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint
 ;; Package: emacs
 
diff --git a/admin/cus-test.el b/admin/cus-test.el
index f9fd53d98e..b0ce60785d 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1998, 2000, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
-;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
 ;; Created: 13 Sep 1998
 ;; Keywords: maint
 
diff --git a/admin/find-gc.el b/admin/find-gc.el
index bf93c4eedf..9b925565df 100644
--- a/admin/find-gc.el
+++ b/admin/find-gc.el
@@ -2,8 +2,6 @@
 
 ;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index f7664de655..5b06917d7d 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 ;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index 88beafeddb..db4f61c5b0 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 5e5bdc194c..695e612942 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -5,7 +5,6 @@
 ;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
 ;; Author: Richard Kim <ryk@dspwiz.com>
-;; Maintainer: Richard Kim <ryk@dspwiz.com>
 ;; Created: June 2002
 ;; Keywords: syntax
 ;;
diff --git a/admin/last-chance.el b/admin/last-chance.el
index 5f993be18e..ceed1c7cfa 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
-;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint
 ;; Package: emacs
 
diff --git a/autogen.sh b/autogen.sh
index 40d0c37b11..f390b1a777 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,6 @@
 ## Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
-## Maintainer: emacs-devel@gnu.org
 
 ## This file is part of GNU Emacs.
 
diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir
index 2dcac87b48..51f384aff8 100755
--- a/build-aux/make-info-dir
+++ b/build-aux/make-info-dir
@@ -5,7 +5,6 @@
 ## Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
-## Maintainer: emacs-devel@gnu.org
 
 ## This file is part of GNU Emacs.
 
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index d41fe82572..fb9c19e334 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -951,7 +951,6 @@ Library Headers
 @end group
 
 ;; Author: Your Name <yourname@@example.com>
-;; Maintainer: Someone Else <someone@@example.com>
 ;; Created: 14 Jul 2010
 @group
 ;; Keywords: languages
diff --git a/etc/edt-user.el b/etc/edt-user.el
index 5aede6bfd8..10ea4c458b 100644
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 
 ;; This file is part of GNU Emacs.
diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L
index 6b024e3dc4..082c2bd1ba 100644
--- a/leim/SKK-DIC/SKK-JISYO.L
+++ b/leim/SKK-DIC/SKK-JISYO.L
@@ -12,7 +12,6 @@
 ;; MITA Yuusuke <clefs@mail.goo.ne.jp>
 ;; SKK Development Team <skk@ring.gr.jp>
 ;;
-;; Maintainer: SKK Development Team <skk@ring.gr.jp>
 ;; Keywords: japanese
 ;;
 ;; This dictionary is free software; you can redistribute it and/or
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3c88ec661a..be19da525e 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 443237b451..aeb845a561 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/allout-widgets.el b/lisp/allout-widgets.el
index 67fce325ff..e6615d983e 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail...>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Version: 1.0
 ;; Created: Dec 2005
 ;; Keywords: outlines
diff --git a/lisp/allout.el b/lisp/allout.el
index b3b87e533b..12a67cdb02 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1992-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail...>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Created: Dec 1991 -- first release to usenet
 ;; Version: 2.3
 ;; Keywords: outlines, wp, languages, PGP, GnuPG
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 136e69f9a7..fe8cadacda 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: Alex Schroeder <alex@gnu.org>
 ;; Version: 3.4.2
 ;; Keywords: comm processes terminals services
 
diff --git a/lisp/array.el b/lisp/array.el
index 2fffe0197e..28635d18af 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 f7ecfe27bb..c2ebea7008 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 744bcc36a8..4f09d583d7 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/bookmark.el b/lisp/bookmark.el
index 3041401e17..b1fe690dac 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
-;; Maintainer: Karl Fogel <kfogel@red-bean.com>
 ;; Created: July, 1993
 ;; Keywords: bookmarks, placeholders, annotations
 
diff --git a/lisp/bs.el b/lisp/bs.el
index 86a19fddcc..47782d7192 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 5f88986636..c8cd25caff 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/calendar/appt.el b/lisp/calendar/appt.el
index 40cb9f7cbd..2e0e35e0bc 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Package: calendar
 
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index f92947ed28..2d59474479 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Chinese calendar, calendar, holidays, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 6fa460625c..4d0986e8c4 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Coptic calendar, Ethiopic calendar, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 2126cfdadb..176e45ec8d 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -4,7 +4,6 @@
 
 ;; Author: Paul Eggert <eggert@twinsun.com>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: daylight saving time, calendar, diary, holidays
 ;; Package: calendar
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index b9abab5ffa..7103a4c9ce 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -4,7 +4,6 @@
 ;; Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: French Revolutionary calendar, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index b26dbbebda..62e345fd3a 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -4,7 +4,6 @@
 
 ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Hebrew calendar, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 32e15f538d..deecbbf007 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Islamic calendar, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 8568afeb05..e8a7bc8acc 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: ISO calendar, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 1297a96bf9..b8694661aa 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Julian calendar, Julian day number, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 37fe4b9a2e..d35bad90e9 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -5,7 +5,6 @@
 
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Mayan calendar, Maya, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index cf7d04fbb4..e810e79e23 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -4,7 +4,6 @@
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;         Lara Rios <lrios@coewl.cen.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: calendar, popup menus, menu bar
 ;; Package: calendar
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index ecd05e7e49..03fa0efa9d 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: calendar
 ;; Package: calendar
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index c0b6cb23cf..93045ce970 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Persian calendar, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 78ab076595..648ac09b03 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -4,7 +4,6 @@
 
 ;; Author: Steve Fisk <fisk@bowdoin.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: Calendar, LaTeX
 ;; Package: calendar
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 58d1eeb60e..f452431756 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -4,7 +4,6 @@
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: calendar, dedicated frames
 ;; Package: calendar
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index de8f758fae..a842f5f674 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: calendar, Gregorian calendar, diary, holidays
 
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 1be2a05eee..bcadf2e316 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 2b080c3073..71f302649c 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: holidays, calendar
 ;; Package: calendar
 
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 5424551e24..92a49c429d 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: moon, lunar phases, calendar, diary
 ;; Package: calendar
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 23bc7611e5..bbcaee9339 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -5,7 +5,6 @@
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;         Denis B. Roegel <Denis.Roegel@loria.fr>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
 ;; Human-Keywords: sunrise, sunset, equinox, solstice, calendar, diary, holidays
 ;; Package: calendar
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 7169ef41ae..b029ca6765 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oliver Seidel <privat@os10000.net>
 ;;	Stephen Berman <stephen.berman@gmx.net>
-;; Maintainer: Stephen Berman <stephen.berman@gmx.net>
 ;; Keywords: calendar, todo
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/case-table.el b/lisp/case-table.el
index c27e772b04..7474d63323 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 752e59b5d4..36f72ef051 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 b3d4a5def2..c67f0db41d 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
 ;; Version: 2.0
 ;; Keywords: OO, lisp
 
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index f83decbc01..fe87d1ae4b 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2004-2005, 2007-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 27 Apr 2004
 ;; Keywords: syntax
 
diff --git a/lisp/cedet/semantic/bovine/grammar.el b/lisp/cedet/semantic/bovine/grammar.el
index f77bc9db55..7c25b79db8 100644
--- a/lisp/cedet/semantic/bovine/grammar.el
+++ b/lisp/cedet/semantic/bovine/grammar.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index f6d67cf48e..7fb54cbb89 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 0fb9eca753..027c9891cd 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Maintainer: Eric Ludlam
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 2462662bbd..79bb4b20ee 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.el b/lisp/cedet/semantic/wisent.el
index 6bb771054d..122b5d399c 100644
--- a/lisp/cedet/semantic/wisent.el
+++ b/lisp/cedet/semantic/wisent.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2007, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 30 Aug 2001
 ;; Keywords: syntax
 
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index db910b1424..051b898ed7 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -4,7 +4,6 @@
 ;; Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 30 January 2002
 ;; Keywords: syntax
 
diff --git a/lisp/cedet/semantic/wisent/grammar.el b/lisp/cedet/semantic/wisent/grammar.el
index 7d776712eb..d23e293552 100644
--- a/lisp/cedet/semantic/wisent/grammar.el
+++ b/lisp/cedet/semantic/wisent/grammar.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index 4bf7a8e2af..87c3090bdb 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2006, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 15 Dec 2001
 ;; Keywords: syntax
 
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index c530329bae..d505b03f2e 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard Kim  <emacs18@gmail.com>
-;; Maintainer: Richard Kim  <emacs18@gmail.com>
 ;; Created: June 2002
 ;; Keywords: syntax
 
diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el
index 21082429a2..401b404fee 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -3,7 +3,6 @@
 ;;; Copyright (C) 2002-2007, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 30 January 2002
 ;; Keywords: syntax
 
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index e61bc3edc6..426b1a9f84 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 59bdc00c67..9c29bb7c43 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 ed6f1bfb1a..f949a8c109 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 d21cc1378f..3939371ab8 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 89285c74d4..ff392dd821 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/cus-edit.el b/lisp/cus-edit.el
index f87b6b621c..87f12aa89c 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 bc9d1d4f7d..9846aa8d99 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 29bf9e570a..e2bf8718b6 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 2159f96028..f1fae18e74 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/delim-col.el b/lisp/delim-col.el
index a968b32052..f33248acd7 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Version: 2.1
 ;; Keywords: internal
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 8f71bc6519..a815b91c01 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 8be2b94458..2976b788f0 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 aae521287e..305cfd4f32 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-x.el b/lisp/dired-x.el
index 3b78ec47d9..948c76a8c9 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -5,7 +5,6 @@
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;;	Lawrence R. Dodd <dodd@roebling.poly.edu>
-;; Maintainer: Romain Francoise <rfrancoise@gnu.org>
 ;; Keywords: dired extensions files
 ;; Package: emacs
 
diff --git a/lisp/dired.el b/lisp/dired.el
index ea1943de1d..f137d4a5be 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 4a59750677..f1676bbfa3 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 6d5f5a9f89..ec89adea21 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 d38f2e6963..ac01112215 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 459a7238dc..82bb7c9ef8 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/doc-view.el b/lisp/doc-view.el
index a706907260..7ab8539052 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Tassilo Horn <tsdh@gnu.org>
-;; Maintainer: Tassilo Horn <tsdh@gnu.org>
 ;; Keywords: files, pdf, ps, dvi
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index c575dd413f..bffd54006d 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 53de20b853..0bf10133c2 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/dos-w32.el b/lisp/dos-w32.el
index 0c04b8fa7f..08ac4eab43 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
-;; Maintainer: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
 ;; Package: emacs
 
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index cf1a8d3b73..ea530f991a 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 6543e5f197..ddfad25a38 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 e932daf2f0..8006d7bcd9 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/edmacro.el b/lisp/edmacro.el
index b480b2330a..da3e782bd9 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
-;; Maintainer: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.01
 ;; Keywords: abbrev
 
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 2a24c9857c..8fc8e1f15a 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 07da2f1d9e..1f4c132f92 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 2034f33d0e..dfd6d2e5b8 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 d2a3a131d1..a1739562f6 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 5e72dc3b40..344a0ba8f6 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 44cca6136c..02a9749f47 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 842d1d48b4..811b485dc6 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 e76baf5ed0..95e287c806 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 58ca9d5f57..21af4b6e63 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 10af440008..ea6efbf851 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 8989aa0719..259f240d29 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 6db0584b98..9f7beeaef5 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 3fc22247fa..ed3c1fbaa9 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/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index be531aab84..dbc2ccdec9 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
-;; Maintainer: Stefan Monnier <monnier@gnu.org>
 ;; Package: emacs
 
 ;; Keywords: extensions lisp
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ab5553b4e8..b8da76ccf0 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 188d99e14c..16b5863209 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman <friedman@splode.com>
-;; Maintainer: friedman@splode.com
 ;; Keywords: extensions
 ;; Created: 1995-10-06
 
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index f0dcb51af8..1f8d31a3fc 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 c33b46501f..da8d2921dc 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -4,7 +4,6 @@
 
 ;; Author: Per Cederqvist <ceder@lysator.liu.se>
 ;;	Inge Wallin <inge@lysator.liu.se>
-;; Maintainer: monnier@gnu.org
 ;; Created: 3 Aug 1992
 ;; Keywords: extensions, lisp
 
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index b63d4d4e0a..9fc7e4a797 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp>
-;; Maintainer: petersen@kurims.kyoto-u.ac.jp
 ;; Keywords: emacs-lisp, functions, variables
 ;; Created: 97/07/25
 
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 54c8afe62b..6ee378e852 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 d1bd46fb58..4a84cfa3e2 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 91c76158a3..81adbd5d4f 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 fa6dc98d04..021708c588 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 38df920f17..f653f6c109 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 a688330b74..e8337a99c8 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 54e802edf4..774df3f84e 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 00f72e284a..2753bbd548 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/regi.el b/lisp/emacs-lisp/regi.el
index f8268ed27b..c2e1c44dcf 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com>
-;; Maintainer:    bwarsaw@cen.com
 ;; Created:       24-Feb-1993
 ;; Version:       1.8
 ;; Last Modified: 1993/06/01 21:33:00
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index c7d0268a77..91c043fb3f 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 6d1adae974..4440dbc2fd 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index fdd24317c6..9d9028d87d 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 3413cd1513..8997b7501b 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 b9ffe6a6fc..33445835ae 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 f1904e64ef..f488bed3b0 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 29b481849e..60eb30415a 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
-;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
 ;; Keywords: spreadsheet lisp utility
 ;; Package: testcover
 
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 571f53c795..63510127d4 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
-;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
 ;; Keywords: safety lisp utility
 ;; Package: testcover
 
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 1ea12859c2..1b94aa80e5 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: lisp utility
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el
index e1370c4591..968dc71f67 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 55aa56b72e..3a791c2af4 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 22ccc35103..668da42a6e 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 4249305fee..ca2d2a23c7 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 2f271c1f70..0a8351195f 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/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 1a2f1f31b1..e374cbec55 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: safety lisp utility
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 13ca605dd0..70d6b077eb 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 0cded29193..05b4c010f6 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/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 797de504fd..9ccb40dfe5 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt
 
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index b8e28f5a75..4aad72caf3 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1994-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt
 
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 3fe33ca13d..484f84eb15 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt
 
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index f3d2518a49..40c74c9d74 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt
 
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index d1fe0b8107..dcc327dbd4 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/env.el b/lisp/env.el
index 5a4130eb3b..30b63a8e55 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 9e224e0b82..298cffb49a 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 210830a2b4..eb441c29b4 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 c8aa887a65..8e2a6b980d 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 210a7736cc..3d99c259aa 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 e724e367ab..3b362774b6 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 a6b7532e1f..b835191960 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 a2c9336826..5784e63d7f 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 934b52a938..ef876f464e 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 884c594b9e..0d16aaf541 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 149c858d2e..ce0104b305 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 d95e0eac0c..96b45899b4 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 08f52f1364..e40dc1fc25 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 896521eaf0..18cc8b5425 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 f0dbe69f79..765898da7b 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 d8d9e17c95..6a2ba785ba 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 4153f5c57b..fc12dc73ef 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 cc4b4a88f1..98ddebd0cf 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 8173829797..e13404ca13 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 87c3a61b66..252af715d7 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 eca8ad6a89..e92da7b725 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 45dae89990..9bd062a98d 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 cb57883ae6..4e7fed7b40 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 dd2da85d0e..e2489a8d0e 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 2e0e54a030..e1c495c903 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 5459d8b01e..54f91d134c 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 886ba60eb4..f500f4c127 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 34f7ce62c7..38e0b2885b 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 0a1e38fe24..833ad2f1e7 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 69a83fa032..8df7ea9e4c 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 860fdbb77c..541c67a74f 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 e51e6056fb..14e86c199a 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 0417429552..73c7316b34 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 162b22e15c..20a91b7a30 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 d1fa5c7f12..fc0f6128f6 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 0c4d343090..7eaf7fdab0 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 89b598669c..137ce99d5e 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 08f7208945..4e91a7affa 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 b71e9204f3..0d156db0e6 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 1dec0ed7ca..21fa6143e3 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 b74b4a8a40..05c30dedf4 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 ef137be9bb..578f765362 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 87314086a4..f93d2a02d7 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 e92b6b4df2..0b95efaf04 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 3ef88fe686..2eae65a792 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 acc2b26c55..47e7aa4cd5 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 6b26f0cb92..da6c91bca5 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 3991a4ee8e..b0e4598bac 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 a8c230cb7b..8e0738f31c 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 92387a2157..632efa81a8 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/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index ceb0d4a30d..e69cbbc37e 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
-;; Maintainer:    Didier Verna <didier@xemacs.org>
 ;; Created:       Tue Jul 20 10:42:55 1999
 ;; Keywords:      calendar mail news
 
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index aca29fea57..3c69427a1e 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
-;; Maintainer:    Didier Verna <didier@xemacs.org>
 ;; Created:       Fri Jul 16 18:55:42 1999
 ;; Keywords:      calendar mail news
 
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 4d31d0a1f1..9e6c6aeed2 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: network, spam, mail, bogofilter, BBDB, dspam, dig, whitelist, blacklist, gmane, hashcash, spamassassin, bsfilter, ifile, stat, crm114, spamoracle
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 50d69e70de..9d99736807 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 a16d1e34b4..9c90d6da14 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 6cc3f0d4f7..304c45dad3 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 42ff375565..0677368a4d 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 ee5a9c0fce..df501dfc68 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/hfy-cmap.el b/lisp/hfy-cmap.el
index a34efa60b4..70fcd1504e 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -7,7 +7,6 @@
 ;; Filename: hfy-cmap.el
 ;; Keywords: color, rgb
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
-;; Maintainer: Vivek Dasmohapatra <vivek@etla.org>
 ;; Created: 2002-01-20
 ;; Description: fallback code for color name -> rgb mapping
 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 404f448e0d..17d3dc7d8d 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 1c09bc26f6..e4fef214d6 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/htmlfontify.el b/lisp/htmlfontify.el
index 9fc029ec58..f37a76cd7b 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -8,7 +8,6 @@
 ;; Version: 0.21
 ;; Keywords: html, hypermedia, markup, etags
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
-;; Maintainer: Vivek Dasmohapatra <vivek@etla.org>
 ;; Created: 2002-01-05
 ;; Description: htmlize a buffer/source tree with optional hyperlinks
 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 1b69574a39..f275ec3a52 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
-;; Maintainer: John Paul Wallington <jpw@gnu.org>
 ;; Created: 2 Dec 2001
 ;; Keywords: buffer, convenience
 ;; Package: ibuffer
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index 2b28f18da5..edac484189 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
-;; Maintainer: John Paul Wallington <jpw@gnu.org>
 ;; Created: 6 Dec 2001
 ;; Keywords: buffer, convenience
 ;; Package: ibuffer
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 628e884094..4dfff3c791 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
-;; Maintainer: John Paul Wallington <jpw@gnu.org>
 ;; Created: 8 Sep 2000
 ;; Keywords: buffer, convenience
 
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 10fd3a698c..acf877b5d3 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Ken Manheimer <klm@i.am>
-;; Maintainer: Ken Manheimer <klm@i.am>
 ;; 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 c7a31a23e6..1531415e74 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 e51108ee28..17b715a66b 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 db11302086..6cc2cc3902 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 5084fe61ef..6e16e13183 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 bf87d6af76..1dbece73d6 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 c211887a39..61803950d1 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 8108ffe42a..246b3b979b 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 6c2a2dc9b9..c1d3f2b10a 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -9,7 +9,6 @@
 ;; Keywords: i18n, multilingual, isearch
 
 ;; Author: Kenichi HANDA <handa@etl.go.jp>
-;; Maintainer: Kenichi HANDA <handa@etl.go.jp>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 395e6c4dcd..b317b8aad7 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 b573e1e47c..14da02c73d 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 543f2e3388..fd68137f2b 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 3266b93b44..a58e4e5dc0 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -8,7 +8,6 @@
 
 ;; Author: Kenichi HANDA <handa@etl.go.jp>
 ;;	   Naoto TAKAHASHI <ntakahas@etl.go.jp>
-;; Maintainer: Kenichi HANDA <handa@etl.go.jp>
 ;; 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 0e67a62aa6..f22fb8d38b 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 bb29c2914b..5aaeae438a 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 ee392b349e..dc1836865b 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 3aa84f45b0..b6ff9f12f1 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 63fb449b48..8c9dd8abb6 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/jsonrpc.el b/lisp/jsonrpc.el
index c02e685974..0fffee6866 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
 ;; Author: João Távora <joaotavora@gmail.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Keywords: processes, languages, extensions
 ;; Package-Requires: ((emacs "25.2"))
 ;; Version: 1.0.7
diff --git a/lisp/kermit.el b/lisp/kermit.el
index f6ed1fbda1..77c2cbd4d6 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/czech.el b/lisp/language/czech.el
index b43d956dd6..f4189deafc 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
-;; Maintainer: Pavel Janík <Pavel@Janik.cz>
 ;; Keywords: multilingual, Czech
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 8c38175972..e962b000b4 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -525,7 +525,6 @@ turkish-case-conversion-disable
     (set-case-syntax ?ı "w" table)))
 
 ;; Polish ISO 8859-2 environment.
-;; Maintainer: Wlodek Bzyl <matwb@univ.gda.pl>
 ;; Keywords: multilingual, Polish
 
 (set-language-info-alist
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 9b4af19985..2bbfdc190b 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
-;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Indian, Devanagari
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index d63e9b465f..e0b94c4cfd 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -5,7 +5,6 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
-;; Maintainer:  Kenichi Handa <handa@m17n.org>
 ;;		KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: 	multilingual, i18n, Indian
 
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index 4dfdb54a10..fbab8d760b 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -4,7 +4,6 @@
 
 ;; Authors:    Tibor Šimko <tibor.simko@fmph.uniba.sk>,
 ;;             Milan Zamazal <pdm@zamazal.org>
-;; Maintainer: Pavel Janík <Pavel@Janik.cz>
 ;; Keywords: multilingual, Slovak
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/leim/quail/czech.el b/lisp/leim/quail/czech.el
index 305b7397c2..28fd53d7a6 100644
--- a/lisp/leim/quail/czech.el
+++ b/lisp/leim/quail/czech.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
-;; Maintainer: Pavel Janík <Pavel@Janik.cz>
 ;; Keywords: i18n, multilingual, input method, Czech
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/leim/quail/latin-pre.el b/lisp/leim/quail/latin-pre.el
index bcf81f4a14..8e0b2748e3 100644
--- a/lisp/leim/quail/latin-pre.el
+++ b/lisp/leim/quail/latin-pre.el
@@ -32,7 +32,6 @@
 ;;
 ;; polish-slash:
 ;; Author: Włodek Bzyl <matwb@univ.gda.pl>
-;; Maintainer: Włodek Bzyl <matwb@univ.gda.pl>
 ;;
 ;; latin-[89]-prefix: Dave Love <fx@gnu.org>
 ;;
diff --git a/lisp/leim/quail/sami.el b/lisp/leim/quail/sami.el
index 7cfd0b7348..88d34092dd 100644
--- a/lisp/leim/quail/sami.el
+++ b/lisp/leim/quail/sami.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2019 Free Software Foundation, Inc.
 
 ;; Author: Wojciech S. Gac <wojciech.s.gac@gmail.com>
-;; Maintainer: Wojciech S. Gac <wojciech.s.gac@gmail.com>>
 ;; Keywords: i18n, multilingual, input method, Sámi
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/leim/quail/slovak.el b/lisp/leim/quail/slovak.el
index cf07790511..9a1fed5898 100644
--- a/lisp/leim/quail/slovak.el
+++ b/lisp/leim/quail/slovak.el
@@ -4,7 +4,6 @@
 
 ;; Authors: Tibor Šimko <tibor.simko@fmph.uniba.sk>
 ;;	Milan Zamazal <pdm@zamazal.org>
-;; Maintainer: Pavel Janík <Pavel@Janik.cz>
 ;; Keywords: i18n, multilingual, input method, Slovak
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/linum.el b/lisp/linum.el
index 0b4b0083ed..6fe30571c6 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 4e5d8e0f38..69f2c0bdcc 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 67e8aa7d40..c43d147622 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 436f9e3e02..17a37f1554 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 1f2c46834e..7ab97ebffe 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 4b38506d8a..b9020a299a 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 62094bfe2d..2a2ff3dec1 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 c637e242c4..2cd6d56b42 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/hashcash.el b/lisp/mail/hashcash.el
index 6068952997..ec17d669f3 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 c1e90c3dcb..e610806665 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 cbcbdfaeb2..f561c088a2 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 d59df88c68..17f4f0cba0 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 42896c18eb..68e44f820c 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/mspools.el b/lisp/mail/mspools.el
index 9c8e72e7f4..b1cbd9e549 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
-;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Created: 22 Jan 1997
 ;; Keywords: mail
 ;; location: http://www.anc.ed.ac.uk/~stephen/emacs/
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 10db110c70..3172c9760f 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 a53a77e47e..4cf624cedd 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 91291b8d33..d0ebf7df47 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 01d552469f..a9ce1e6fee 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 9427796a06..ee71ab4f6e 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 af528135cc..d32147f4af 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 ba0c2ae77c..4c42935899 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 12d37615d6..d95670849d 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 4a701038ac..18185ec647 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 79a322c1d9..80cfbfd721 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 208ebb6801..0db0557083 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/smtpmail.el b/lisp/mail/smtpmail.el
index 05ef29a114..37f3807769 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -3,8 +3,6 @@
 ;; Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
-;; Maintainer: Simon Josefsson <simon@josefsson.org>
-;; w32 Maintainer: Brian D. Carlstrom <bdc@ai.mit.edu>
 ;; ESMTP support: Simon Leinen <simon@switch.ch>
 ;; Hacked by Mike Taylor, 11th October 1999 to add support for
 ;; automatically appending a domain to RCPT TO: addresses.
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index ad69dca8c4..317324613b 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 bbf3c83c55..499f16e9d2 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 4d9ad67262..c409210a0c 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 10ad78ea17..847e304e97 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 d52ca2156d..feb0e09ab1 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/master.el b/lisp/master.el
index a054d7f597..36384a8df0 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: Alex Schroeder <alex@gnu.org>
 ;; Version: 1.0.2
 ;; Keywords: comm
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 4ff60ed991..d12cdd731a 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/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 3bbf509989..0951474a76 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index c6cdfc40c9..be4f898a64 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1994-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index 3c0c481495..13a1901b69 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index b96ef74538..a5614f5255 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index eb173df47c..a459d27ee2 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index bc09764656..c70e11e773 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -4,7 +4,6 @@
 ;; Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Version: 8.6+git
 ;; Keywords: mail
 
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index caf4071583..5b4c34fb6a 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index da7c87ea81..9f603c0c71 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 61d531fe99..62888b7867 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 1d929e8f99..5a4c23a972 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index 21034bc550..4b5a208a26 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index db80f90494..1619f4679c 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -4,7 +4,6 @@
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords:  mail, spam
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 4fc31ed121..46762f12fd 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index 27dda79484..ee6fa83abb 100644
--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2003, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 9901548b90..6f126967fe 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index 033c1cb350..05f0a23978 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Jeffrey C Honig <jch@honig.net>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index cd689d6250..8c1a07dadc 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index c017baec66..b6e9df692d 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Indexed search by Satyaki Das <satyaki@theforce.stanford.edu>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index f7d7c62795..9989dc9f1c 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 7dad81dbce..4f7068156e 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index 3e89d1b65e..4f9aaa2fba 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index 0fc560b90d..c511af17e5 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index 41610b253d..a24f020091 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index cad6278719..0938729e78 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index ddb001ac8f..4ff84a66f7 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 86c1e219f0..fa41d80a69 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Sam Steingold <sds@gnu.org>
-;; Maintainer: Sam Steingold <sds@gnu.org>
 ;; Created: 1998-05-18
 ;; Keywords: utilities
 
diff --git a/lisp/misc.el b/lisp/misc.el
index 4cf6cadf65..0080762700 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 8428c1e013..af53c05f57 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 7a1a338fcc..b626624fbc 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 23f491db0f..eb665632ff 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -1,7 +1,6 @@
 ;;; mwheel.el --- Wheel mouse support
 
 ;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
-;; Maintainer: William M. Perry <wmperry@gnu.org>
 ;; Keywords: mouse
 ;; Package: emacs
 
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index b0a1e1799f..81b654c9a9 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 aa31e25fa9..0c63cbd5a4 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/eudc-bob.el b/lisp/net/eudc-bob.el
index 59a4637eb8..0ac1b3c2bf 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index a520eca56f..3f9e5b0571 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 19788ba16c..a97953d261 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 81116292aa..d5869be5ec 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 3c9c01d0f9..1b6f54cbaa 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index f91d0af858..45020e0ff9 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index 7514d1ad29..f235fdc5af 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index 0202b173bb..1eaa38588f 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index c25d787391..d7fd058747 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 75fc7d6221..2df473cf71 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/ntlm.el b/lisp/net/ntlm.el
index 88c561910c..44b7475ddf 100644
--- a/lisp/net/ntlm.el
+++ b/lisp/net/ntlm.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Taro Kawagishi <tarok@transpulse.org>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: NTLM, SASL, comm
 ;; Version: 2.1.0
 ;; Created: February 2001
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index 599e2305f7..1911450825 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/quickurl.el b/lisp/net/quickurl.el
index 3f7e9d192d..91e980e4f1 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
-;; Maintainer: Dave Pearson <davep@davep.org>
 ;; Created: 1999-05-28
 ;; Keywords: hypermedia
 
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index bf6f5359aa..89b1366129 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Noah Friedman
-;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: unix, comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index cf3634f7d9..465927dfdd 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/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 3d3b14e737..385d81a153 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -4,7 +4,6 @@
 
 ;; Author: Daniel Pittman <daniel@inanna.danann.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
-;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
 
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 11b1af8116..4a8b0161dc 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -6,7 +6,6 @@
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
-;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
 
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index c12a4ebc4c..7d38dbd1f6 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
-;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, terminals
 ;; Package: tramp
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 48152444a6..3140ea9faa 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4,7 +4,6 @@
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
-;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
 ;; Version: 2.4.2-pre
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 83d34c0222..0ec42a58f9 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -4,7 +4,6 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
-;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
 
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index ab2be080a3..9d9e98013f 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: code extracted from Emacs-20's simple.el
-;; Maintainer: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: comment uncomment
 ;; Package: emacs
 
diff --git a/lisp/novice.el b/lisp/novice.el
index 3da4e25810..1da4b71dc9 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 c83d5d4724..fbab506cce 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 e2bf14f0dc..dfd7b2b492 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 fba54c1ae0..8044a0ef93 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/cc-compat.el b/lisp/obsolete/cc-compat.el
index bbacd12113..9a0bbb7ef0 100644
--- a/lisp/obsolete/cc-compat.el
+++ b/lisp/obsolete/cc-compat.el
@@ -4,7 +4,6 @@
 
 ;; Authors:    1998- Martin Stjernholm
 ;;	       1994-1999 Barry A. Warsaw
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    August 1994, split from cc-mode.el
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/obsolete/eudcb-ph.el b/lisp/obsolete/eudcb-ph.el
index 20f8f4a5a8..8fde50e648 100644
--- a/lisp/obsolete/eudcb-ph.el
+++ b/lisp/obsolete/eudcb-ph.el
@@ -4,7 +4,6 @@
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
-;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Keywords: comm
 ;; Package: eudc
 ;; Obsolete-since: 25.1
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 5180d4527b..10af6ab95f 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 cfdc9dc67c..24c9b67abd 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 bdb3406a3d..373ee35d8e 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 b64e84003f..e520faf77b 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/iswitchb.el b/lisp/obsolete/iswitchb.el
index 5b0df1e695..ad2067fdef 100644
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1996-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
-;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Keywords: completion convenience
 ;; Obsolete-since: 24.4
 
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index 44f8528b20..5167928002 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 6383a4266d..91efa29320 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 714b3fbb76..f2b081d672 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/longlines.el b/lisp/obsolete/longlines.el
index 2ef5324e51..f221322824 100644
--- a/lisp/obsolete/longlines.el
+++ b/lisp/obsolete/longlines.el
@@ -5,7 +5,6 @@
 ;; Authors:    Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;;             Alex Schroeder <alex@gnu.org>
 ;;             Chong Yidong <cyd@stupidchicken.com>
-;; Maintainer: Chong Yidong <cyd@stupidchicken.com>
 ;; Obsolete-since: 24.4
 ;; Keywords: convenience, wp
 
diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index d1b702ed55..9d0c5daf5e 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 2f74faf1d6..33cc43ccbe 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 81739dfa6c..190db94f4b 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/otodo-mode.el b/lisp/obsolete/otodo-mode.el
index 7e9cc231d3..190f2fb0d7 100644
--- a/lisp/obsolete/otodo-mode.el
+++ b/lisp/obsolete/otodo-mode.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Oliver Seidel <privat@os10000.net>
-;; Maintainer: Stephen Berman <stephen.berman@gmx.net>
 ;; Created: 2 Aug 1997
 ;; Keywords: calendar, todo
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/pc-mode.el b/lisp/obsolete/pc-mode.el
index 6d1a456d61..4908b51259 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 dfa80097b3..53537a0906 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 884cd3e4e4..ba36f2dcda 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 6bd4278925..752ebf59d8 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 ce6f2309fd..d0631b32f0 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/tpu-edt.el b/lisp/obsolete/tpu-edt.el
index 8db1c4f5f1..0848135715 100644
--- a/lisp/obsolete/tpu-edt.el
+++ b/lisp/obsolete/tpu-edt.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Version: 4.5
 ;; Keywords: emulations
 ;; Obsolete-since: 24.5
diff --git a/lisp/obsolete/tpu-extras.el b/lisp/obsolete/tpu-extras.el
index f19a67dd48..8b5818dfca 100644
--- a/lisp/obsolete/tpu-extras.el
+++ b/lisp/obsolete/tpu-extras.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Keywords: emulations
 ;; Package: tpu-edt
 ;; Obsolete-since: 24.5
diff --git a/lisp/obsolete/tpu-mapper.el b/lisp/obsolete/tpu-mapper.el
index 60e0e49b8b..a7aa0cb0d0 100644
--- a/lisp/obsolete/tpu-mapper.el
+++ b/lisp/obsolete/tpu-mapper.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Keywords: emulations
 ;; Package: tpu-edt
 ;; Obsolete-since: 24.5
diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el
index 925289102c..2ad97c229c 100644
--- a/lisp/obsolete/vc-arch.el
+++ b/lisp/obsolete/vc-arch.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
-;; Maintainer:  Stefan Monnier <monnier@gnu.org>
 ;; Package: vc
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/obsolete/yow.el b/lisp/obsolete/yow.el
index 5cbb2ef21e..eddb3f9029 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/org-crypt.el b/lisp/org/org-crypt.el
index 9cd76c9eca..5e52fe4d4b 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -5,7 +5,6 @@
 ;; Filename: org-crypt.el
 ;; Keywords: org-mode
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Maintainer: Peter Jones <pjones@pmade.com>
 ;; Description: Adds public key encryption to Org buffers
 ;; URL: http://www.newartisans.com/software/emacs.html
 ;; Compatibility: Emacs22
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index a3dcb77554..81ebd0341a 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
-;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 016105ef53..ecaddbca15 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -6,7 +6,6 @@
 ;;       Daniel M German <dmg AT uvic DOT org>
 ;;       Sebastian Rose <sebastian_rose AT gmx DOT de>
 ;;       Ross Patterson <me AT rpatterson DOT net>
-;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
 ;; Keywords: org, emacsclient, wp
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index ce6dd24a83..3d3673dc55 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4,7 +4,6 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 ;; Version: 9.1.9
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 74312bc20f..abe3db33b7 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -2,7 +2,6 @@
 ;; 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>
 ;; Keywords: hypermedia, outlines, wp
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/outline.el b/lisp/outline.el
index 74df77b8be..7783d37e0a 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 13908d46ee..d00e7d9a81 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/5x5.el b/lisp/play/5x5.el
index e13a3c9a25..28748cc351 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
-;; Maintainer: Dave Pearson <davep@davep.org>
 ;; Created: 1998-10-03
 ;; Keywords: games puzzles
 
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 6b0b33b633..95598f0ab9 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
-;; Maintainer: Richard Stallman <rms@gnu.org>
 ;; Keywords: games
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index e461b37e36..fb310faf4c 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 a5880c0884..fc76f2b724 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 b1ab6703a4..e9c78f5e5c 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 6d5553b320..562e5c0ad2 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 d762290f0d..1f2e2c0098 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 6cce1e5643..7d9f1475f3 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 d884c0a255..c1394a31d7 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 ff1bf03e11..6d54f6d08a 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/play/zone.el b/lisp/play/zone.el
index 40d43dccc3..c45f38383a 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Victor Zandy <zandy@cs.wisc.edu>
-;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
 ;; Keywords: games
 ;; Created: June 6, 1998
 
diff --git a/lisp/printing.el b/lisp/printing.el
index f2495ecda3..d584e46cec 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2001, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.9.3
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index e01f1e8ecb..64108f1a2e 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -5,7 +5,6 @@
 ;; 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>
 ;; Keywords: languages ada
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index d9fa77cb0e..1059991286 100644
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot <briot@gnat.com>
-;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
 ;; Keywords: languages, ada, project file
 ;; Package: ada-mode
 
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index ef42b0d936..e8f3a0c02e 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -6,7 +6,6 @@
 ;; Authors: Daniel Pfeiffer
 ;;	Markus Heritsch
 ;;	Rolf Ebert <ebert@waporo.muc.de>
-;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
 ;; Keywords: languages, ada
 ;; Package: ada-mode
 
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index c9c923e1d6..1097ec2538 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -5,7 +5,6 @@
 ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Rolf Ebert <ebert@inf.enst.fr>
 ;;      Emmanuel Briot <briot@gnat.com>
-;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
 ;; Keywords: languages ada xref
 ;; Package: ada-mode
 
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index c56d16e305..491b780bd0 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-align.el b/lisp/progmodes/cc-align.el
index 009f58ea58..4977f90190 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 1a67a95927..ff4ea1a090 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/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 0cbff579d2..3429e4361a 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:     Martin Stjernholm
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    15-Jul-2000
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index efc6747de4..76a0c57dd4 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index d20e3ef32d..ada58dedbb 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index c0f044ddfe..3dcd559c58 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index b3a9dd480b..49dfd729d8 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -4,7 +4,6 @@
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             2002- Martin Stjernholm
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    07-Jan-2002
 ;; Keywords:   c languages
 ;; Package:    cc-mode
@@ -1319,7 +1318,7 @@ c-font-lock-declarations
   ;;(message "c-font-lock-declarations search from %s to %s" (point) limit)
   (c-skip-comments-and-strings limit)
   (when (< (point) limit)
-  
+
     (save-restriction
       (let (;; The position where `c-find-decl-spots' last stopped.
 	    start-pos
diff --git a/lisp/progmodes/cc-guess.el b/lisp/progmodes/cc-guess.el
index 88e577a41c..b96f790d36 100644
--- a/lisp/progmodes/cc-guess.el
+++ b/lisp/progmodes/cc-guess.el
@@ -5,7 +5,6 @@
 
 ;; Author:     1994-1995 Barry A. Warsaw
 ;;             2011-     Masatake YAMATO
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    August 1994, split from cc-mode.el
 ;; Keywords:   c languages oop
 
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 9d2f689e58..8f3221cb66 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index c8e37e0202..67b5ff4d8f 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -7,7 +7,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index e4ff9f019d..cc09182075 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    a long, long, time ago. adapted from the original c-mode.el
 ;; Keywords:   c languages
 ;; The version header below is used for ELPA packaging.
@@ -1272,7 +1271,7 @@ c-before-change-check-unbalanced-strings
 	  (c-clear-char-property (point) 'syntax-table)
 	  (c-truncate-semi-nonlit-pos-cache (point)))))
 
-    (unless 
+    (unless
 	(or (and
 	     ;; Don't set c-new-BEG/END if we're in a raw string.
 	     (eq beg-literal-type 'string)
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 92ea67128f..0082b7306d 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index b818bced73..a9181cae29 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -8,7 +8,6 @@
 ;;             1987 Dave Detlefs
 ;;             1987 Stewart Clamen
 ;;             1985 Richard M. Stallman
-;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
 ;; Keywords:   c languages
 ;; Package:    cc-mode
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index efe648bc03..d969f401cb 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
-;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: languages
 ;; Version: 1.4
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 1a0d9bdbb7..3930f09392 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 ba007d67c0..fd3eec7609 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 d5803c77bb..757f0f2607 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/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index b8441a79d9..53d37b689f 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.2
 ;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index f28f49090d..70dc84519f 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.10
 ;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 98284faf29..94d9643261 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.1
 ;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 5f9f9b2c19..25500f1618 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.2
 ;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index 88644bbe89..dbba87b3ef 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.9
 ;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index cbc058e476..291d510020 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.0
 ;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 9e712353e9..e55e01e3e9 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.4
 ;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 7e7efacf1e..f26ad0a6a8 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 4.4
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 3faec4959b..0f44487d43 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 cb1b17b447..d62c1316ee 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 910c320ab8..54ca135f27 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/f90.el b/lisp/progmodes/f90.el
index 9de80635e9..58d1308fa1 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1995-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Torbjörn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: fortran, f90, languages
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el
index dbf7561944..328402bd3c 100644
--- a/lisp/progmodes/flymake-proc.el
+++ b/lisp/progmodes/flymake-proc.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 1.0
 ;; Keywords: c languages tools
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 4bb657e953..88ade4687a 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 1.0.6
 ;; Package-Requires: ((emacs "26.1"))
 ;; Keywords: c languages tools
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index f01e866f55..6cfdcd2397 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
-;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: fortran, languages
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 716f40c1f3..e09aaa3741 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/glasses.el b/lisp/progmodes/glasses.el
index 2bfc256e18..8dcf84a70b 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
-;; Maintainer: Milan Zamazal <pdm@zamazal.org>
 ;; Keywords: tools
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 79178c4346..d094c95fcf 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 4306f5daa0..f5680f263b 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/hideif.el b/lisp/progmodes/hideif.el
index 32b0b7551f..74fda4262b 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -4,7 +4,6 @@
 
 ;; Author: Brian Marick
 ;;	Daniel LaLiberte <liberte@holonexus.org>
-;; Maintainer: Luke Lee <luke.yx.lee@gmail.com>
 ;; Keywords: c, outlines
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el
index 51c9117cd4..dcb7d0184c 100644
--- a/lisp/progmodes/idlw-complete-structtag.el
+++ b/lisp/progmodes/idlw-complete-structtag.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Old-Version: 1.2
 ;; Keywords: languages
 ;; Package: idlwave
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 4588e93dcf..7596e5fa4b 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -4,7 +4,6 @@
 ;;
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Package: idlwave
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index a3b079830b..c35082c6e9 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -5,7 +5,6 @@
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@astro.uva.nl>
 ;;          Chris Chase <chase@att.com>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Keywords: processes
 ;; Package: idlwave
 
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index d3b442c056..fe31eeb46c 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Keywords: processes
 ;; Package: idlwave
 
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 6f56ce052a..4bbb67f3b9 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -5,7 +5,6 @@
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
 ;;          Chris Chase <chase@att.com>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Version: 6.1.22
 ;; Keywords: languages
 
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a0adaa84ee..4276fd18f6 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -4,7 +4,6 @@
 
 ;; Author: Karl Landstrom <karl.landstrom@brgeight.se>
 ;;         Daniel Colascione <dan.colascione@gmail.com>
-;; Maintainer: Daniel Colascione <dan.colascione@gmail.com>
 ;; Version: 9
 ;; Date: 2009-07-25
 ;; Keywords: languages, javascript
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index cffb749c3e..c3ff23558c 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 a759709b5c..1dd5d51df8 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 aa412304c5..087d1f65fd 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 8a7e24e5ad..4d4e2e1cd4 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/opascal.el b/lisp/progmodes/opascal.el
index 7d51816bf4..236fcd5158 100644
--- a/lisp/progmodes/opascal.el
+++ b/lisp/progmodes/opascal.el
@@ -4,7 +4,6 @@
 
 ;; Authors: Ray Blaak <blaak@infomatch.com>,
 ;;          Simon South <ssouth@member.fsf.org>
-;; Maintainer: Simon South <ssouth@member.fsf.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 7cbd30a0d1..f01d6b6bb2 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 2b057356b1..bd56d1a7c7 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/prolog.el b/lisp/progmodes/prolog.el
index 296a7ac3c9..41eb5c73e7 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -7,7 +7,6 @@
 ;;          Milan Zamazal <pdm(at)freesoft(dot)cz>
 ;;          Stefan Bruda <stefan(at)bruda(dot)ca>
 ;;          * See below for more details
-;; Maintainer: Stefan Bruda <stefan(at)bruda(dot)ca>
 ;; Keywords: prolog major mode sicstus swi mercury
 
 (defvar prolog-mode-version "1.22"
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index d9406278e9..92824b63e6 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
-;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Created:    20 Aug 1997
 ;; Version:    1.1i
 ;; Keywords:   PostScript, languages
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 188bc973d9..74e865bd0b 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 853a3500ee..8f52a36678 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/simula.el b/lisp/progmodes/simula.el
index 3bbf4e0aa2..2064d2d949 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no>
-;; Maintainer: simula-mode@ifi.uio.no
 ;;   (above email addresses invalid as of April 2008)
 ;; Adapted-By: ESR
 ;; Keywords: languages
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 2d33b3130c..5ab9ff1772 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: Michael Mauger <michael@mauger.com>
 ;; Version: 3.6
 ;; Keywords: comm languages processes
 ;; URL: https://savannah.gnu.org/projects/emacs/
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index ffb3d41ab6..31315e229e 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/vera-mode.el b/lisp/progmodes/vera-mode.el
index a03556ee12..f34b21e4cf 100644
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author:      Reto Zimmermann <reto@gnu.org>
-;; Maintainer:  Reto Zimmermann <reto@gnu.org>
 ;; Version:     2.28
 ;; Keywords:    languages vera
 ;; WWW:         http://www.iis.ee.ethz.ch/~zimmi/emacs/vera-mode.html
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 13d0cfa67e..53b35020a3 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -4,7 +4,6 @@
 
 ;; Authors:     Reto Zimmermann <reto@gnu.org>
 ;;              Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
-;; Maintainer:  Reto Zimmermann <reto@gnu.org>
 ;; Keywords:    languages vhdl
 ;; WWW:         http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
 
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index 62c42d39c6..7ae47126a5 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-def.el b/lisp/ps-def.el
index 2063133890..4e95291cd1 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -4,7 +4,6 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;	Kenichi Handa <handa@m17n.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.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 c88d6d2679..f15bd9ccf7 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -4,7 +4,6 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;	Kenichi Handa <handa@m17n.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.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 59ac84a363..63d7c29c96 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6,7 +6,6 @@
 ;;	Jacques Duthen (was <duthen@cegelec-red.fr>)
 ;;	Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;	Kenichi Handa <handa@m17n.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
 ;;	Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
 ;; Version: 7.3.5
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index 784b4356b4..f097ceac61 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -6,7 +6,6 @@
 ;;	Jacques Duthen (was <duthen@cegelec-red.fr>)
 ;;	Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;	Kenichi Handa <handa@m17n.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@m17n.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/rect.el b/lisp/rect.el
index 17907534ac..034f5901d3 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 1985, 1999-2019 Free Software Foundation, Inc.
 
-;; Maintainer: Didier Verna <didier@xemacs.org>
 ;; Keywords: internal
 ;; Package: emacs
 
diff --git a/lisp/register.el b/lisp/register.el
index 775e1a2cc9..d3825fe8e2 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 9d1b7bf747..00b8be5328 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 22f9986efb..0416845e9c 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 8f4044deac..bdb2e4b504 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/ruler-mode.el b/lisp/ruler-mode.el
index c5c88d03e0..093dd497dc 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 24 Mar 2001
 ;; Version: 1.6
 ;; Keywords: convenience
diff --git a/lisp/savehist.el b/lisp/savehist.el
index fb3b748339..84cba61aab 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 730d31ead2..960cace206 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 dc0df7ab3f..4fc9df8460 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 8281edb172..72127321c9 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 af6bf467e4..a8adc168f9 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 436a44a7e9..f692673d4f 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 73157d6f5f..e3b404c16d 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
-;; 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 5357027211..6e2ae85fce 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 4454791ad2..c0e8d58c80 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 bce73d6bfe..1d06b648a2 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 6ea1c44060..86cb1804a3 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 1f1f9caec3..9e4c79769d 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 421a6ea37d..a88118e3b9 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 9265b8a52e..29daaa5690 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 05fb9fea68..c97d9b96bd 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 14b292d441..1f4be160f8 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 37cd8fb2fd..345771e19c 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 0b7d5db01e..b5c77a9332 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 599da9ac80..c75fe7c373 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.el b/lisp/term.el
index 553c3a1af4..67226df1b4 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Per Bothner <per@bothner.com>
-;; Maintainer: Dan Nicolaescu <dann@ics.uci.edu>, Per Bothner <per@bothner.com>
 ;; Based on comint mode written by: Olin Shivers <shivers@cs.cmu.edu>
 ;; Keywords: processes
 
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index b7a778fc00..d7fceb8308 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 09275991cf..c434ea6b9c 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 307586f221..2718aecb9a 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/artist.el b/lisp/textmodes/artist.el
index e9b17795a9..19d1df6d51 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:       Tomas Abrahamsson <tab@lysator.liu.se>
-;; Maintainer:   Tomas Abrahamsson <tab@lysator.liu.se>
 ;; Keywords:     mouse
 ;; Version:	 1.2.6
 ;; Release-date: 6-Aug-2004
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 7a5d3ef775..de822326fb 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/bibtex.el b/lisp/textmodes/bibtex.el
index a560c2b097..0b74fc2ac0 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -9,7 +9,6 @@
 ;;      Mike Newton <newton@gumby.cs.caltech.edu>
 ;;      Aaron Larson <alarson@src.honeywell.com>
 ;;      Dirk Herrmann <D.Herrmann@tu-bs.de>
-;; Maintainer: Roland Winkler <winkler@gnu.org>
 ;; Keywords: BibTeX, LaTeX, TeX
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 11a77b5bb7..f2d37b036a 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Maintainer: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords: hypermedia
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index c285491a30..46dbcfef46 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 d18916dfd0..a06f8edd6f 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/less-css-mode.el b/lisp/textmodes/less-css-mode.el
index 4077789eb1..18996067d6 100644
--- a/lisp/textmodes/less-css-mode.el
+++ b/lisp/textmodes/less-css-mode.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Steve Purcell <steve@sanityinc.com>
-;; Maintainer: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords: hypermedia
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index ff3d2420df..f351b87026 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 f33d4df4d1..e5964d175d 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 220ef2d7fd..bc92121599 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 92a6b90785..8a1af3af25 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 b520849467..0b50854731 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 3ba52e61ea..03b1b048a1 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 f13e1d7161..3d4d0d2b06 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/refill.el b/lisp/textmodes/refill.el
index 5c69fdc1b0..a3f2625527 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
-;; Maintainer: Miles Bader <miles@gnu.org>
 ;; Keywords: wp
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index e9f9885d12..220993ac6d 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 5b42b25f77..d506b70661 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 8973e5dc1a..4522623305 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index cdff2f479f..2ef9cfa1df 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 9f5242a6f5..76a18c9408 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 005816e965..c9585b9299 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index 3ec96aa67d..376fc52f30 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index 1a605ecc75..570109fe59 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 30e4c45973..ad42d143d9 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2000, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 88ad4478b0..f5d0045acc 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index d763769a18..6396e4a876 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -2,7 +2,6 @@
 ;; Copyright (C) 1997-2000, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: auctex-devel@gnu.org
 ;; Keywords: tex
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 67ecd3ced8..efc11084fe 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/rst.el b/lisp/textmodes/rst.el
index ba5d7e4f46..5adcc8fdc2 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
-;; Maintainer: Stefan Merten <stefan at merten-home dot de>
 ;; Author: Stefan Merten <stefan at merten-home dot de>,
 ;;         Martin Blais <blais@furius.ca>,
 ;;         David Goodger <goodger@python.org>,
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 1b064fb825..1826129f0b 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/tex-mode.el b/lisp/textmodes/tex-mode.el
index 9c91d27b94..8611b735ba 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 9ccc73ad48..5a54e0d2d1 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 71cdcab57e..54306d2b74 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 e960e992a8..4f49c7f5d1 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 e676a5dae2..ac292e463b 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 e0bfd24557..8c904f5d0e 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 60a20e2d18..e0184a7ccb 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 e8f3cc7da6..3242d1dade 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 6a17a75654..dd0491a66a 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-stamp.el b/lisp/time-stamp.el
index 91e02bef51..45f90ecee3 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -5,7 +5,6 @@
 
 ;; This file is part of GNU Emacs.
 
-;; Maintainer: Stephen Gildea <gildea@stop.mail-abuse.org>
 ;; Keywords: tools
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/time.el b/lisp/time.el
index 35157c5e80..dc7b6e87fa 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -3,7 +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.
 
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 621f02479f..d3d3f4741e 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -4,7 +4,6 @@
 ;; Foundation, Inc.
 
 ;; Author: Masanobu Umeda
-;; Maintainer: umerin@mse.kyutech.ac.jp
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 44f04eab87..bb96b5a46a 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/tree-widget.el b/lisp/tree-widget.el
index 61bfacd56a..e4da23a387 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 16 Feb 2001
 ;; Keywords: extensions
 
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 37ebb5cbe7..e42818218e 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/type-break.el b/lisp/type-break.el
index 0ad79dd113..facb83dc26 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -4,7 +4,6 @@
 ;; Inc.
 
 ;; Author: Noah Friedman
-;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: extensions, timers
 ;; Created: 1994-07-13
 
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 3dd9e34135..29612b36c2 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 a4cf0f0ec0..dba313453f 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 5436084078..00d784a9b4 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 00803a103a..a11f5147af 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 a46e7bb385..dbcc9a6168 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 5242d42f04..eafac8a192 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 f077bc9ad6..c4178ac42a 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 f9efd44c5c..5cd4f46ed5 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 02c08af8b2..2811d4691b 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 523be87bc4..bee36592a1 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/pcvs.el b/lisp/vc/pcvs.el
index 4679996b35..0c03f0b8b8 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -11,7 +11,6 @@
 ;;	Stefan Monnier <monnier@cs.yale.edu>
 ;;	Greg Klanderman <greg@alphatech.com>
 ;;	Jari Aalto <jari.aalto@poboxes.com>
-;; Maintainer: Stefan Monnier <monnier@gnu.org>
 ;; Keywords: CVS, vc, release management
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 84838135fc..15f234fda6 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 ee1646cae5..3ab8c49640 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 626e190c1e..cc1845a59f 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-dav.el b/lisp/vc/vc-dav.el
index d0b202cd5f..693056c2b9 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Maintainer: Bill Perry <wmperry@gnu.org>
 ;; Keywords: url, vc
 ;; Package: vc
 
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index edbb83f3df..5c5e301d15 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 f05e8efff9..37c71f9864 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 876d824cea..f1b603b2a9 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 07b3d86b51..1871e1e95c 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 598e98250a..ee227b19a3 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 4e9f5a025f..0d27528e51 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 f8475925b0..b708cd41a7 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-svn.el b/lisp/vc/vc-svn.el
index 3c50c8fff6..05fa4470f5 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
-;; Maintainer:  Stefan Monnier <monnier@gnu.org>
 ;; Package: vc
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b992a8ebe0..d9fb8290d2 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 3e8b6ee838..7673d9b7b8 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 d13d8c31e8..d5bc3eb984 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 e74ce1e888..c8d5f0de20 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/vt-control.el b/lisp/vt-control.el
index 7175095d40..ee2463475e 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Keywords: terminals
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index d7b5f0a803..6678f49dfc 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/whitespace.el b/lisp/whitespace.el
index 2463e655b1..d0368b54a8 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: data, wp
 ;; Version: 13.2.2
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b9f98cdc4c..713c8575c7 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 2c9d177d0a..7e6a48460e 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 39d9b806d2..57354478fb 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 e4e2dec3b8..31d409c838 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
 
diff --git a/lisp/xml.el b/lisp/xml.el
index 1f3c05f4d9..682112c9f5 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot  <briot@gnat.com>
-;; Maintainer: Mark A. Hershberger <mah@everybody.org>
 ;; Keywords: xml, data
 
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/map-tests.el b/test/lisp/emacs-lisp/map-tests.el
index a54af8059b..5e044d4be8 100644
--- a/test/lisp/emacs-lisp/map-tests.el
+++ b/test/lisp/emacs-lisp/map-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el
index ef05e2b389..8f66ba4f92 100644
--- a/test/lisp/emacs-lisp/seq-tests.el
+++ b/test/lisp/emacs-lisp/seq-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/emacs-lisp/thunk-tests.el b/test/lisp/emacs-lisp/thunk-tests.el
index caa2c41546..69bfc19638 100644
--- a/test/lisp/emacs-lisp/thunk-tests.el
+++ b/test/lisp/emacs-lisp/thunk-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el
index e31ac6a4d4..baf696f073 100644
--- a/test/lisp/help-fns-tests.el
+++ b/test/lisp/help-fns-tests.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el
index 52f709f14c..f3e48739ce 100644
--- a/test/lisp/jsonrpc-tests.el
+++ b/test/lisp/jsonrpc-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
 ;; Author: João Távora <joaotavora@gmail.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Keywords: tests
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/test/lisp/md4-tests.el b/test/lisp/md4-tests.el
index 9712411419..56b09c14de 100644
--- a/test/lisp/md4-tests.el
+++ b/test/lisp/md4-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Mark Oteiza <mvoteiza@udel.edu>
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/org/org-tests.el b/test/lisp/org/org-tests.el
index 4b82aa8382..33f9e45946 100644
--- a/test/lisp/org/org-tests.el
+++ b/test/lisp/org/org-tests.el
@@ -2,8 +2,6 @@
 
 ;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/soundex-tests.el b/test/lisp/soundex-tests.el
index d8d79b85ce..4de45f9d53 100644
--- a/test/lisp/soundex-tests.el
+++ b/test/lisp/soundex-tests.el
@@ -2,8 +2,6 @@
 
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el
index 676d461076..d809b64634 100644
--- a/test/lisp/vc/diff-mode-tests.el
+++ b/test/lisp/vc/diff-mode-tests.el
@@ -1,7 +1,6 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Dima Kogan <dima@secretsauce.net>
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/vc/smerge-mode-tests.el b/test/lisp/vc/smerge-mode-tests.el
index 032afa9dc2..67f6468922 100644
--- a/test/lisp/vc/smerge-mode-tests.el
+++ b/test/lisp/vc/smerge-mode-tests.el
@@ -1,7 +1,5 @@
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index 8fa16cdccb..04c869ed93 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Glenn Morris <rgm@gnu.org>
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/vc/vc-hg-tests.el b/test/lisp/vc/vc-hg-tests.el
index 1bdc3204c0..7fc84610a0 100644
--- a/test/lisp/vc/vc-hg-tests.el
+++ b/test/lisp/vc/vc-hg-tests.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
-;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/xdg-tests.el b/test/lisp/xdg-tests.el
index 9c815065b2..b8bd606ec1 100644
--- a/test/lisp/xdg-tests.el
+++ b/test/lisp/xdg-tests.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
 ;; Author: Mark Oteiza <mvoteiza@udel.edu>
 
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index d813642f78..f257910877 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
-;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
 
 ;; This program is free software: you can redistribute it and/or modify
diff --git a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
index 250aeb1cf2..30ad34099b 100644
--- a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
+++ b/test/manual/etags/el-src/emacs/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/test/src/lcms-tests.el b/test/src/lcms-tests.el
index f1d1110283..d92ebcbeab 100644
--- a/test/src/lcms-tests.el
+++ b/test/src/lcms-tests.el
@@ -2,8 +2,6 @@
 
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
-- 
2.17.1


  parent reply	other threads:[~2019-05-19 16:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-18 12:42 Robert J. Chassel reference in Intro to Emacs Lisp Jean-Christophe Helary
2019-05-18 13:15 ` Richard Copley
2019-05-18 14:03   ` Jean-Christophe Helary
2019-05-18 14:31     ` Jean-Christophe Helary
2019-05-18 18:08       ` Paul Eggert
2019-05-18 21:41         ` Richard Stallman
2019-05-19  1:55           ` Jean-Christophe Helary
2019-05-19 16:32           ` Paul Eggert [this message]
2019-05-19 16:44             ` Omitting "Maintainer:" Stefan Monnier
2019-05-19 17:02               ` Eli Zaretskii
2019-05-19 19:18             ` Lars Ingebrigtsen
2019-05-20  4:38               ` Paul Eggert
2019-05-19 20:47             ` Omitting "Maintainer:" (was: Robert J. Chasell reference ...) Richard Stallman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2807078f-19a8-4648-3c65-31772934171c@cs.ucla.edu \
    --to=eggert@cs.ucla.edu \
    --cc=brandelune@gmail.com \
    --cc=emacs-devel@gnu.org \
    --cc=rms@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).