From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 23 Oct 2021 16:08:14 +0000 (+0100)
Subject: Copyright updates:
X-Git-Tag: exim-4.96-RC0~145
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/e3e281ccf9d8777d0df98ddd644720573e0343d1

Copyright updates:

vi $(git log --name-status exim-4.94..master | awk '/^M/{print $2}' | grep -v '^test/' | sort -u)
---

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index bc7a9b0ae..fb3db4b96 100644
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,5 +1,5 @@
 # Make file for Exim documentation from xfpt source.
-# Copyright (c) The Exim Maintainers 2020
+# Copyright (c) The Exim Maintainers 2020 - 2021
 export LC_ALL=C
 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
diff --git a/release-process/scripts/mk_exim_release b/release-process/scripts/mk_exim_release
index 71a39c92b..04399da16 100755
--- a/release-process/scripts/mk_exim_release
+++ b/release-process/scripts/mk_exim_release
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) The Exim Maintainers 2016-2018
+# Copyright (c) The Exim Maintainers 2016 - 2021
 
 use strict;
 use warnings;
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 2880b0ce3..f58e7ed34 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -5,8 +5,7 @@
 # optional, Local/* files at the front of this file, to create Makefile in the
 # build directory.
 #
-# Copyright (c) The Exim Maintainers 1995 - 2018
-# Copyright (c) The Exim Maintainers 2020
+# Copyright (c) The Exim Maintainers 1995 - 2021
 
 SHELL      = $(MAKE_SHELL)
 SCRIPTS    = ../scripts
diff --git a/src/OS/os.c-FreeBSD b/src/OS/os.c-FreeBSD
index ac833a29f..02b78587b 100644
--- a/src/OS/os.c-FreeBSD
+++ b/src/OS/os.c-FreeBSD
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 1995 - 2020 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* FreeBSD-specific code. This is concatenated onto the generic
diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD
index 36a6d7115..06e217a44 100644
--- a/src/OS/os.h-FreeBSD
+++ b/src/OS/os.h-FreeBSD
@@ -1,6 +1,6 @@
 /* Exim: OS-specific C header file for FreeBSD */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/OS/os.h-GNU b/src/OS/os.h-GNU
index 2c3b7b5f5..4b222600e 100644
--- a/src/OS/os.h-GNU
+++ b/src/OS/os.h-GNU
@@ -1,5 +1,5 @@
 /* Exim: OS-specific C header file for GNU/Hurd */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 
 #include <features.h>
 
diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index f2c243e9f..e6a8d288e 100644
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -1,5 +1,6 @@
 /* Exim: OS-specific C header file for Linux */
 /* Copyright (c) University of Cambridge 1995 - 2020 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/OS/os.h-OpenBSD b/src/OS/os.h-OpenBSD
index 663fc97c3..c690b6e4a 100644
--- a/src/OS/os.h-OpenBSD
+++ b/src/OS/os.h-OpenBSD
@@ -1,5 +1,6 @@
 /* Exim: OS-specific C header file for OpenBSD */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/OS/os.h-SunOS5 b/src/OS/os.h-SunOS5
index 1ceafa701..71253213c 100644
--- a/src/OS/os.h-SunOS5
+++ b/src/OS/os.h-SunOS5
@@ -1,4 +1,5 @@
 /* Exim: OS-specific C header file for SunOS5 aka Solaris */
+/* Copyright (c) The Exim Maintainers 2021 */
 
 #define CRYPT_H
 #define HAVE_MMAP
diff --git a/src/OS/unsupported/os.h-NetBSD b/src/OS/unsupported/os.h-NetBSD
index 63ff27c27..0b9fc03f0 100644
--- a/src/OS/unsupported/os.h-NetBSD
+++ b/src/OS/unsupported/os.h-NetBSD
@@ -1,4 +1,5 @@
 /* Exim: OS-specific C header file for NetBSD */
+/* Copyright (c) The Exim Maintainers 2021 */
 
 #define HAVE_BSD_GETLOADAVG
 #define HAVE_GETIFADDRS
diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index e311aef1c..3d452c6ec 100644
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index 6d8b7e2ea..87e4fc6df 100644
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/exim_monitor/em_init.c b/src/exim_monitor/em_init.c
index ee27c2052..e16897e95 100644
--- a/src/exim_monitor/em_init.c
+++ b/src/exim_monitor/em_init.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code to initialize things from the
diff --git a/src/exim_monitor/em_log.c b/src/exim_monitor/em_log.c
index 662595b12..a2a489c3a 100644
--- a/src/exim_monitor/em_log.c
+++ b/src/exim_monitor/em_log.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainters 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code for scanning the main log,
diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c
index 0a89fbb38..38c72307a 100644
--- a/src/exim_monitor/em_main.c
+++ b/src/exim_monitor/em_main.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/exim_monitor/em_menu.c b/src/exim_monitor/em_menu.c
index 7139bbf25..881f3748c 100644
--- a/src/exim_monitor/em_menu.c
+++ b/src/exim_monitor/em_menu.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/exim_monitor/em_version.c b/src/exim_monitor/em_version.c
index 336f2ae97..b627a6e2b 100644
--- a/src/exim_monitor/em_version.c
+++ b/src/exim_monitor/em_version.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #define EM_VERSION_C
diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index df597a864..ed77b6a8f 100755
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -7,7 +7,7 @@ export LC_ALL
 # just got too horrendous to get it right in "make", because of the optionally
 # existing configuration files.
 #
-# Copyright (c) The Exim Maintainers 1995 - 2020
+# Copyright (c) The Exim Maintainers 1995 - 2021
 
 
 # First off, get the OS type, and check that there is a make file for it.
diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 3e16ae13a..4a714e147 100755
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -3,7 +3,7 @@
 # Script to build links for all the exim source files from the system-
 # specific build directory. It should be run from within that directory.
 #
-# Copyright (c) The Exim Maintainers 1995 - 2020
+# Copyright (c) The Exim Maintainers 1995 - 2021
 
 test ! -d ../src && \
   echo "*** $0 should be run in a system-specific subdirectory." && \
diff --git a/src/scripts/reversion b/src/scripts/reversion
index cec1db2fb..b932224f5 100755
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) The Exim Maintainers 1995 - 2018
+# Copyright (c) The Exim Maintainers 1995 - 2021
 
 set -e
 LC_ALL=C
diff --git a/src/src/acl.c b/src/src/acl.c
index 6d064e8a2..15023c7cc 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Code for handling Access Control Lists (ACLs) */
diff --git a/src/src/arc.c b/src/src/arc.c
index a68ab6eb4..9678ceb2d 100644
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -3,6 +3,7 @@
 *************************************************/
 /* Experimental ARC support for Exim
    Copyright (c) Jeremy Harris 2018 - 2020
+   Copyright (c) The Exim Maintainers 2021
    License: GPL
 */
 
diff --git a/src/src/auths/call_pam.c b/src/src/auths/call_pam.c
index 03b9be1a8..80f80f1a8 100644
--- a/src/src/auths/call_pam.c
+++ b/src/src/auths/call_pam.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/auths/call_radius.c b/src/src/auths/call_radius.c
index 9d10b34c6..1c048923e 100644
--- a/src/src/auths/call_radius.c
+++ b/src/src/auths/call_radius.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* Copyright (c) University of Cambridge 1995 - 2016 */
 /* See the file NOTICE for conditions of use and distribution. */
 
diff --git a/src/src/auths/get_data.c b/src/src/auths/get_data.c
index 88359658a..e0d79db3c 100644
--- a/src/src/auths/get_data.c
+++ b/src/src/auths/get_data.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/auths/gsasl_exim.c b/src/src/auths/gsasl_exim.c
index 479d01a29..f5c2afd60 100644
--- a/src/src/auths/gsasl_exim.c
+++ b/src/src/auths/gsasl_exim.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) The Exim Maintainers 2019-2020 */
+/* Copyright (c) The Exim Maintainers 2019 - 2021 */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
diff --git a/src/src/auths/plaintext.c b/src/src/auths/plaintext.c
index ab703daec..58d178359 100644
--- a/src/src/auths/plaintext.c
+++ b/src/src/auths/plaintext.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/child.c b/src/src/child.c
index 948e0d669..54583c3ae 100644
--- a/src/src/child.c
+++ b/src/src/child.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 877cc7bc4..a91560e61 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2018-2020 */
+/* Copyright (c) The Exim Maintainers 2018 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The default settings for Exim configuration variables. A #define without
diff --git a/src/src/daemon.c b/src/src/daemon.c
index a4b1e2685..0b8d5d595 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with running Exim as a daemon */
diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index 5cbe10c1f..29cd9e8b9 100644
--- a/src/src/dbfn.c
+++ b/src/src/dbfn.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/dbstuff.h b/src/src/dbstuff.h
index 94db7f7fd..ce3272c4a 100644
--- a/src/src/dbstuff.h
+++ b/src/src/dbstuff.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This header file contains macro definitions so that a variety of DBM
diff --git a/src/src/dcc.c b/src/src/dcc.c
index fb32fef6a..a9124a013 100644
--- a/src/src/dcc.c
+++ b/src/src/dcc.c
@@ -7,7 +7,7 @@
  * wbreyha@gmx.net
  * See the file NOTICE for conditions of use and distribution.
  *
- * Copyright (c) The Exim Maintainers 2015 - 2019
+ * Copyright (c) The Exim Maintainers 2015 - 2021
  */
 
 /* Code for calling dccifd. Called from acl.c. */
diff --git a/src/src/debug.c b/src/src/debug.c
index f7002b147..92cad6d48 100644
--- a/src/src/debug.c
+++ b/src/src/debug.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2015 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/deliver.c b/src/src/deliver.c
index e931d22e9..4594c4a1d 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The main code for delivering a message. */
diff --git a/src/src/directory.c b/src/src/directory.c
index 3273eb89b..11bf7338b 100644
--- a/src/src/directory.c
+++ b/src/src/directory.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2010 - 2018 */
+/* Copyright (c) The Exim Maintainers 2010 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "exim.h"
diff --git a/src/src/dkim.c b/src/src/dkim.c
index 5b7f17b2d..0c5e84788 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge, 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021*/
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Code for DKIM support. Other DKIM relevant code is in
diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index 8a9cdce0d..060d3ef51 100644
--- a/src/src/dmarc.c
+++ b/src/src/dmarc.c
@@ -3,7 +3,7 @@
 *************************************************/
 /* DMARC support.
    Copyright (c) Todd Lyons <tlyons@exim.org> 2012 - 2014
-   Copyright (c) The Exim Maintainers 2019
+   Copyright (c) The Exim Maintainers 2019 - 2021
    License: GPL */
 
 /* Portions Copyright (c) 2012, 2013, The Trusted Domain Project;
diff --git a/src/src/dmarc.h b/src/src/dmarc.h
index f3c29b00a..0b5307abb 100644
--- a/src/src/dmarc.h
+++ b/src/src/dmarc.h
@@ -4,6 +4,7 @@
 
 /* Experimental DMARC support.
    Copyright (c) Todd Lyons <tlyons@exim.org> 2012 - 2014
+   Copyright (c) The Exim Maintainers 2021
    License: GPL */
 
 /* Portions Copyright (c) 2012, 2013, The Trusted Domain Project;
diff --git a/src/src/dns.c b/src/src/dns.c
index 63856ead3..8bf7f6542 100644
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for interfacing with the DNS. */
diff --git a/src/src/dnsbl.c b/src/src/dnsbl.c
index ad36e8ecb..5335b777b 100644
--- a/src/src/dnsbl.c
+++ b/src/src/dnsbl.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with dnsbls */
diff --git a/src/src/drtables.c b/src/src/drtables.c
index 02f014e87..a4958b179 100644
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/dummies.c b/src/src/dummies.c
index 598117fcf..38b514b6c 100644
--- a/src/src/dummies.c
+++ b/src/src/dummies.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file is not part of the main Exim code. There are little bits of test
diff --git a/src/src/enq.c b/src/src/enq.c
index 0dcb9a732..f7f8c9c16 100644
--- a/src/src/enq.c
+++ b/src/src/enq.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with serialization. */
diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index d7f15239b..2c414fd31 100644
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -9,7 +9,7 @@ use Getopt::Long qw(:config no_ignore_case);
 use File::Basename;
 
 # Copyright (c) 2007-2017 University of Cambridge.
-# Copyright (c) The Exim Maintainers 2020
+# Copyright (c) The Exim Maintainers 2020 - 2021
 # See the file NOTICE for conditions of use and distribution.
 
 # Except when they appear in comments, the following placeholders in this
diff --git a/src/src/exim.c b/src/src/exim.c
index 9ee567df4..a17dd92ad 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index e4194f371..45a3f1083 100644
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 697b87500..5f2e66417 100644
--- a/src/src/exim_dbutil.c
+++ b/src/src/exim_dbutil.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/exim_lock.c b/src/src/exim_lock.c
index dbdd97129..427d22c1e 100644
--- a/src/src/exim_lock.c
+++ b/src/src/exim_lock.c
@@ -10,7 +10,7 @@ Default is -fcntl -lockfile.
 
 Argument: the name of the lock file
 
-Copyright (c) The Exim Maintainers 2016
+Copyright (c) The Exim Maintainers 2016 - 2021
 */
 
 #include "os.h"
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index 04602da68..9fee423e4 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -2,6 +2,8 @@
 
 # Utility for searching and displaying queue information.
 # Written by Matt Hubbard 15 August 2002
+#
+# Copyright (c) The Exim Maintainers 2021
 
 # Except when they appear in comments, the following placeholders in this
 # source are replaced when it is turned into a runnable script:
diff --git a/src/src/expand.c b/src/src/expand.c
index 41016c316..53ad3ff92 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/filter.c b/src/src/filter.c
index 1dbae43e9..c5ef678b6 100644
--- a/src/src/filter.c
+++ b/src/src/filter.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/filtertest.c b/src/src/filtertest.c
index 3b4752ea5..621ca76e9 100644
--- a/src/src/filtertest.c
+++ b/src/src/filtertest.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/functions.h b/src/src/functions.h
index 401300d94..3dd890a00 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/globals.c b/src/src/globals.c
index 200b506f7..98e0f8daf 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* All the global variables are defined together in this one module, so
diff --git a/src/src/globals.h b/src/src/globals.h
index 1509ffa7f..fbc9c76ee 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Almost all the global variables are defined together in this one header, so
diff --git a/src/src/header.c b/src/src/header.c
index e334c69bf..9bd376633 100644
--- a/src/src/header.c
+++ b/src/src/header.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2016 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/host.c b/src/src/host.c
index c2ea770e2..02d2da362 100644
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for finding hosts, either by gethostbyname(), gethostbyaddr(), or
diff --git a/src/src/ip.c b/src/src/ip.c
index 96a6c29f2..d83d6f910 100644
--- a/src/src/ip.c
+++ b/src/src/ip.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for doing things with sockets. With the advent of IPv6 this has
diff --git a/src/src/local_scan.c b/src/src/local_scan.c
index 2032ae70d..7a3bae7e3 100644
--- a/src/src/local_scan.c
+++ b/src/src/local_scan.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index 3efe94941..076fd6aa4 100644
--- a/src/src/local_scan.h
+++ b/src/src/local_scan.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2020 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file is the header that is the only Exim header to be included in the
diff --git a/src/src/log.c b/src/src/log.c
index a7ef3d803..b085e9ee2 100644
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for writing log files. The code for maintaining datestamped
diff --git a/src/src/lookups/Makefile b/src/src/lookups/Makefile
index 1fd139486..19585bf31 100644
--- a/src/src/lookups/Makefile
+++ b/src/src/lookups/Makefile
@@ -1,6 +1,8 @@
 # Make file for building Exim's lookup modules.
 # This is called from the main make file, after cd'ing
 # to the lookups subdirectory.
+#
+# Copyright (c) The Exim Maintainers 2021
 
 # nb: at build time, the version of this file used will have had some
 #     extra variable definitions and prepended to it and module build rules
diff --git a/src/src/lookups/cdb.c b/src/src/lookups/cdb.c
index c0ac2cbe4..b11f5f7d5 100644
--- a/src/src/lookups/cdb.c
+++ b/src/src/lookups/cdb.c
@@ -7,7 +7,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  * Copyright (c) 1998 Nigel Metheringham, Planet Online Ltd
- * Copyright (c) The Exim Maintainers 2020
+ * Copyright (c) The Exim Maintainers 2020 - 2021
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/src/lookups/dbmdb.c b/src/src/lookups/dbmdb.c
index f5614fdac..508083361 100644
--- a/src/src/lookups/dbmdb.c
+++ b/src/src/lookups/dbmdb.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index 8422833c4..781a2aea5 100644
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/dsearch.c b/src/src/lookups/dsearch.c
index a6b331edb..2cf880dda 100644
--- a/src/src/lookups/dsearch.c
+++ b/src/src/lookups/dsearch.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The idea for this code came from Matthew Byng-Maddick, but his original has
diff --git a/src/src/lookups/ibase.c b/src/src/lookups/ibase.c
index 72a27c010..defe5516e 100644
--- a/src/src/lookups/ibase.c
+++ b/src/src/lookups/ibase.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The code in this module was contributed by Ard Biesheuvel. */
diff --git a/src/src/lookups/json.c b/src/src/lookups/json.c
index 9b1fe78ed..3ca1af50d 100644
--- a/src/src/lookups/json.c
+++ b/src/src/lookups/json.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 2019-2020 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 1674c9f1f..b1958d2b2 100644
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Many thanks to Stuart Lynne for contributing the original code for this
diff --git a/src/src/lookups/lf_sqlperform.c b/src/src/lookups/lf_sqlperform.c
index 38b7c2ad3..b9de0a1c8 100644
--- a/src/src/lookups/lf_sqlperform.c
+++ b/src/src/lookups/lf_sqlperform.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/lookups/lmdb.c b/src/src/lookups/lmdb.c
index d9cf25d54..b73ec1c4d 100644
--- a/src/src/lookups/lmdb.c
+++ b/src/src/lookups/lmdb.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 2016 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/lsearch.c b/src/src/lookups/lsearch.c
index 10927dd82..afb26908b 100644
--- a/src/src/lookups/lsearch.c
+++ b/src/src/lookups/lsearch.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c
index 136971590..7c1e0b205 100644
--- a/src/src/lookups/oracle.c
+++ b/src/src/lookups/oracle.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Interface to an Oracle database. This code was originally supplied by
diff --git a/src/src/lookups/passwd.c b/src/src/lookups/passwd.c
index 5578d58dd..f37bc6a0a 100644
--- a/src/src/lookups/passwd.c
+++ b/src/src/lookups/passwd.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/readsock.c b/src/src/lookups/readsock.c
index f7e04d1d8..7bb3b9ab5 100644
--- a/src/src/lookups/readsock.c
+++ b/src/src/lookups/readsock.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 2020 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c
index 1638ea401..4c1412bae 100644
--- a/src/src/lookups/sqlite.c
+++ b/src/src/lookups/sqlite.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/testdb.c b/src/src/lookups/testdb.c
index 3ecd10401..b169b059a 100644
--- a/src/src/lookups/testdb.c
+++ b/src/src/lookups/testdb.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/lookups/whoson.c b/src/src/lookups/whoson.c
index 2260788a7..15ff3cf02 100644
--- a/src/src/lookups/whoson.c
+++ b/src/src/lookups/whoson.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This code originally came from Robert Wal. */
diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index 757b37563..89e35878e 100644
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Create a static data structure with the predefined macros, to be
diff --git a/src/src/macro_predef.h b/src/src/macro_predef.h
index 3c988a380..59b1bbe3b 100644
--- a/src/src/macro_predef.h
+++ b/src/src/macro_predef.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 2017 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Global functions */
diff --git a/src/src/macros.h b/src/src/macros.h
index b2f4095bd..bf5241e10 100644
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/malware.c b/src/src/malware.c
index ebd360cd2..1dc89ae15 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2015 - 2020
+ * Copyright (c) The Exim Maintainers 2015 - 2021
  */
 
 /* Code for calling virus (malware) scanners. Called from acl.c. */
diff --git a/src/src/match.c b/src/src/match.c
index 8a1c9e5ea..6415b993d 100644
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for matching strings */
diff --git a/src/src/moan.c b/src/src/moan.c
index 1d9c5b9a5..c8755911f 100644
--- a/src/src/moan.c
+++ b/src/src/moan.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for sending messages to sender or to mailmaster. */
diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index 38ee93d8c..c51c870c2 100644
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/os.c b/src/src/os.c
index 9a450a865..2bb5bbef1 100644
--- a/src/src/os.c
+++ b/src/src/os.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #ifdef STAND_ALONE
diff --git a/src/src/parse.c b/src/src/parse.c
index a290ae7c3..5bf97eab9 100644
--- a/src/src/parse.c
+++ b/src/src/parse.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for parsing addresses */
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 45fa2a104..05f656df4 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2009 - 2016  Tom Kistner <tom@duncanthrax.net>
  *  Copyright (C) 2016 - 2020  Jeremy Harris <jgh@exim.org>
+ *  Copyright (c) The Exim Maintainers 2021
  *
  *  http://duncanthrax.net/pdkim/
  *
diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index 5f24e8030..561eb6161 100644
--- a/src/src/pdkim/signing.c
+++ b/src/src/pdkim/signing.c
@@ -1,7 +1,7 @@
 /*
  *  PDKIM - a RFC4871 (DKIM) implementation
  *
- *  Copyright (C) 1995 - 2020  Exim maintainers
+ *  Copyright (c) The Exim Maintainers 1995 - 2021
  *
  *  signing/verification interface
  */
diff --git a/src/src/queue.c b/src/src/queue.c
index 8fb82b4fc..93d69f89f 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions that operate on the input queue. */
diff --git a/src/src/rda.c b/src/src/rda.c
index a12e5de29..684730a7d 100644
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim maintainers 2020 */
+/* Copyright (c) The Exim maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code for extracting addresses from a forwarding list
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 987f9fab0..754ab197b 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for reading the configuration file, and for displaying
diff --git a/src/src/receive.c b/src/src/receive.c
index d2e556e32..fab0f00c4 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Code for receiving a message and setting up spool files. */
diff --git a/src/src/regex.c b/src/src/regex.c
index a3d6659a6..2b3e308a2 100644
--- a/src/src/regex.c
+++ b/src/src/regex.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 2018
+ * Copyright (c) The Exim Maintainers 2016 - 2021
  */
 
 /* Code for matching regular expressions against headers and body.
diff --git a/src/src/rewrite.c b/src/src/rewrite.c
index 6a6da47df..fbcf863c2 100644
--- a/src/src/rewrite.c
+++ b/src/src/rewrite.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with rewriting headers */
diff --git a/src/src/rfc2047.c b/src/src/rfc2047.c
index c3cf4db11..4679d7677 100644
--- a/src/src/rfc2047.c
+++ b/src/src/rfc2047.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file contains a function for decoding message header lines that may
diff --git a/src/src/route.c b/src/src/route.c
index 5aed06b4f..225a19046 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with routing, and the list of generic router options. */
diff --git a/src/src/routers/accept.c b/src/src/routers/accept.c
index b02ceda7a..110a1efe4 100644
--- a/src/src/routers/accept.c
+++ b/src/src/routers/accept.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/routers/dnslookup.c b/src/src/routers/dnslookup.c
index 41a5ad78d..977b58d45 100644
--- a/src/src/routers/dnslookup.c
+++ b/src/src/routers/dnslookup.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/routers/ipliteral.c b/src/src/routers/ipliteral.c
index 09775ed83..80f377970 100644
--- a/src/src/routers/ipliteral.c
+++ b/src/src/routers/ipliteral.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/routers/iplookup.c b/src/src/routers/iplookup.c
index 04bc8e26f..2237d0386 100644
--- a/src/src/routers/iplookup.c
+++ b/src/src/routers/iplookup.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/routers/iplookup.h b/src/src/routers/iplookup.h
index 9b2bf0f41..dbcb03c9e 100644
--- a/src/src/routers/iplookup.h
+++ b/src/src/routers/iplookup.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/routers/manualroute.c b/src/src/routers/manualroute.c
index 01802714f..e3ef1eadb 100644
--- a/src/src/routers/manualroute.c
+++ b/src/src/routers/manualroute.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/routers/queryprogram.c b/src/src/routers/queryprogram.c
index 96210907b..e6e538841 100644
--- a/src/src/routers/queryprogram.c
+++ b/src/src/routers/queryprogram.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c
index 71769dbc3..8e0b7e529 100644
--- a/src/src/routers/redirect.c
+++ b/src/src/routers/redirect.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/routers/redirect.h b/src/src/routers/redirect.h
index 7c9ee1ce0..cdb6ba1a0 100644
--- a/src/src/routers/redirect.h
+++ b/src/src/routers/redirect.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Header for the redirect router */
diff --git a/src/src/routers/rf_get_transport.c b/src/src/routers/rf_get_transport.c
index 32bde9ec3..ce81345e7 100644
--- a/src/src/routers/rf_get_transport.c
+++ b/src/src/routers/rf_get_transport.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/routers/rf_queue_add.c b/src/src/routers/rf_queue_add.c
index 4dab60dfe..0693c8c6e 100644
--- a/src/src/routers/rf_queue_add.c
+++ b/src/src/routers/rf_queue_add.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/search.c b/src/src/search.c
index 81d1d20f9..90af54c36 100644
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* A set of functions to search databases in various formats. An open
diff --git a/src/src/sieve.c b/src/src/sieve.c
index 9571351f0..bd0c9b28e 100644
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Michael Haardt 2003 - 2015
- * Copyright (c) The Exim Maintainers 2016 - 2020
+ * Copyright (c) The Exim Maintainers 2016 - 2021
  * See the file NOTICE for conditions of use and distribution.
  */
 
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index c1aa5867c..824178e4d 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for handling an incoming SMTP call. */
diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 2147750af..46713d4b7 100644
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* A number of functions for driving outgoing SMTP calls. */
diff --git a/src/src/spam.c b/src/src/spam.c
index 544fed17a..470e5fae7 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 2020
+ * Copyright (c) The Exim Maintainers 2016 - 2021
  */
 
 /* Code for calling spamassassin's spamd. Called from acl.c. */
diff --git a/src/src/spam.h b/src/src/spam.h
index 312dce8de..cc36ffd3f 100644
--- a/src/src/spam.h
+++ b/src/src/spam.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* License: GPL */
 
 /* spam defines */
diff --git a/src/src/spf.c b/src/src/spf.c
index 2f55fb77c..9f0805ada 100644
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -5,7 +5,7 @@
 /* SPF support.
    Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2014
    License: GPL
-   Copyright (c) The Exim Maintainers 2015 - 2020
+   Copyright (c) The Exim Maintainers 2015 - 2021
 */
 
 /* Code for calling spf checks via libspf-alt. Called from acl.c. */
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 0bebcea97..de6ee7e51 100644
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for reading spool files. When compiling for a utility (eximon),
diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
index cf7909fbe..e5b9ad79c 100644
--- a/src/src/spool_mbox.c
+++ b/src/src/spool_mbox.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 2020
+ * Copyright (c) The Exim Maintainers 2016 - 2021
  */
 
 /* Code for setting up a MBOX style spool file inside a /scan/<msgid>
diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index 8531112c0..13e8dd664 100644
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for writing spool files, and moving them about. */
diff --git a/src/src/srs.c b/src/src/srs.c
index 5cca182da..5db21ec8c 100644
--- a/src/src/srs.c
+++ b/src/src/srs.c
@@ -4,7 +4,7 @@
 
 /* SRS - Sender rewriting scheme support
   (C)2004 Miles Wilton <miles@mirtol.com>
-  Copyright (c) The Exim Maintainers 2016
+  Copyright (c) The Exim Maintainers 2016 - 2021
 
   SRS Support Version: 1.0a
 
diff --git a/src/src/srs.h b/src/src/srs.h
index 32404128f..29209b109 100644
--- a/src/src/srs.h
+++ b/src/src/srs.h
@@ -4,6 +4,7 @@
 
 /* SRS - Sender rewriting scheme support
   ©2004 Miles Wilton <miles@mirtol.com>
+  Copyright (c) The Exim Maintainers 2021
   License: GPL */
 
 #ifndef __SRS_H__
diff --git a/src/src/std-crypto.c b/src/src/std-crypto.c
index b462908ea..c56d26014 100644
--- a/src/src/std-crypto.c
+++ b/src/src/std-crypto.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Phil Pennock 2012, 2016
- * Copyright (c) The Exim Maintainers 2017 - 2018
+ * Copyright (c) The Exim Maintainers 2017 - 2021
  * But almost everything here is fixed published constants from RFCs, so also:
  * Copyright (C) The Internet Society (2003)
  * Copyright (C) The IETF Trust (2008)
diff --git a/src/src/store.c b/src/src/store.c
index e8819e3e3..520305dbb 100644
--- a/src/src/store.c
+++ b/src/src/store.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim maintainers 2019 - 2020 */
+/* Copyright (c) The Exim maintainers 2019 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Exim gets and frees all its store through these functions. In the original
diff --git a/src/src/store.h b/src/src/store.h
index 58561ac28..ccfa8f012 100644
--- a/src/src/store.h
+++ b/src/src/store.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Header for Exim's memory allocation functions */
diff --git a/src/src/string.c b/src/src/string.c
index 64d14439e..87882d801 100644
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Miscellaneous string-handling functions. Some are not required for
diff --git a/src/src/structs.h b/src/src/structs.h
index 9bfc8826b..eee288efd 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 02eb7e8a0..aea1bd8b2 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -3,10 +3,9 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
-/* See the file NOTICE for conditions of use and distribution. */
-
 /* Copyright (c) Phil Pennock 2012 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
+/* See the file NOTICE for conditions of use and distribution. */
 
 /* This file provides TLS/SSL support for Exim using the GnuTLS library,
 one of the available supported implementations.  This file is #included into
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 590d271f7..e8d14398f 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2019 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Portions Copyright (c) The OpenSSL Project 1999 */
diff --git a/src/src/tls.c b/src/src/tls.c
index c497ac307..d5d11bcea 100644
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module provides TLS (aka SSL) support for Exim. The code for OpenSSL is
diff --git a/src/src/tlscert-gnu.c b/src/src/tlscert-gnu.c
index 8ea702354..cbc7accf0 100644
--- a/src/src/tlscert-gnu.c
+++ b/src/src/tlscert-gnu.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 2014 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 
 /* This file provides TLS/SSL support for Exim using the GnuTLS library,
 one of the available supported implementations.  This file is #included into
diff --git a/src/src/transport.c b/src/src/transport.c
index 3d86919de..0c2c6e29a 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* General functions concerned with transportation, and generic options for all
diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index 39ff881bb..91269890c 100644
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2020 */
-/* Copyright (c) The Exim maintainers 2020 */
+/* Copyright (c) The Exim maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/transports/appendfile.h b/src/src/transports/appendfile.h
index 0f5740ef8..3fd2f467c 100644
--- a/src/src/transports/appendfile.h
+++ b/src/src/transports/appendfile.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Private structure for the private options. */
diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c
index 83b7fb685..6110f87bf 100644
--- a/src/src/transports/autoreply.c
+++ b/src/src/transports/autoreply.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c
index e3b3639ad..424210d39 100644
--- a/src/src/transports/lmtp.c
+++ b/src/src/transports/lmtp.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index da49307b1..e22722fd0 100644
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim maintainers 2020 */
+/* Copyright (c) The Exim maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/transports/queuefile.c b/src/src/transports/queuefile.c
index e657e350f..74131cc64 100644
--- a/src/src/transports/queuefile.c
+++ b/src/src/transports/queuefile.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Andrew Colin Kissa <andrew@topdog.za.net> 2016 */
 /* Copyright (c) University of Cambridge 2016 */
-/* Copyright (c) The Exim Maintainers 1995 - 2020 */
+/* Copyright (c) The Exim Maintainers 1995 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index b50869414..6f4e7ab71 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index 2ce8b11c5..2ed6cfd51 100644
--- a/src/src/transports/smtp.h
+++ b/src/src/transports/smtp.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #define DELIVER_BUFFER_SIZE 4096
diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c
index c410eceec..0234c9b5d 100644
--- a/src/src/transports/smtp_socks.c
+++ b/src/src/transports/smtp_socks.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 2015 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* SOCKS version 5 proxy, client-mode */
diff --git a/src/src/transports/tf_maildir.c b/src/src/transports/tf_maildir.c
index 2673b1443..a83fc6f09 100644
--- a/src/src/transports/tf_maildir.c
+++ b/src/src/transports/tf_maildir.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions in support of the use of maildirsize files for handling quotas in
diff --git a/src/src/transports/tf_maildir.h b/src/src/transports/tf_maildir.h
index 8c26b32c0..b3707b1a9 100644
--- a/src/src/transports/tf_maildir.h
+++ b/src/src/transports/tf_maildir.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Header file for the functions that are used to support the use of
diff --git a/src/src/tree.c b/src/src/tree.c
index e16a8643c..f2c97db1e 100644
--- a/src/src/tree.c
+++ b/src/src/tree.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for maintaining binary balanced trees and some associated
diff --git a/src/src/verify.c b/src/src/verify.c
index 6e07566a7..0ac6a7c74 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with verifying things. The original code for callout
diff --git a/src/util/gen_pkcs3.c b/src/util/gen_pkcs3.c
index 5c4e42993..2fe9a6c5e 100644
--- a/src/util/gen_pkcs3.c
+++ b/src/util/gen_pkcs3.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2012,2016 Phil Pennock.
+ * Copyright (c) The Exim Maintainers 2021
  * This is distributed as part of Exim and licensed under the GPL.
  * See the file "NOTICE" for more details.
  */