281 files changed, 281 insertions, 281 deletions
diff --git a/autogen.sh b/autogen.sh
index 7d2de4905ec..6b7c647c4c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 ## Copyright (C) 2011-2014 Free Software Foundation, Inc.
 ## Author: Glenn Morris <rgm@gnu.org>
-## Maintainer: FSF
+## 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 4cb7828d595..3f927382ded 100755
--- a/build-aux/make-info-dir
+++ b/build-aux/make-info-dir
@@ -5,7 +5,7 @@
 ## Copyright (C) 2013-2014 Free Software Foundation, Inc.
 ## Author: Glenn Morris <rgm@gnu.org>
-## Maintainer: FSF
+## Maintainer: emacs-devel@gnu.org
 ## This file is part of GNU Emacs.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index fdbe867377c..43b6a5583ee 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992, 2001-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev convenience
 ;; Package: emacs
diff --git a/lisp/align.el b/lisp/align.el
index 55ed477f4cf..1efc6e6505b 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience languages lisp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/array.el b/lisp/array.el
index 8c36b60e05a..ba72ad60d9b 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1987, 2000-2014 Free Software Foundation, Inc.
 ;; Author: David M. Brown
-;; Maintainer: FSF
+;; 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 06cfa80f5ac..5eb51707883 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -6,7 +6,7 @@
 ;; Author: Charlie Martin <crm@cs.duke.edu>
 ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: convenience
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 7106c739dca..416f6337d64 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992-1996, 1999-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 19f0ba3680e..d85caca6216 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1993-1995, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Package: emacs
diff --git a/lisp/case-table.el b/lisp/case-table.el
index d4f163e605f..6a9958cd54e 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Package: emacs
diff --git a/lisp/cdl.el b/lisp/cdl.el
index fe4ca84e253..c011e95bdf2 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
 ;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index afbed323e5d..4b4d9ca7f0b 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 10 Nov 2000
 ;; Keywords: syntax
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 3d10aff16e8..785e329165e 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; 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 d95bb63b4e5..b48b7c93de8 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
-;; Maintainer: FSF
+;; 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 7ca580978e4..8faa5243a11 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -4,7 +4,7 @@
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;      Simon Marshall <simon@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes
 ;; Package: emacs
diff --git a/lisp/completion.el b/lisp/completion.el
index e2252ed688c..7e5c2143870 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 86936df2905..212e29069eb 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996-1997, 1999-2014 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, faces
 ;; Package: emacs
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 08f8b185598..928c54db922 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
 ;;
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, faces
 ;; Package: emacs
diff --git a/lisp/custom.el b/lisp/custom.el
index 4ee1d45a1b0..09431c454ec 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, faces
 ;; Package: emacs
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 5c3d638f16c..92f60c87868 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Matthieu Devin <devin@lucid.com>
-;; Maintainer: FSF
+;; 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 297637d888f..02ed55b5bdf 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994-1996, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Boris Goldowsky <boris@gnu.org>
-;; Maintainer: FSF
+;; 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 c8e29b5ad96..1129dfd89f6 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Package: emacs
diff --git a/lisp/dired.el b/lisp/dired.el
index 4da67f4410d..ab5611b1d66 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Package: emacs
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 321f5d31cb2..0d670441ce5 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -5,7 +5,7 @@
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Based on a previous version by Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Package: emacs
diff --git a/lisp/dnd.el b/lisp/dnd.el
index c476295be11..73b531dfd16 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: window, drag, drop
 ;; Package: emacs
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index 3ba107de697..99b55173d8f 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1998, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index 035070f565a..15929db825c 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2014 Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
-;; Maintainer: FSF
+;; 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 209476f2374..6debd9f4239 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
-;; Maintainer: FSF
+;; 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 a6dcc84fc06..906d8a96cae 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index ed4c7b54187..dd6c6c4cb28 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -4,7 +4,7 @@
 ;; Author: Richard Mlynarik
 ;; (according to ack.texi and authors.el)
-;; Maintainer: FSF
+;; 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 8125ef83c28..32c4a824491 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; 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 7f0f1506f49..0340076720c 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1994, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
-;; Maintainer: FSF
+;; 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 1736e7d40d3..813576efb46 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -6,7 +6,7 @@
 ;;         Inge Wallin <inge@lysator.liu.se>
 ;;         Thomas Bellman <bellman@lysator.liu.se>
 ;;         Toby Cubitt <toby-predictive@dr-qubit.org>
-;; Maintainer: FSF
+;; 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 6e0361196de..a497acd637e 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Rick Sladkey <jrs@world.std.com>
-;; Maintainer: FSF
+;; 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 60203da9da6..b1e06410da4 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -4,7 +4,7 @@
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
-;; Maintainer: FSF
+;; 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 ffe05675ae2..4b9e6d8fd23 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -4,7 +4,7 @@
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 9df52bffe5c..e2e468717a6 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5,7 +5,7 @@
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 12657b6d364..40f1531e0f7 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2011-2014 Free Software Foundation, Inc.
 ;; Author: Igor Kuzmin <kzuminig@iro.umontreal.ca>
-;; Maintainer: FSF
+;; 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 4aed22eac9f..6c62ce5c830 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -4,7 +4,7 @@
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Created: July 1987
-;; Maintainer: FSF
+;; 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 99a50d48b5d..ab6368beeab 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994, 2001-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; 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 949091cf478..a6ccedc0310 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -5,7 +5,7 @@
 ;; Inc.
 ;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 301111d380d..bf013ea84e1 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -4,7 +4,7 @@
 ;; Author: Doug Cutting <doug@csli.stanford.edu>
 ;;      Jamie Zawinski <jwz@lucid.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index bb5f4baf9f9..e4bcb4bf294 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, tools, maint
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 5b497399927..c7a564074cb 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Barry A. Warsaw
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 26-Feb-1994
 ;; Keywords: debugging lisp tools
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
index 4e642b16460..ff9062150db 100644
--- a/lisp/emacs-lisp/find-gc.el
+++ b/lisp/emacs-lisp/find-gc.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 6870565ec52..30523c5d675 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985-1987, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el
index adb6c596c1d..170ebccab0c 100644
--- a/lisp/emacs-lisp/gulp.el
+++ b/lisp/emacs-lisp/gulp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Sam Shteingold <shteingd@math.ucla.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index 46acb2e5fdf..eca2e22cabc 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; 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 2963ed196f3..834a4e5ac8a 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; 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 db15aea7a20..7f396b4a344 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985-1986, 1999-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 58780bfc657..5ce8fa523a0 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994, 2000-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; 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 7e4534a1f42..4675291abeb 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1991-1995, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, extensions
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 9d83e133744..b2d4f2b71dd 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994-2014 Free Software Foundation, Inc.
 ;; Author: Simon Marshall <simon@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: strings, regexps, extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index 4949d59a5be..3d430a6756d 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index f6934c38d29..2e513ff848b 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
 ;; Author: Gerd Moellmann <gerd@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: strings, regexps, extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 69a7e9f2238..505a556b65f 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Package: emacs
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 79fe3417724..db68148ea5d 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 8bfc85cfb1c..515bbc36a06 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1996, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 cd28df3059c..09ed23630da 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Scott Draves <spot@cs.cmu.edu>
-;; Maintainer: FSF
+;; 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 e0d8d8de632..872bf86e545 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993, 1998, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 15 Dec 1992
 ;; Keywords: tools, lisp
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 49b11e9d5d6..b7e1efca1c9 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 4c814a87c42..0432fc2b005 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -4,7 +4,7 @@
 ;; Author: Juanma Barranquero <lekktu@gmail.com>
 ;; Inspired by emacs-lock.el by Tom Wurgler <twurgler@goodyear.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/env.el b/lisp/env.el
index 8a8a70c9875..3fbb07861ec 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1991, 1994, 2000-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 4f36ae73cea..494b48f1096 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
-;; Maintainer: FSF
+;; 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 5706293860e..01fdfc54d1d 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -4,7 +4,7 @@
 ;; Filename: erc-backend.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
-;; Maintainer: FSF
+;; 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 bab7a89545b..6e2c60cf6fa 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 da30805ae68..87e185fe03a 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 3807db7d663..ca4df66d46b 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: FSF
+;; 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 9a37fd86266..f9f0060ac6b 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -6,7 +6,7 @@
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
 ;;         Noah Friedman <friedman@prep.ai.mit.edu>
 ;;         Per Persson <pp@sno.pp.se>
-;; Maintainer: FSF
+;; 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 e848d2550b1..efdd857414b 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
-;; Maintainer: FSF
+;; 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 25ada7b8443..0cb7bfe84bf 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -4,7 +4,7 @@
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 6e6b9166abe..8bb6e77a5f8 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
-;; Maintainer: FSF
+;; 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 c044e4ae585..2aebfa36d65 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 da756ad7949..e418f3315c7 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Maintainer: FSF
+;; 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 b031c871eeb..57fb2a1cb8b 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 490b6f6d0db..e47e6e0c89e 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: FSF
+;; 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 32e2f1d84c7..5012aa4c2a5 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; 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 c386bc42561..4dbe4342f70 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008-2014 Free Software Foundation, Inc.
 ;; Author: Tom Tromey <tromey@redhat.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Version: 0.1
 ;; Keywords: comm
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 560558d2583..1177cd8ce12 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
 ;; Author: Lawrence Mitchell <wence@gmx.li>
-;; Maintainer: FSF
+;; 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 f69311a097f..b10da96f6f4 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
-;; Maintainer: FSF
+;; 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 81e321a03e6..f54141287de 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 cb80f4fef5e..6121bee09c8 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 fa63a62c95f..191aad0e0cc 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
-;; Maintainer: FSF
+;; 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 878f6b22b29..9f6139628d5 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
-;; Maintainer: FSF
+;; 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 4479f1515ce..e1f636eee94 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index 5b731459804..57e1bb1dd3e 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Sacha Chua <sacha@free.net.ph>
-;; Maintainer: FSF
+;; 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 073203490ac..5eb3338b73e 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
-;; Maintainer: FSF
+;; 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 2414cfbe8e9..1762700ff36 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: FSF
+;; 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 d08614e4166..931c2c6fa70 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 6a04539b798..feb045788f7 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2002-2003, 2006-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 0eed5e89378..7b878013f0d 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -4,7 +4,7 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
-;; Maintainer: FSF
+;; 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 13fbb70739b..c5e38da06a1 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
-;; Maintainer: FSF
+;; 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 21e50ec7869..ab951652bcc 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 7fcf4e48aba..3f7b6a7b501 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 34c1aa9d095..c82ffe3b692 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Andreas Fuchs <asf@void.at>
-;; Maintainer: FSF
+;; 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 5e650d01cb4..f1983c8de74 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2004, 2006-2014 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; 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 102818c18b5..d93e9e02156 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -9,7 +9,7 @@
 ;;               Andreas Fuchs (afs@void.at)
 ;;               Gergely Nagy (algernon@midgard.debian.net)
 ;;               David Edmondson (dme@dme.org)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet
 ;; Version: 5.3
diff --git a/lisp/faces.el b/lisp/faces.el
index 460fddf9ccd..ed36522afb1 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-1996, 1998-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/ffap.el b/lisp/ffap.el
index bb0f61d80df..7051273a681 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995-1997, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 29 Mar 1993
 ;; Keywords: files, hypermedia, matching, mouse, convenience
 ;; X-URL: ftp://ftp.mathcs.emory.edu/pub/mic/emacs/
diff --git a/lisp/files-x.el b/lisp/files-x.el
index f160e41a5a5..c3dbcd5042f 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2014 Free Software Foundation, Inc.
 ;; Author: Juri Linkov <juri@jurta.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Package: emacs
diff --git a/lisp/files.el b/lisp/files.el
index 0dab5c08347..686a1b7c5d3 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985-1987, 1992-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 790b2830adb..ff76deccb7e 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 ;; Author: Thomas Link <sanobast-emacs@yahoo.de>
-;; Maintainer: FSF
+;; 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 14e53064d7e..dd8087b1f34 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -5,7 +5,7 @@
 ;; Author: Roland McGrath <roland@gnu.org>,
 ;;         Sebastian Kremer <sk@thp.uni-koeln.de>
-;; Maintainer: FSF
+;; 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 090469a51ff..f3a135a948b 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -1,7 +1,7 @@
 ;;; find-file.el --- find a file corresponding to this one given a pattern
 ;; Author: Henry Guillaume <henri@tibco.com, henry@c032.aone.net.au>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: c, matching, tools
 ;; Copyright (C) 1994-1995, 2001-2014 Free Software Foundation, Inc.
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index 0ef5fc7ce4e..e4cac746f99 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Kevin Gallagher
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: hardware
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 962b0b66b1d..e0ca41acf0f 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
-;; Maintainer: FSF
+;; 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 72b4a8aec29..ddb25beb182 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Anders Lindgren <andersl@andersl.com>
-;; Maintainer: FSF (Anders' email bounces, Sep 2005)
+;; Maintainer: emacs-devel@gnu.org (Anders' email bounces, Sep 2005)
 ;; Created: 1995-05-25
 ;; Keywords: display, window, minor-mode, convenience
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 285e02daab0..7d7e3f92964 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, faces
 ;; Package: emacs
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 11a8466a4d6..82e97c4da62 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -5,7 +5,7 @@
 ;; Author: Jamie Zawinski
 ;;      Richard Stallman
 ;;      Stefan Monnier
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, faces
 ;; Package: emacs
diff --git a/lisp/frame.el b/lisp/frame.el
index f037f5a9edf..59e4d67b769 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1994, 1996-1997, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/fringe.el b/lisp/fringe.el
index b8bf659620e..ff60804cb19 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 ;; Author: Simon Josefsson <simon@josefsson.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: frames
 ;; Package: emacs
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 1c6636a3065..dfc646b5e74 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996-2014 Free Software Foundation, Inc.
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gs.el b/lisp/gs.el
index ffa658bc5b0..8e1b192c4cb 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1998, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; This file is part of GNU Emacs.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 44dcbb955ac..c772962f64b 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1993-1994, 1998-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 6b1a6a85da3..52f0d51a68a 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Lynn Slater <lrs@indetech.com>
-;; Maintainer: FSF
+;; 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 49bb275499d..76bb12cd69f 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1993-1994, 1998-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/help.el b/lisp/help.el
index b2ccc93682d..f00accc370c 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1993-1994, 1998-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/hexl.el b/lisp/hexl.el
index dc63028b42b..16948df96b0 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1989, 1994, 1998, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; This file is part of GNU Emacs.
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index d25978eee5f..51c8c3c3d7e 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Anders Holst <aho@sans.kth.se>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Version: 1.6
 ;; Keywords: abbrev convenience
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 7bc6b99d7f2..5e66fe54243 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1998, 2000-2014 Free Software Foundation, Inc.
 ;; Author:  Dave Love <fx@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 1998-09-13
 ;; Keywords: faces, frames, emulations
diff --git a/lisp/ielm.el b/lisp/ielm.el
index fdf5fc6e53d..b84c656e468 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: David Smith <maa036@lancaster.ac.uk>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 25 Feb 1994
 ;; Keywords: lisp
diff --git a/lisp/image.el b/lisp/image.el
index d16fe4fb0ba..29cb06f0e03 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1998-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: multimedia
 ;; Package: emacs
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 9379e2846e2..9f11ef45e75 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -4,7 +4,7 @@
 ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se>
 ;;         Lars Lindberg <lli@sypro.cap.se>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 8 Feb 1994
 ;; Keywords: tools convenience
diff --git a/lisp/indent.el b/lisp/indent.el
index c042db891c4..ab38d502966 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 1995, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 78e0dda7cf7..97b9c809d76 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985-1986, 1992-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 99ae092e204..c28d1ffdac7 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1986, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; This file is part of GNU Emacs.
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index e7554a902a7..a1ce0d9a164 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; 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 b72334df0a6..0be4ed94720 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 86a0d8fc141..e4611c29f65 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992-1997, 1999-2014 Free Software Foundation, Inc.
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: matching
 ;; Package: emacs
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index a5e3743c555..eb73cb83f93 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2014 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Maintainer: FSF
+;; 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 a1691461913..af32c0a07ea 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -4,7 +4,7 @@
 ;;   Free Software Foundation, Inc.
 ;; Author: Jay K. Adams <jka@ece.cmu.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; Package: emacs
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index f32eb6e084a..a6896053e53 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1995, 1997, 1999-2014 Free Software Foundation, Inc.
 ;; Author: Jay K. Adams <jka@ece.cmu.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 ;; This file is part of GNU Emacs.
diff --git a/lisp/kermit.el b/lisp/kermit.el
index 6bf3c17a4e1..4515eae245d 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Jeff Norden <jeff@colgate.csnet>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 15 Feb 1988
 ;; Keywords: comm
diff --git a/lisp/linum.el b/lisp/linum.el
index d91ce11e593..bbf7ebec399 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008-2014 Free Software Foundation, Inc.
 ;; Author: Markus Triska <markus.triska@gmx.at>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Version: 0.9x
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 53fc67c509c..b9b356c405b 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995, 1998, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; 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 a5bf2cdbba2..8d009ed5165 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 86164aebdff..40c530a95fa 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 81c50f6b82d..2ff0a3a230b 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -4,7 +4,7 @@
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, dired
 ;; Package: emacs
diff --git a/lisp/macros.el b/lisp/macros.el
index 152ceba4a1e..eb7f9809b43 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev
 ;; Package: emacs
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index a3876f8abe5..375b441347f 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 1ad2a55fa8e..0f72d24ed1e 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint mail
 ;; Package: emacs
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index c8e5176f825..d09f5480bb3 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Joe Wells <jbw@cs.bu.edu>
-;; Maintainer: FSF
+;; 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 fce42feb3bc..78696d6ca11 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 71d4e368790..980f1024097 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -4,7 +4,7 @@
 ;; Software Foundation, Inc.
 ;; Author: Jamie Zawinski <jwz@lucid.com; now jwz@jwz.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 19 Oct 90
 ;; Keywords: mail
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index b7d99a85831..bee62098dfd 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1987, 1995-1997, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 8fa0121ea0a..2d58c597f00 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1998, 2001-2014 Free Software Foundation, Inc.
 ;; Author:          1993-1998 Barry A. Warsaw
-;; Maintainer:      FSF
+;; 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 19324fa0fd7..e478f862dab 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
-;; Maintainer: FSF
+;; 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 6692028c272..ca6e838faab 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1988, 1993-1998, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 f830bb2bdd6..3d976d51196 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 1994, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 65cf5cc886b..9c72abeccef 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1988, 1994, 2001-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 5ea85848e5a..2c625f67e38 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -4,7 +4,7 @@
 ;; Author: Alexander Pohoyda
 ;;      Alex Schroeder
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 44bca465173..2accd257501 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 3ca46d35595..ff4cf719e38 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1987, 1993-1994, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index e7ca43fde6f..4cc07288e58 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index ea46fa6c135..cbffb18f69f 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1993-1996, 2000-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index a0251a109fb..76764cefcd0 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 6fe205dc6bd..988e6c9a24a 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993, 1997, 2001-2014 Free Software Foundation, Inc.
 ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: February 1993
 ;; Keywords: mail, news
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index d576a27d120..06d10778854 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994, 1996, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 8a9d5106176..49103e5714d 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 bcc20058659..a52f18c71ca 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 304cd21704a..7a095981ebd 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 ;; Adapted-By: ESR, pot
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 49372fef21a..0e12c976af0 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1995, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Richard M. Stallman
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal, mouse
 ;; Package: emacs
diff --git a/lisp/misc.el b/lisp/misc.el
index 96bdc896f3c..f9a837eaf62 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1989, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; Package: emacs
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 9231767576a..9b1422f0658 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993-1995, 1999-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware, mouse
 ;; Package: emacs
diff --git a/lisp/msb.el b/lisp/msb.el
index c60b76075f8..166c6c61e30 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1995, 1997-2014 Free Software Foundation, Inc.
 ;; Author: Lars Lindberg <lars.lindberg@home.se>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 8 Oct 1993
 ;; Lindberg's last update version: 3.34
 ;; Keywords: mouse buffer menu
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index ff727c767b9..d7632ed5e1b 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
-;; Maintainer: FSF
+;; 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 1994b354e6e..893bfa487e3 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995-2014 Free Software Foundation, Inc.
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 03 Apr 1995
 ;; Keywords: hypertext, hypermedia, mouse
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index 18cda70bb27..8175abe41e0 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@newartisans.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm
 ;; Package: eudc
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 70347a75837..f076cb96d30 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Eric Ding <ericding@alum.mit.edu>
-;; Maintainer: FSF
+;; 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 70b0d1c08d3..10ce7a78d35 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1998-2014 Free Software Foundation, Inc.
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: April 1998
 ;; Keywords: comm
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 515d48cb132..8e690009b17 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: William F. Schelter
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, comm
 ;; This file is part of GNU Emacs.
diff --git a/lisp/novice.el b/lisp/novice.el
index 5380202f7ab..46727d3e1d3 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1994, 2001-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal, help
 ;; This file is part of GNU Emacs.
diff --git a/lisp/obsolete/abbrevlist.el b/lisp/obsolete/abbrevlist.el
index 5f7c63efe05..2e0ab2f90fa 100644
--- a/lisp/obsolete/abbrevlist.el
+++ b/lisp/obsolete/abbrevlist.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1986, 1992, 2001-2014 Free Software Foundation, Inc.
 ;; Suggested by a previous version by Gildea.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev
 ;; Package: emacs
 ;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el
index fdf0c41131b..d44e8cf331e 100644
--- a/lisp/obsolete/awk-mode.el
+++ b/lisp/obsolete/awk-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 1994, 1996, 2000-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, languages
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/bruce.el b/lisp/obsolete/bruce.el
index 372c78d4838..c643a13a63e 100644
--- a/lisp/obsolete/bruce.el
+++ b/lisp/obsolete/bruce.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1988, 1993, 1997, 2001-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; Created: Jan 1997
 ;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 76f602ca780..88165898228 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994-1998, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Simon Marshall <simon@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: faces files
 ;; Version: 3.14
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index fbfde8a794c..5eec99f66a5 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Johan Vromans
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el
index 21ff3961795..4152189ca0b 100644
--- a/lisp/obsolete/iso-insert.el
+++ b/lisp/obsolete/iso-insert.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1987, 1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el
index a7f603475b9..ca7cb1e538e 100644
--- a/lisp/obsolete/iso-swed.el
+++ b/lisp/obsolete/iso-swed.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1987, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index 3a408ae1712..d1b2d9252ea 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994-1998, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Simon Marshall <simon@gnu.org>
-;; Maintainer: FSF
+;; 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 2ed3f766057..47b5c6837bb 100644
--- a/lisp/obsolete/ledit.el
+++ b/lisp/obsolete/ledit.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages
 ;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index 250712b7e60..d41fe847d64 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
 ;; Obsolete-since: 23.2
diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index 4106458dda7..d3cb3f135d8 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993, 1995, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
 ;; Obsolete-since: 23.2
diff --git a/lisp/obsolete/mailpost.el b/lisp/obsolete/mailpost.el
index b6bf0d1e1b9..880780c577c 100644
--- a/lisp/obsolete/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -6,7 +6,7 @@
 ;; This file is part of GNU Emacs.
 ;; Author: Gary Delp <delp@huey.Udel.Edu>
-;; Maintainer: FSF
+;; 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 c0aba38dd3b..81739dfa6cb 100644
--- a/lisp/obsolete/meese.el
+++ b/lisp/obsolete/meese.el
@@ -5,7 +5,7 @@
 ;; This file is part of GNU Emacs.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index e2320537531..69fe36de4d1 100644
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Obsolete-since: 22.1
 ;; This file is part of GNU Emacs.
diff --git a/lisp/obsolete/pc-mode.el b/lisp/obsolete/pc-mode.el
index 77d8e4d9266..81f929fd217 100644
--- a/lisp/obsolete/pc-mode.el
+++ b/lisp/obsolete/pc-mode.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1995, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
 ;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el
index 37c3da426f4..1c07f99fe22 100644
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Alon Albert <alon@milcse.rtsg.mot.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 1993 Oct 6
 ;; Keywords: tools, processes
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 96baacaa80d..04dd7a97998 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -4,7 +4,7 @@
 ;; Author: William Sommerfeld
 ;; (according to ack.texi)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/spell.el b/lisp/obsolete/spell.el
index ea345c2edc2..145d9e5eb56 100644
--- a/lisp/obsolete/spell.el
+++ b/lisp/obsolete/spell.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp, unix
 ;; Obsolete-since: 23.1
 ;;   (not in obsolete/ directory then, but all functions marked obsolete)
diff --git a/lisp/obsolete/sup-mouse.el b/lisp/obsolete/sup-mouse.el
index d251304f269..682b7d73fa4 100644
--- a/lisp/obsolete/sup-mouse.el
+++ b/lisp/obsolete/sup-mouse.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Wolfgang Rupprecht
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 21 Nov 1986
 ;; Keywords: hardware
 ;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el
index 5a4c5a7d0ad..398453c1c6c 100644
--- a/lisp/obsolete/swedish.el
+++ b/lisp/obsolete/swedish.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/terminal.el b/lisp/obsolete/terminal.el
index dcb2c070b0e..420ac788956 100644
--- a/lisp/obsolete/terminal.el
+++ b/lisp/obsolete/terminal.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Obsolete-since: 24.4
 ;; Keywords: comm, terminals
diff --git a/lisp/obsolete/yow.el b/lisp/obsolete/yow.el
index aedee772d88..b41bdfb6028 100644
--- a/lisp/obsolete/yow.el
+++ b/lisp/obsolete/yow.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993-1995, 2000-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Author: Richard Mlynarik
 ;; Keywords: games
 ;; Obsolete-since: 24.4
diff --git a/lisp/outline.el b/lisp/outline.el
index 6f7e98d647a..c7cad31f572 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1986, 1993-1995, 1997, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 b04ff554228..b6b08016ab7 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993, 1996, 2001-2014 Free Software Foundation, Inc.
 ;; Author: rms@gnu.org
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, faces
 ;; This file is part of GNU Emacs.
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 9541317b420..38619b1d26a 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; 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 0ef0a1db157..0d980d6ba5e 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 dfd2d72edee..13e6f8ee87a 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 bc1e34de9f2..1cd1f81b6f8 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
-;; Maintainer: FSF
+;; 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 9e8b6ff97eb..b868db68f30 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -1,7 +1,7 @@
 ;;; hanoi.el --- towers of hanoi in Emacs
 ;; Author: Damon Anton Permezel
-;; Maintainer: FSF
+;; 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 3dbf8e64a45..a79fc9c0b7e 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Kyle Jones <kyleuunet.uu.net>
-;; Maintainer: FSF
+;; 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 2733789e042..fdc3c6915aa 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1988, 1993, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;; Created: May 1987
diff --git a/lisp/play/studly.el b/lisp/play/studly.el
index d28304df1e5..f6aae4548b1 100644
--- a/lisp/play/studly.el
+++ b/lisp/play/studly.el
@@ -5,7 +5,7 @@
 ;; This file is part of GNU Emacs.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 ;;; Commentary:
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 4df1ce2b5ae..ab7612082d5 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1991, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools, languages
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index afee63ba4c2..44d69d7d0f1 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: AWK, cc-mode, unix, languages
 ;; Package: cc-mode
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 9e16adb8e10..f6a94e8bf8c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -5,7 +5,7 @@
 ;; Authors: Roland McGrath <roland@gnu.org>,
 ;;          Daniel Pfeiffer <occitan@esperanto.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools, processes
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index a4bfa363f59..177c341f3e1 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992-2014 Free Software Foundation, Inc.
 ;; Author: Gerd Moellmann <gerd@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: C++ tags tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index dc81a02c615..b89b4cf0fe5 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -4,7 +4,7 @@
 ;; Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index cd552778641..7f8c483ee5c 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
 ;; Author: Nick Roberts <nickrob@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 5038420296a..05b19b8339f 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
-;; Maintainer: FSF
+;; 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 6c8160e0aea..c6fc944bc13 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; 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 fc04e5e558f..9a811481f49 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -4,7 +4,7 @@
 ;; Author: Brian Marick
 ;;      Daniel LaLiberte <liberte@holonexus.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: c, outlines
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index e7c4ad0596d..30d9f459bde 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -4,7 +4,7 @@
 ;; Author: Thomas Neumann <tom@smart.bo.open.de>
 ;;      Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: unix, tools
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index d634efebe5b..d7d0da84ed9 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -2,7 +2,7 @@
 ;; Author: Michael Schmidt <michael@pbinfo.UUCP>
 ;;      Tom Perrine <Perrin@LOGICON.ARPA>
-;; Maintainer: FSF
+;; 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 1378e8fdb59..123aac03eae 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -4,7 +4,7 @@
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
 ;;         John Eaton <jwe@octave.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 2edcc72fe98..d09fb59371a 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1990, 1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: William F. Mann
-;; Maintainer: FSF
+;; 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 73246768f10..3b850f3305b 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6b508e03a04..670451e58ae 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5,7 +5,7 @@
 ;; Author: Fabián E. Gallina <fabian@anue.biz>
 ;; URL: https://github.com/fgallina/python.el
 ;; Version: 0.24.2
-;; Maintainer: FSF
+;; 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 f41378f2f53..7c677df8592 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Version: 2.0f
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, unix
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 35707592ea3..c98c20424d7 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1994, 1998-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;;    Chris Lindblad <cjl@lcs.mit.edu>
 ;; Keywords: languages tcl modes
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index d3d8a5d477c..e22581445e5 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1986-1987, 1989-1990, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, lisp
 ;; This file is part of GNU Emacs.
diff --git a/lisp/register.el b/lisp/register.el
index 786646139f1..b0afa2d41f0 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1993-1994, 2001-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/replace.el b/lisp/replace.el
index 945316f586d..cebb10d5133 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2014 Free
 ;; Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 1c6a546c446..ec5f5a1ddee 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -4,7 +4,7 @@
 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
 ;; Created: Jan 1991
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 955c51f53df..b185ba00ecf 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 36c5d643fd1..14085e5e574 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1997, 2005-2014 Free Software Foundation, Inc.
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: minibuffer
 ;; Version: 24
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 91da103ba9e..05c575e0bcb 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Karl Fogel <kfogel@red-bean.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: July, 1993
 ;; Keywords: bookmarks, placeholders
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 6d94c6b1804..2990e8e5ffa 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993-1995, 1999-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware
 ;; Package: emacs
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index 467006ee2da..bdae2e5a2d1 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
-;; Maintainer: FSF
+;; 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 2c267d45380..fe302c988d7 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 fe7557cc3b5..a8e4444b999 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes
 ;; Changes by peck@sun.com and by rms.
diff --git a/lisp/shell.el b/lisp/shell.el
index 1d67f0be4af..c5c1275f19f 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -5,7 +5,7 @@
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;      Simon Marshall <simon@gnu.org>
-;; Maintainer: FSF <emacs-devel@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 0a96cd9378b..1bb0ca46ecd 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985-1987, 1993-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index f24e64a0947..767f0b3490b 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993-1996, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
-;; Maintainer: FSF
+;; 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 dbc641ece2f..ed345cb8de6 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Howie Kaye
-;; Maintainer: FSF
+;; 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 e459693c5db..1404afed2e6 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Christian Plaunt <chris@bliss.berkeley.edu>
-;; Maintainer: FSF
+;; 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 b035947cccd..b3f2316729b 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 35136e5da65..fdaf31a9312 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1997, 2000-2014 Free Software Foundation, Inc.
 ;; Author: David Bakhash <cadet@alum.mit.edu>
-;; Maintainer: FSF
+;; 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 669af38385c..1d2163267d3 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 516a126fa8b..fd4b3132125 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -1,7 +1,7 @@
 ;;; t-mouse.el --- mouse support within the text terminal
 ;; Author: Nick Roberts <nickrob@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mouse gpm linux
 ;; Copyright (C) 1994-1995, 1998, 2006-2014 Free Software Foundation,
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 78005a25bd8..7b973f1e41b 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 1994, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 79e4669a42b..16780365e88 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1995, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 67aa684ceb6..66118d3e288 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1990-1991, 1993-2014 Free Software Foundation, Inc.
 ;; Author: Jamie Zawinski <jwz@lucid.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 04 Apr 1990
 ;; Keywords: unix
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 31aa5ffdc42..ba59c75c4ec 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 207c38e2b92..00b860f8dcc 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: Morten Welinder <terra@diku.dk>
-;; Maintainer: FSF
+;; 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 8867f7a95e1..60be0a40f58 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 ;; Author: Eli Zaretskii
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: terminals, faces
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 7c4e6fa6f7e..84fa231ca95 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -4,7 +4,7 @@
 ;; Author: Henry Kautz
 ;; (according to authors.el)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: bib
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 93e69055b21..7a5b1812a65 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2014 Free
 ;; Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Package: emacs
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 7c7b0a949eb..4ea2f54000c 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1998, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index 812597db2c5..b97c6325bf8 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1991, 1993, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Robert J. Chassell
-;; Maintainer: FSF
+;; 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 aa19da8cb1a..cc1d6f5b77a 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 4443de8550d..d5351089d51 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp convenience
 ;; Package: emacs
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index adc4aa10be2..3e77d3720bd 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Package: emacs
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 615d4c7ed41..b11b773dee1 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1994, 2001-2014 Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; 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 02b7762902e..12b808635c5 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1989, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Henry Kautz <kautz@research.att.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: bib, tex
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 09459d172f0..d2f1307b6c9 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 ;; Author: James Clark <jjc@jclark.com>
-;; Maintainer: FSF
+;; 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 a1a3e16a5aa..dce99607074 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2014 Free
 ;; Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tex
 ;; Contributions over the years by William F. Schelter, Dick King,
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 3cb151abe5d..e1e2656275c 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -5,7 +5,7 @@
 ;; Author: Robert J. Chassell
 ;; Date:   [See date below for texinfo-version]
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint, tex, docs
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 4d285b455f4..727697b5533 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1992, 1994, 2001-2014 Free Software Foundation,
 ;; Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Package: emacs
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index f2ad49947b4..deda372a638 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 9a40049fc07..ea5819e4889 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1991-1998, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions, matching, mouse
 ;; Created: Thu Mar 28 13:48:23 1991
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index e3440cbab20..de2fd21a01b 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2014 Free Software Foundation, Inc.
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: Multimedia
 ;; This file is part of GNU Emacs.
diff --git a/lisp/time.el b/lisp/time.el
index ba08c9dbc41..ae04077a136 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/tmm.el b/lisp/tmm.el
index f49132e4f12..09729755c14 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994-1996, 2000-2014 Free Software Foundation, Inc.
 ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 ;; This file is part of GNU Emacs.
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 9b58b563729..8925a02a9e7 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
 ;; Package: emacs
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index dd38201b5ff..5d973c72897 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author: Dick King <king@reasoning.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: files
 ;; Created: 15 May 86
 ;; Package: emacs
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 97f2a1f17ed..698c17698bb 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985-1986, 2001-2014 Free Software Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 91dc3c78c42..8e44c024dc4 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2014 Free
 ;; Software Foundation, Inc.
-;; Maintainer: FSF
+;; 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 d2e82303f16..25d4cf77f53 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; 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 b1999810cb2..b789b80df8e 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -5,7 +5,7 @@
 ;; Author: Frank Bresz
 ;; (according to authors.el)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, vc, tools
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index de82b7af59b..424b48a4ffa 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1997-1998, 2000-2014 Free Software Foundation, Inc.
 ;; Author:     Martin Lorentzson  <emwson@emw.ericsson.se>
-;; Maintainer: FSF
+;; 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 f025f9884bb..0730a9c72ce 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -4,7 +4,7 @@
 ;; Author: Dave Love <fx@gnu.org>
 ;;         Riccardo Murri <riccardo.murri@gmail.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; Created: Sept 2006
 ;; Package: vc
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 41d3bd996b1..a53ed8758c4 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
 ;; Author: Ivan Kanis
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; Package: vc
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 3ea43e9e31e..05ce9372d2a 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -4,7 +4,7 @@
 ;; Inc.
 ;; Author:   Peter Stephenson <pws@ibmth.df.unipi.it>
-;; Maintainer: FSF
+;; 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 25b7f3e3c53..68b502ce451 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index 751107ff415..aca45207450 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1988, 2001-2014 Free Software Foundation, Inc.
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware
 ;; This file is part of GNU Emacs.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b5598f6d14c..a857407820c 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996-1997, 1999-2014 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
 ;; Package: emacs
diff --git a/lisp/window.el b/lisp/window.el
index 5d035d2586e..fab96cbabd5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1989, 1992-1994, 2000-2014 Free Software
 ;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
diff --git a/lisp/woman.el b/lisp/woman.el
index b6150750fed..88510517b25 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
-;; Maintainer: FSF
+;; 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 fff3c5ea17a..a5e3a16ef74 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2014 Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: window, drag, drop
 ;; Package: emacs
diff --git a/test/automated/vc-bzr.el b/test/automated/vc-bzr.el
index e81dea1dd27..e2ea3f6aeea 100644
--- a/test/automated/vc-bzr.el
+++ b/test/automated/vc-bzr.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2011-2014 Free Software Foundation, Inc.
 ;; Author: Glenn Morris <rgm@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.