diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 0ecafb405..ef83a975b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2004-2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Maintainer: Bastien Guerry <bzg at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 ;;
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 498bff3d3..c2aa5c329 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
-;; Maintainer: Bastien Guerry <bzg at gnu dot org>
 ;; Keywords: org data attachment
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 7cd8a774f..b61408965 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -4,7 +4,6 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;	   Bastien Guerry <bzg@gnu.org>
-;; Maintainer: Bastien Guerry <bzg at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 1141ee3b4..497654725 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2004-2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Maintainer: Bastien Guerry <bzg at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index 6e6e531ae..179ca8330 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 2004-2020 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Maintainer: Bastien Guerry <bzg at gnu dot org>
+;; Maintainer: Bastien Guerry <bzg@gnu.org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 ;; Version: 9.4-dev