From: Evan Hunt <each@isc.org>
Date: Fri, 16 Mar 2018 01:32:45 +0000 (-0700)
Subject: update file headers
X-Git-Tag: v9.13.0~91^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fabe0da834e3a7cc96d851a866062227f8fb84c;p=thirdparty%2Fbind9.git

update file headers
---

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 70b28860934..cc8b4898f8c 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index b8dd69ce799..360ccef8940 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/bigtest/README b/bin/tests/bigtest/README
index 067771b1b18..0daea5c9330 100644
--- a/bin/tests/bigtest/README
+++ b/bin/tests/bigtest/README
@@ -1,11 +1,6 @@
-Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 	bash buildzones.sh < zones	# creates setup, run, servers/* master/*
 					# named.conf
diff --git a/bin/tests/system/README b/bin/tests/system/README
index 81cca416056..f527e790d41 100644
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2010, 2011, 2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Introduction
 ===
diff --git a/bin/tests/system/chain/README b/bin/tests/system/chain/README
index c4144ac0f93..f51c123b725 100644
--- a/bin/tests/system/chain/README
+++ b/bin/tests/system/chain/README
@@ -1,11 +1,6 @@
-Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 ns1 is the root server.
 
diff --git a/bin/tests/system/chain/ans4/README.anspy b/bin/tests/system/chain/ans4/README.anspy
index f6b40a953fa..a419c61a287 100644
--- a/bin/tests/system/chain/ans4/README.anspy
+++ b/bin/tests/system/chain/ans4/README.anspy
@@ -1,11 +1,6 @@
-Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 REQUIREMENTS
 ans.py requires at least dnspython 1.12.0.
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.= b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=
index 12662bc50b2..be99eb3e713 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=
@@ -1,11 +1,6 @@
-Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The contents of this file is not read by the filesystem driver.
 This is the file for "DNAME 10 example.net.".
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.= b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=
index 0f12e994577..cca17c384a8 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=
@@ -1,11 +1,6 @@
-Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The contents of this file is not read by the filesystem driver.
 This is the file for "NS 10 example.com.".
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None= b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=
index c3d874affb5..f2ca5de86b5 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=
@@ -1,11 +1,6 @@
-Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The contents of this file is not read by the filesystem driver.
 This is the file for "SOA 10 ns.example.com. root.example.com. 2010062900 None None None None" which is a malformed SOA record.
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
index 72947655084..f5f98dd4332 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
@@ -1,11 +1,6 @@
-Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: DNAME=10=example.net.=,v 1.2 2010/08/16 04:46:15 marka Exp $
 
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
index beb2f2320c5..baf3b1c1d19 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
@@ -1,11 +1,6 @@
-Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: NS=10=example.com.=,v 1.1 2010/08/16 04:46:15 marka Exp $
 
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
index 40820c1f71d..f684476fdab 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
@@ -1,11 +1,6 @@
-Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=,v 1.1 2010/08/16 04:46:15 marka Exp $
 
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1 b/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
index 615baf5812d..d9e52cd7252 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
@@ -1,11 +1,6 @@
-Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: 10.53.0.1,v 1.2 2010/08/16 04:46:16 marka Exp $
 
diff --git a/bin/tests/system/dnssec/README b/bin/tests/system/dnssec/README
index 1dc533f83cf..65ef6018d41 100644
--- a/bin/tests/system/dnssec/README
+++ b/bin/tests/system/dnssec/README
@@ -1,11 +1,6 @@
-Copyright (C) 2000-2002, 2004, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: README,v 1.10 2011/01/04 23:47:13 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns7/named.nosoa b/bin/tests/system/dnssec/ns7/named.nosoa
index ed37c0bfd7d..21d970b965e 100644
--- a/bin/tests/system/dnssec/ns7/named.nosoa
+++ b/bin/tests/system/dnssec/ns7/named.nosoa
@@ -1,11 +1,6 @@
-Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: named.nosoa,v 1.3 2010/06/26 23:46:49 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/signer/general/test1.zone b/bin/tests/system/dnssec/signer/general/test1.zone
index a53fba763b3..8c11a0e734f 100644
--- a/bin/tests/system/dnssec/signer/general/test1.zone
+++ b/bin/tests/system/dnssec/signer/general/test1.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;	This is a zone which has two DNSKEY records, both of which have
 ; existing private key files available.  They should be loaded automatically
 ; and the zone correctly signed.
diff --git a/bin/tests/system/dnssec/signer/general/test2.zone b/bin/tests/system/dnssec/signer/general/test2.zone
index 731c291cc74..b603931a522 100644
--- a/bin/tests/system/dnssec/signer/general/test2.zone
+++ b/bin/tests/system/dnssec/signer/general/test2.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;	This is a zone which has one non-KSK DNSKEY record for which the
 ; private key file exists.  It should be loaded automatically and the zone
 ; correctly signed.
diff --git a/bin/tests/system/dnssec/signer/general/test3.zone b/bin/tests/system/dnssec/signer/general/test3.zone
index ec05bee7c5b..70f2a869f1f 100644
--- a/bin/tests/system/dnssec/signer/general/test3.zone
+++ b/bin/tests/system/dnssec/signer/general/test3.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;       This is a zone which has one KSK DNSKEY record for which the
 ; private key file exists.  It should be loaded automatically.  As there
 ; is no non-KSK DNSKEY the resulting zone should be rejected.
diff --git a/bin/tests/system/dnssec/signer/general/test4.zone b/bin/tests/system/dnssec/signer/general/test4.zone
index 824e52b513b..fb5b6c446f8 100644
--- a/bin/tests/system/dnssec/signer/general/test4.zone
+++ b/bin/tests/system/dnssec/signer/general/test4.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;	This is a zone which has three DNSKEY records, two (KSK + ZSK) of
 ; which have existing private key files available.  The third is a
 ; pre-published ZSK.
diff --git a/bin/tests/system/dnssec/signer/general/test5.zone b/bin/tests/system/dnssec/signer/general/test5.zone
index 546ebad457c..7f33e271ff6 100644
--- a/bin/tests/system/dnssec/signer/general/test5.zone
+++ b/bin/tests/system/dnssec/signer/general/test5.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;	This is a zone which has three DNSKEY records, two (KSK +ZSK) of which
 ; have existing private key files available.  The third is a KSK.
 ;
diff --git a/bin/tests/system/dnssec/signer/general/test6.zone b/bin/tests/system/dnssec/signer/general/test6.zone
index 91091f7275f..aad28386808 100644
--- a/bin/tests/system/dnssec/signer/general/test6.zone
+++ b/bin/tests/system/dnssec/signer/general/test6.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;	This is a zone which has four DNSKEY records, two (KK + ZSK) of which
 ; have existing private key files available.  There are also a KSK and ZSK
 ; for which there will be no signatures.
diff --git a/bin/tests/system/dnssec/signer/general/test7.zone b/bin/tests/system/dnssec/signer/general/test7.zone
index e42d5aa1def..e804f81dfee 100644
--- a/bin/tests/system/dnssec/signer/general/test7.zone
+++ b/bin/tests/system/dnssec/signer/general/test7.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;	This is a zone which has two DNSKEY records, none of which have
 ; existing private key files available.  The resulting zone should fail
 ; the consistancy tests.
diff --git a/bin/tests/system/dnssec/signer/general/test8.zone b/bin/tests/system/dnssec/signer/general/test8.zone
index cc51f0a1830..abfc58f818d 100644
--- a/bin/tests/system/dnssec/signer/general/test8.zone
+++ b/bin/tests/system/dnssec/signer/general/test8.zone
@@ -1,4 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 ;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 ;	This is a zone which has two DNSKEY records, one of which,
 ; the KSK, has a private key.  The resulting zone should be rejected as
 ; it has no ZSK signatures.
diff --git a/bin/tests/system/geoip/data/README b/bin/tests/system/geoip/data/README
index 1b35c9ab713..7ed1d612e72 100644
--- a/bin/tests/system/geoip/data/README
+++ b/bin/tests/system/geoip/data/README
@@ -1,11 +1,6 @@
-Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The data data files in this directory are sample GeoIP databases,
 generated from the corresponding CSV files.  Thanks to MaxMind, Inc.
diff --git a/bin/tests/system/keymgr/01-ksk-inactive/README b/bin/tests/system/keymgr/01-ksk-inactive/README
index e5f05faac90..b91a6757634 100644
--- a/bin/tests/system/keymgr/01-ksk-inactive/README
+++ b/bin/tests/system/keymgr/01-ksk-inactive/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes one KSK rollover.  The KSK is deactivated prior to
 its replacement being activated.
diff --git a/bin/tests/system/keymgr/02-zsk-inactive/README b/bin/tests/system/keymgr/02-zsk-inactive/README
index bed65b87e6e..9d1e17f554e 100644
--- a/bin/tests/system/keymgr/02-zsk-inactive/README
+++ b/bin/tests/system/keymgr/02-zsk-inactive/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes one ZSK rollover.  The first ZSK is deactivated
 prior to its replacement being activated.
diff --git a/bin/tests/system/keymgr/03-ksk-unpublished/README b/bin/tests/system/keymgr/03-ksk-unpublished/README
index 3cded5788b8..513e9bda0af 100644
--- a/bin/tests/system/keymgr/03-ksk-unpublished/README
+++ b/bin/tests/system/keymgr/03-ksk-unpublished/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set contains one KSK rollover.  The KSK is unpublished before its
 successor is published.
diff --git a/bin/tests/system/keymgr/04-zsk-unpublished/README b/bin/tests/system/keymgr/04-zsk-unpublished/README
index 98ad332843b..a5185563854 100644
--- a/bin/tests/system/keymgr/04-zsk-unpublished/README
+++ b/bin/tests/system/keymgr/04-zsk-unpublished/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set contains one ZSK rollover.  The ZSK is unpublished before its
 successor is published.
diff --git a/bin/tests/system/keymgr/05-ksk-unpub-active/README b/bin/tests/system/keymgr/05-ksk-unpub-active/README
index 3c176900297..e6a194b6fbc 100644
--- a/bin/tests/system/keymgr/05-ksk-unpub-active/README
+++ b/bin/tests/system/keymgr/05-ksk-unpub-active/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
diff --git a/bin/tests/system/keymgr/06-zsk-unpub-active/README b/bin/tests/system/keymgr/06-zsk-unpub-active/README
index 3c176900297..e6a194b6fbc 100644
--- a/bin/tests/system/keymgr/06-zsk-unpub-active/README
+++ b/bin/tests/system/keymgr/06-zsk-unpub-active/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
diff --git a/bin/tests/system/keymgr/07-ksk-ttl/README b/bin/tests/system/keymgr/07-ksk-ttl/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/07-ksk-ttl/README
+++ b/bin/tests/system/keymgr/07-ksk-ttl/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/08-zsk-ttl/README b/bin/tests/system/keymgr/08-zsk-ttl/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/08-zsk-ttl/README
+++ b/bin/tests/system/keymgr/08-zsk-ttl/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/09-no-keys/README b/bin/tests/system/keymgr/09-no-keys/README
index 699f97f666f..5f4d53ab490 100644
--- a/bin/tests/system/keymgr/09-no-keys/README
+++ b/bin/tests/system/keymgr/09-no-keys/README
@@ -1,10 +1,5 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This directory has no key set, but one will be initialized by dnssec-keymgr.
diff --git a/bin/tests/system/keymgr/10-change-roll/README b/bin/tests/system/keymgr/10-change-roll/README
index 563748af9d8..8cf6f4e6a62 100644
--- a/bin/tests/system/keymgr/10-change-roll/README
+++ b/bin/tests/system/keymgr/10-change-roll/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This directory has a key set which is valid, but has a ZSK rollover period
 of only three months. It will be updated to have a ZSK rollover period of
diff --git a/bin/tests/system/keymgr/11-many-simul/README b/bin/tests/system/keymgr/11-many-simul/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/11-many-simul/README
+++ b/bin/tests/system/keymgr/11-many-simul/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/12-many-active/README b/bin/tests/system/keymgr/12-many-active/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/12-many-active/README
+++ b/bin/tests/system/keymgr/12-many-active/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/13-noroll/README b/bin/tests/system/keymgr/13-noroll/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/13-noroll/README
+++ b/bin/tests/system/keymgr/13-noroll/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/14-wrongalg/README b/bin/tests/system/keymgr/14-wrongalg/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/14-wrongalg/README
+++ b/bin/tests/system/keymgr/14-wrongalg/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/15-unspec/README b/bin/tests/system/keymgr/15-unspec/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/15-unspec/README
+++ b/bin/tests/system/keymgr/15-unspec/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/16-wrongalg-unspec/README b/bin/tests/system/keymgr/16-wrongalg-unspec/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/16-wrongalg-unspec/README
+++ b/bin/tests/system/keymgr/16-wrongalg-unspec/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/17-noforce/README b/bin/tests/system/keymgr/17-noforce/README
index 5ffc1cbbd9c..791b6d38483 100644
--- a/bin/tests/system/keymgr/17-noforce/README
+++ b/bin/tests/system/keymgr/17-noforce/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/18-nonstd-prepub/README b/bin/tests/system/keymgr/18-nonstd-prepub/README
index 2f13fec9ee1..fc1aacae933 100644
--- a/bin/tests/system/keymgr/18-nonstd-prepub/README
+++ b/bin/tests/system/keymgr/18-nonstd-prepub/README
@@ -1,11 +1,6 @@
-Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This directory has a key set which is valid, but will expire within
 the rollover period. The prepublication interval in policy.conf is a
diff --git a/bin/tests/system/mkeys/README b/bin/tests/system/mkeys/README
index ef8b5db9df8..8e1b407664a 100644
--- a/bin/tests/system/mkeys/README
+++ b/bin/tests/system/mkeys/README
@@ -1,11 +1,6 @@
-Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This is for testing managed-keys, in particular with problems
 with RFC 5011 Automated Updates of DNSSEC Trust Anchors.
diff --git a/bin/tests/system/reclimit/README b/bin/tests/system/reclimit/README
index 63f12fa03d3..bb7f596c53b 100644
--- a/bin/tests/system/reclimit/README
+++ b/bin/tests/system/reclimit/README
@@ -1,11 +1,6 @@
-Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 system test for recursion limits
 
diff --git a/bin/tests/system/resolver/ns4/named.noaa b/bin/tests/system/resolver/ns4/named.noaa
index d8166d64279..38a96fbb9b4 100644
--- a/bin/tests/system/resolver/ns4/named.noaa
+++ b/bin/tests/system/resolver/ns4/named.noaa
@@ -1,11 +1,6 @@
-Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: named.noaa,v 1.2 2010/09/15 12:07:56 marka Exp $
 
diff --git a/bin/tests/system/rpzrecurse/README b/bin/tests/system/rpzrecurse/README
index c495d4d0fb9..67546bb559a 100644
--- a/bin/tests/system/rpzrecurse/README
+++ b/bin/tests/system/rpzrecurse/README
@@ -1,11 +1,6 @@
-Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 These tests check RPZ recursion behavior (including skipping
 recursion when appropriate).
diff --git a/bin/tests/system/runtime/README b/bin/tests/system/runtime/README
index 0fdf7aee64b..11429a299b6 100644
--- a/bin/tests/system/runtime/README
+++ b/bin/tests/system/runtime/README
@@ -1,11 +1,6 @@
-Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Tests of runtime checks, e.g., that named prevents duplicate processes
 from running.
diff --git a/bin/tests/system/sfcache/README b/bin/tests/system/sfcache/README
index 2fde21f0a8e..14c3b915c24 100644
--- a/bin/tests/system/sfcache/README
+++ b/bin/tests/system/sfcache/README
@@ -1,11 +1,6 @@
-Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The test setup for the SERVFAIL ncache tests has a secure root.
 
diff --git a/bin/tests/virtual-time/README b/bin/tests/virtual-time/README
index 9d078e4bd55..364816ff059 100644
--- a/bin/tests/virtual-time/README
+++ b/bin/tests/virtual-time/README
@@ -1,11 +1,6 @@
-Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 This is copied from ../system.
 
diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index 7c2ac9954f0..11383596bb4 100644
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2002, 2004, 2007, 2009, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index de9b1e835e1..63b5aead1d7 100644
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2009, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/win32/BINDInstall/BINDInstall.h b/bin/win32/BINDInstall/BINDInstall.h
index 85f479fd6f1..ef66e4297a9 100644
--- a/bin/win32/BINDInstall/BINDInstall.h
+++ b/bin/win32/BINDInstall/BINDInstall.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 436e89bf0ef..d79147f5de9 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2003-2010, 2013-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h
index 8b9a5b2967b..4caac239a95 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.h
+++ b/bin/win32/BINDInstall/BINDInstallDlg.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2009, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/win32/BINDInstall/DirBrowse.cpp b/bin/win32/BINDInstall/DirBrowse.cpp
index 636bf24d526..6c43c296d04 100644
--- a/bin/win32/BINDInstall/DirBrowse.cpp
+++ b/bin/win32/BINDInstall/DirBrowse.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/win32/BINDInstall/DirBrowse.h b/bin/win32/BINDInstall/DirBrowse.h
index 38ec7fe49a0..df9b5c6d8af 100644
--- a/bin/win32/BINDInstall/DirBrowse.h
+++ b/bin/win32/BINDInstall/DirBrowse.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/contrib/scripts/named-bootconf.sh b/contrib/scripts/named-bootconf.sh
index 86a592a2c35..3f2e583663a 100644
--- a/contrib/scripts/named-bootconf.sh
+++ b/contrib/scripts/named-bootconf.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Portions Copyright (C) 1999-2001, 2004, 2006, 2007, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+# Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/doc/arm/README-SGML b/doc/arm/README-SGML
index 40dfbc07cd3..1f2a9653569 100644
--- a/doc/arm/README-SGML
+++ b/doc/arm/README-SGML
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The BIND v9 ARM master document is now kept in DocBook 5 XML format.
 
diff --git a/doc/design/addressdb b/doc/design/addressdb
index 2b1f5583c1a..fbc57530a4a 100644
--- a/doc/design/addressdb
+++ b/doc/design/addressdb
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: addressdb,v 1.6 2004/03/05 05:04:45 marka Exp $
 
diff --git a/doc/design/cds-child b/doc/design/cds-child
index 33953fa1d16..034f25ea76e 100644
--- a/doc/design/cds-child
+++ b/doc/design/cds-child
@@ -1,11 +1,6 @@
-Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 	  CDS / CDNSKEY Child side processing.
 
diff --git a/doc/design/compression b/doc/design/compression
index 0891918e045..a299069c846 100644
--- a/doc/design/compression
+++ b/doc/design/compression
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Compression
 
diff --git a/doc/design/database b/doc/design/database
index 76fd270056d..a6f89956911 100644
--- a/doc/design/database
+++ b/doc/design/database
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: database,v 1.9 2004/03/05 05:04:46 marka Exp $
 
diff --git a/doc/design/db_rules b/doc/design/db_rules
index 7e87ccc571a..b2410c58a42 100644
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: db_rules,v 1.8 2004/03/05 05:04:46 marka Exp $
 
diff --git a/doc/design/decompression b/doc/design/decompression
index 35ab69114c3..ab19cfe9acf 100644
--- a/doc/design/decompression
+++ b/doc/design/decompression
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Decompression
 
diff --git a/doc/design/dispatch b/doc/design/dispatch
index e7bca417cbe..20466fa6e8e 100644
--- a/doc/design/dispatch
+++ b/doc/design/dispatch
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: dispatch,v 1.6 2004/03/05 05:04:46 marka Exp $
 
diff --git a/doc/design/dscp b/doc/design/dscp
index 883a93352ea..84049318ede 100644
--- a/doc/design/dscp
+++ b/doc/design/dscp
@@ -1,11 +1,6 @@
-Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 	Differentiate Services Code Point Support
 
diff --git a/doc/design/keydone b/doc/design/keydone
index 743cca2cde1..4ed65caf530 100644
--- a/doc/design/keydone
+++ b/doc/design/keydone
@@ -1,11 +1,6 @@
-Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: keydone,v 1.2 2011/10/19 23:46:56 tbox Exp $
 
diff --git a/doc/design/logging b/doc/design/logging
index e20dc8f1acf..d1752939422 100644
--- a/doc/design/logging
+++ b/doc/design/logging
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: logging,v 1.10 2004/03/05 05:04:46 marka Exp $
 
diff --git a/doc/design/ncache b/doc/design/ncache
index c46c885347f..717dd5e5546 100644
--- a/doc/design/ncache
+++ b/doc/design/ncache
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: ncache,v 1.7 2004/03/05 05:04:46 marka Exp $
 
diff --git a/doc/design/rdataset b/doc/design/rdataset
index 681555ef051..2a14f68b588 100644
--- a/doc/design/rdataset
+++ b/doc/design/rdataset
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: rdataset,v 1.6 2004/03/05 05:04:46 marka Exp $
 
diff --git a/doc/design/red-black b/doc/design/red-black
index 4d7ef6f811b..242c3f67b93 100644
--- a/doc/design/red-black
+++ b/doc/design/red-black
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: red-black,v 1.9 2004/03/05 05:04:46 marka Exp $
 
diff --git a/doc/design/resolver b/doc/design/resolver
index d3886015dc5..c3c3ae07c16 100644
--- a/doc/design/resolver
+++ b/doc/design/resolver
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: resolver,v 1.6 2004/03/05 05:04:47 marka Exp $
 
diff --git a/doc/design/search b/doc/design/search
index 12344c20b2e..ff14f89a042 100644
--- a/doc/design/search
+++ b/doc/design/search
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: search,v 1.10 2004/03/05 05:04:47 marka Exp $
 
diff --git a/doc/design/tasks b/doc/design/tasks
index 898c475d131..bc2c12db497 100644
--- a/doc/design/tasks
+++ b/doc/design/tasks
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: tasks,v 1.7 2004/03/05 05:04:47 marka Exp $
 
diff --git a/doc/design/verify b/doc/design/verify
index f351f5cb2b1..adb3b87e95b 100644
--- a/doc/design/verify
+++ b/doc/design/verify
@@ -1,11 +1,6 @@
-Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id$
 
diff --git a/doc/design/windows-nt b/doc/design/windows-nt
index 8112457e0bf..46dcb66b88b 100644
--- a/doc/design/windows-nt
+++ b/doc/design/windows-nt
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: windows-nt,v 1.8 2004/03/05 05:04:47 marka Exp $
 
diff --git a/doc/design/zone b/doc/design/zone
index fa5e01f475b..5438fbb8319 100644
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Zones
 
diff --git a/doc/dev/DBC b/doc/dev/DBC
index 670b2de019c..db0c71ed876 100644
--- a/doc/dev/DBC
+++ b/doc/dev/DBC
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: DBC,v 1.6 2004/03/05 05:04:49 marka Exp $
 
diff --git a/doc/dev/HOW-ADB-WORKS.txt b/doc/dev/HOW-ADB-WORKS.txt
index 54fb0e769b1..b798606ab2d 100644
--- a/doc/dev/HOW-ADB-WORKS.txt
+++ b/doc/dev/HOW-ADB-WORKS.txt
@@ -1,11 +1,6 @@
-Copyright (C) 2003, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: HOW-ADB-WORKS.txt,v 1.2 2004/03/05 05:04:50 marka Exp $
 
diff --git a/doc/dev/autoconf b/doc/dev/autoconf
index 3153869fe75..0109656e449 100644
--- a/doc/dev/autoconf
+++ b/doc/dev/autoconf
@@ -1,11 +1,6 @@
-Copyright (C) 2001, 2002, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: autoconf,v 1.4 2004/03/05 05:04:50 marka Exp $
 
diff --git a/doc/dev/cvs-usage b/doc/dev/cvs-usage
index 752e19c2d1f..090b6813cd0 100644
--- a/doc/dev/cvs-usage
+++ b/doc/dev/cvs-usage
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Notes on CVS Usage
 
diff --git a/doc/dev/magic_numbers b/doc/dev/magic_numbers
index 27ecf1fcdae..edbfd463f33 100644
--- a/doc/dev/magic_numbers
+++ b/doc/dev/magic_numbers
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2002, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: magic_numbers,v 1.7 2004/03/05 05:04:50 marka Exp $
 
diff --git a/doc/dev/release b/doc/dev/release
index f4374ab3b06..ae4e6d550f9 100644
--- a/doc/dev/release
+++ b/doc/dev/release
@@ -1,11 +1,6 @@
-Copyright (C) 2000-2007, 2009, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: release,v 1.74 2009/08/06 23:47:44 tbox Exp $
 
diff --git a/doc/dev/results b/doc/dev/results
index 178d6d4fcc9..efd49bdd4b9 100644
--- a/doc/dev/results
+++ b/doc/dev/results
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: results,v 1.7 2004/03/05 05:04:50 marka Exp $
 
diff --git a/doc/dev/tests b/doc/dev/tests
index ec3ed5445b4..38e281ae93d 100644
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: tests,v 1.15 2004/03/05 05:04:50 marka Exp $
 
diff --git a/doc/dev/unexpected b/doc/dev/unexpected
index 1e31f005b55..ff84ab41e7c 100644
--- a/doc/dev/unexpected
+++ b/doc/dev/unexpected
@@ -1,11 +1,6 @@
-Copyright (C) 1999-2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: unexpected,v 1.6 2004/03/05 05:04:50 marka Exp $
 
diff --git a/doc/misc/dnssec b/doc/misc/dnssec
index a94ff7aabdf..9d9d5f146eb 100644
--- a/doc/misc/dnssec
+++ b/doc/misc/dnssec
@@ -1,11 +1,6 @@
-Copyright (C) 2000-2002, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 DNSSEC Release Notes
 
diff --git a/doc/misc/ipv6 b/doc/misc/ipv6
index 7cc2ff7902b..321dea9be75 100644
--- a/doc/misc/ipv6
+++ b/doc/misc/ipv6
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Currently, there are multiple interesting problems with ipv6
 implementations on various platforms.  These problems range from not
diff --git a/doc/misc/migration b/doc/misc/migration
index f1fb72ebeac..baa11451999 100644
--- a/doc/misc/migration
+++ b/doc/misc/migration
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
                    BIND 8 to BIND 9 Migration Notes
 
diff --git a/doc/misc/migration-4to9 b/doc/misc/migration-4to9
index bb2b0f779ab..3c24f9b8a60 100644
--- a/doc/misc/migration-4to9
+++ b/doc/misc/migration-4to9
@@ -1,11 +1,6 @@
-Copyright (C) 2001, 2004, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: migration-4to9,v 1.4 2004/03/05 05:04:53 marka Exp $
 
diff --git a/doc/misc/rfc-compliance b/doc/misc/rfc-compliance
index 3fe47310743..0dbc9d4d6d4 100644
--- a/doc/misc/rfc-compliance
+++ b/doc/misc/rfc-compliance
@@ -1,11 +1,6 @@
-Copyright (C) 2001, 2004, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 BIND 9 is striving for strict compliance with IETF standards.  We
 believe this release of BIND 9 complies with the following RFCs, with
diff --git a/doc/misc/roadmap b/doc/misc/roadmap
index e2680f4543c..47c07cd9156 100644
--- a/doc/misc/roadmap
+++ b/doc/misc/roadmap
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Road Map to the BIND 9 Source Tree
 
diff --git a/doc/misc/sdb b/doc/misc/sdb
index ee4ab7d7e0d..5b62a29e60a 100644
--- a/doc/misc/sdb
+++ b/doc/misc/sdb
@@ -1,11 +1,6 @@
-Copyright (C) 2000, 2001, 2004, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Using the BIND 9 Simplified Database Interface
 
diff --git a/doc/misc/tcp-fast-open b/doc/misc/tcp-fast-open
index 616512994eb..020ec053a14 100644
--- a/doc/misc/tcp-fast-open
+++ b/doc/misc/tcp-fast-open
@@ -1,11 +1,6 @@
-Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Some systems (Linux, FreeBSD, OS X/macOS and Windows 10) support
 the TCP Fast Open (RFC 7413) mechanism in their recent versions.
diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
index 384a49c8fbc..1d8d3746ad4 100644
--- a/lib/dns/dlz.c
+++ b/lib/dns/dlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005, 2007, 2009-2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 76327754925..eb304157ec6 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index 2fc7c083685..e844a935728 100644
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2000-2002, 2004-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index da34aff0768..e6f8e8e8a0e 100644
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2002, 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h
index 46257b6d1ae..7747f0bc67b 100644
--- a/lib/dns/dst_parse.h
+++ b/lib/dns/dst_parse.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2000-2002, 2004-2010, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index 0f7a58c23bc..b1b9365f007 100644
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2002, 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h
index b9a450c4d05..bb33e6f8890 100644
--- a/lib/dns/include/dns/dlz.h
+++ b/lib/dns/include/dns/dlz.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005-2007, 2009-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index 848251dc9e4..e1c86793540 100644
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005-2007, 2009-2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 44536330fe0..0f3a679f032 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index b8b4be6c2f1..72ac350f200 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2002, 2004-2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index 3d233192c21..f628d9d660a 100644
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2002, 2004-2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index e1cf07bcee3..fe941086617 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c
index 22bf58315d7..26e4d277202 100644
--- a/lib/isc/commandline.c
+++ b/lib/isc/commandline.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2001, 2004, 2005, 2007, 2008, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/isc/include/pk11/README.site b/lib/isc/include/pk11/README.site
index 30328f40778..6c49891c358 100644
--- a/lib/isc/include/pk11/README.site
+++ b/lib/isc/include/pk11/README.site
@@ -1,11 +1,6 @@
-Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 How to use site.h for the PKCS#11 provider of your HSM
 ------------------------------------------------------
diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c
index bf38442c448..c707ef8fdfb 100644
--- a/lib/isc/tests/timer_test.c
+++ b/lib/isc/tests/timer_test.c
@@ -567,11 +567,11 @@ ATF_TC_BODY(purge, tc) {
 #else
 ATF_TC(untested);
 ATF_TC_HEAD(untested, tc) {
-        atf_tc_set_md_var(tc, "descr", "skipping nsec3 test");
+	atf_tc_set_md_var(tc, "descr", "skipping nsec3 test");
 }
 ATF_TC_BODY(untested, tc) {
-        UNUSED(tc);
-        atf_tc_skip("DNSSEC not available");
+	UNUSED(tc);
+	atf_tc_skip("DNSSEC not available");
 }
 #endif
 
diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c
index e98ec783b55..db1e69f618d 100644
--- a/lib/isccc/alist.c
+++ b/lib/isccc/alist.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/base64.c b/lib/isccc/base64.c
index 053d10308a5..c75bcfb3332 100644
--- a/lib/isccc/base64.c
+++ b/lib/isccc/base64.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
index e801bf065b6..7225ab4a375 100644
--- a/lib/isccc/cc.c
+++ b/lib/isccc/cc.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001-2007, 2012-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c
index 30a9b7fb4b6..8be0aa733a5 100644
--- a/lib/isccc/ccmsg.c
+++ b/lib/isccc/ccmsg.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h
index ccd6be897b2..7234d49bd96 100644
--- a/lib/isccc/include/isccc/alist.h
+++ b/lib/isccc/include/isccc/alist.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/base64.h b/lib/isccc/include/isccc/base64.h
index 598f1a35649..e07ea2d77a0 100644
--- a/lib/isccc/include/isccc/base64.h
+++ b/lib/isccc/include/isccc/base64.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h
index f6a32af991e..b576289e11a 100644
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h
index 0632daeee9d..4a501faee88 100644
--- a/lib/isccc/include/isccc/ccmsg.h
+++ b/lib/isccc/include/isccc/ccmsg.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/events.h b/lib/isccc/include/isccc/events.h
index 61aa676cf9d..0fa57612957 100644
--- a/lib/isccc/include/isccc/events.h
+++ b/lib/isccc/include/isccc/events.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/lib.h b/lib/isccc/include/isccc/lib.h
index d9ee50e0754..e1f4519634f 100644
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/result.h b/lib/isccc/include/isccc/result.h
index 788afe1fe35..ae8ac47d346 100644
--- a/lib/isccc/include/isccc/result.h
+++ b/lib/isccc/include/isccc/result.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2003-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h
index bcf31d6ac67..cbae4345e7c 100644
--- a/lib/isccc/include/isccc/sexpr.h
+++ b/lib/isccc/include/isccc/sexpr.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h
index ef7824ae4ad..a3af8bfed89 100644
--- a/lib/isccc/include/isccc/symtab.h
+++ b/lib/isccc/include/isccc/symtab.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/symtype.h b/lib/isccc/include/isccc/symtype.h
index 8a0f4769a1a..21ea76637cd 100644
--- a/lib/isccc/include/isccc/symtype.h
+++ b/lib/isccc/include/isccc/symtype.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/types.h b/lib/isccc/include/isccc/types.h
index 5589a02d564..be8ab2f18bb 100644
--- a/lib/isccc/include/isccc/types.h
+++ b/lib/isccc/include/isccc/types.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h
index c8ed1466d1e..8c49b6bdcf1 100644
--- a/lib/isccc/include/isccc/util.h
+++ b/lib/isccc/include/isccc/util.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index 8553170f74a..0d7276682cf 100644
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/result.c b/lib/isccc/result.c
index f3ea0fd632f..53d06ed0e70 100644
--- a/lib/isccc/result.c
+++ b/lib/isccc/result.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2003-2005, 2007, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c
index 0f5b6d502fd..062fbcdd9a2 100644
--- a/lib/isccc/sexpr.c
+++ b/lib/isccc/sexpr.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c
index 915fe5ad7d5..35d46e1166e 100644
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Portions Copyright (C) Nominum, Inc.
+ * Portions Copyright (C) 2001 Nominum, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/util/copyrights b/util/copyrights
index 795d7cbc527..6e4b47c145c 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -7,7 +7,7 @@
 ./CHANGES					X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./CONTRIBUTING					X	2017,2018
 ./CONTRIBUTING.md				MKD	2017,2018
-./COPYRIGHT					X.TOP	1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./COPYRIGHT					TXT.TOP	1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./HISTORY					X	2010,2013,2016,2017,2018
 ./HISTORY.md					MKD	2017,2018
 ./Kyuafile					X	2017,2018
@@ -344,7 +344,6 @@
 ./bin/tests/headerdep_test.sh.in		SH	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/makejournal.c			C	2013,2015,2016,2017,2018
 ./bin/tests/named.conf				CONF-C	1999,2000,2001,2004,2007,2011,2015,2016,2018
-./bin/tests/ndc.conf-include			CONF-C	2001,2004,2007,2016,2018
 ./bin/tests/optional/Kchild.example.+003+04017.key	X	2000,2001,2018
 ./bin/tests/optional/Kchild.example.+003+04017.private	X	2000,2001,2018
 ./bin/tests/optional/Makefile.in		MAKE	2018
@@ -4476,6 +4475,7 @@
 ./util/COPYRIGHT.NAI				X	1996,1997,1998,1999,2000,2001,2004,2007,2016,2018
 ./util/COPYRIGHT.NOM				X	2001,2004,2007,2016,2018
 ./util/COPYRIGHT.PORTION			X	1996,1997,1998,1999,2000,2001,2004,2007,2016,2018
+./util/COPYRIGHT.TOP				X	2018
 ./util/altbuild.sh				SH	2000,2001,2002,2004,2007,2008,2012,2016,2017,2018
 ./util/bindkeys.pl				PERL	2009,2010,2011,2012,2014,2016,2017,2018
 ./util/branchsync.sh				SH	2013,2016,2018
diff --git a/win32utils/build.txt b/win32utils/build.txt
index 086a5d91059..5e0305dd6d8 100644
--- a/win32utils/build.txt
+++ b/win32utils/build.txt
@@ -1,11 +1,6 @@
-Copyright (C) 2013-2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
        BIND 9.10 for Win32 Source Build Instructions.  17-Apr-2015
 
diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index 84e2d1ac630..cb336e9587e 100644
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,11 +1,6 @@
-Copyright (C) 2001, 2003-2005, 2007-2009, 2012-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 NOTES ON BIND 9.10 FOR WINDOWS: