From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 23 Feb 2018 08:53:12 +0000 (+0100)
Subject: Update license headers to not include years in copyright in all applicable files
X-Git-Tag: v9.13.0~147^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=843d389661c98d4cbf1af51aec5c31feae6da184;p=thirdparty%2Fbind9.git

Update license headers to not include years in copyright in all applicable files
---

diff --git a/HISTORY.md b/HISTORY.md
index 9cd11b5f380..844b0fb9f0c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2017  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.
 -->
 ### Functional enhancements from prior major releases of BIND 9
 
diff --git a/Makefile.in b/Makefile.in
index b2681edb75f..d00c6b4b52e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2002, 2004-2009, 2011-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/OPTIONS.md b/OPTIONS.md
index 79d42f53d54..95709e0e641 100644
--- a/OPTIONS.md
+++ b/OPTIONS.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2017  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.
 -->
 Setting the `STD_CDEFINES` environment variable before running `configure`
 can be used to enable certain compile-time options that are not explicitly
diff --git a/README.md b/README.md
index 9fd2b0af7a6..0e4843d3b67 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,12 @@
 <!--
- - 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.
 -->
 # BIND 9
 
diff --git a/acconfig.h b/acconfig.h
index 3d22ded74bc..266939e636d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2008, 2012, 2014, 2016  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.
  */
 
 /* $Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp $ */
diff --git a/autogen.sh b/autogen.sh
index 252f8fc8332..7add8eabc1c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  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.
 
 # Run this script after modifying configure.in to generate configure
 autoreconf -i
diff --git a/bin/Makefile.in b/bin/Makefile.in
index f3cbed3f78c..835f5f19d79 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2009, 2012-2014, 2016  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.
 
 # $Id: Makefile.in,v 1.29 2009/10/05 12:07:08 fdupont Exp $
 
diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 8202964a448..e47a9135385 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000-2007, 2009, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 62377b5c432..3537c57d991 100644
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004-2017  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.
  */
 
 /* $Id: check-tool.c,v 1.44 2011/12/22 07:32:39 each Exp $ */
diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h
index d7f183b2fd7..55c20168943 100644
--- a/bin/check/check-tool.h
+++ b/bin/check/check-tool.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007, 2010, 2011, 2013, 2014, 2016  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.
  */
 
 /* $Id: check-tool.h,v 1.18 2011/12/09 23:47:02 tbox Exp $ */
diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 865c01cad07..f914e3b6d6e 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009-2017  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.
  */
 
 /* $Id: named-checkconf.c,v 1.56 2011/03/12 04:59:46 tbox Exp $ */
diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 7075bd772db..dea38896cee 100644
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -1,11 +1,14 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -36,6 +39,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index c197253d768..bfbe123729b 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2016  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.
  */
 
 /* $Id: named-checkzone.c,v 1.65.32.2 2012/02/07 02:45:21 each Exp $ */
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index e3ddbe49328..f4c5fd6a41c 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000-2002, 2004-2007, 2009-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -39,6 +42,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index a0a19f51396..d2a6b692b33 100644
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/confgen/ddns-confgen.c b/bin/confgen/ddns-confgen.c
index f9494a370f5..f9ed35e6245 100644
--- a/bin/confgen/ddns-confgen.c
+++ b/bin/confgen/ddns-confgen.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011, 2014, 2016  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.
  */
 
 /*! \file */
diff --git a/bin/confgen/ddns-confgen.docbook b/bin/confgen/ddns-confgen.docbook
index 36fc909d583..78151218054 100644
--- a/bin/confgen/ddns-confgen.docbook
+++ b/bin/confgen/ddns-confgen.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -33,6 +36,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/confgen/include/confgen/os.h b/bin/confgen/include/confgen/os.h
index 263cb28a8ba..37eec1b2705 100644
--- a/bin/confgen/include/confgen/os.h
+++ b/bin/confgen/include/confgen/os.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: os.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
index 7eb85979da4..7391a3e2904 100644
--- a/bin/confgen/keygen.c
+++ b/bin/confgen/keygen.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012-2017  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.
  */
 
 /* $Id: keygen.c,v 1.4 2009/11/12 14:02:38 marka Exp $ */
diff --git a/bin/confgen/keygen.h b/bin/confgen/keygen.h
index 0052267ec62..9c8a6582747 100644
--- a/bin/confgen/keygen.h
+++ b/bin/confgen/keygen.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: keygen.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c
index 47450371670..c7a73745e1f 100644
--- a/bin/confgen/rndc-confgen.c
+++ b/bin/confgen/rndc-confgen.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2003-2005, 2007-2009, 2011, 2013, 2014, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook
index 4ae039fed2c..cf0e442d821 100644
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2001, 2003-2005, 2007, 2009, 2013-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -40,6 +43,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/confgen/unix/Makefile.in b/bin/confgen/unix/Makefile.in
index b1582dcbf4a..f200d2e34d3 100644
--- a/bin/confgen/unix/Makefile.in
+++ b/bin/confgen/unix/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.3 2009/06/11 23:47:55 tbox Exp $
 
diff --git a/bin/confgen/unix/os.c b/bin/confgen/unix/os.c
index bbfcbabf0a6..8bba386a4c9 100644
--- a/bin/confgen/unix/os.c
+++ b/bin/confgen/unix/os.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: os.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
diff --git a/bin/confgen/util.c b/bin/confgen/util.c
index b09d5271680..144d4634e77 100644
--- a/bin/confgen/util.c
+++ b/bin/confgen/util.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2015, 2016  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.
  */
 
 /* $Id: util.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
diff --git a/bin/confgen/util.h b/bin/confgen/util.h
index fab8084fa51..ba473af6da0 100644
--- a/bin/confgen/util.h
+++ b/bin/confgen/util.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: util.h,v 1.4 2009/09/29 15:06:05 fdupont Exp $ */
diff --git a/bin/confgen/win32/os.c b/bin/confgen/win32/os.c
index 4a701353559..b0294fa84a5 100644
--- a/bin/confgen/win32/os.c
+++ b/bin/confgen/win32/os.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: os.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index 47a4a927349..26512dede36 100644
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index 57b3c491c2d..c97ad69a095 100644
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #include <config.h>
diff --git a/bin/delv/delv.docbook b/bin/delv/delv.docbook
index c1f1c9318c6..9ed6b3d7e10 100644
--- a/bin/delv/delv.docbook
+++ b/bin/delv/delv.docbook
@@ -1,11 +1,14 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -35,6 +38,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index ac55cb87d87..46a4cf60f7f 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2012-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 620dde33eb7..cfe05cd7b4b 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 /*! \file */
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index bdd24b2fe2f..742d3cc7e15 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -1,11 +1,14 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2000-2011, 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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 98c9ce3deac..96ba8e44ffa 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 /*! \file
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 4c54c0e40c4..f27b839c7b7 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2007, 2009-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.
  */
 
 /*! \file */
diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
index 9aa0ad3d556..36fcf51de4a 100644
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@@ -1,11 +1,14 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2000-2002, 2004, 2005, 2007-2009, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -43,6 +46,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index 3f4c736b59d..48fc8f14b53 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2009, 2011-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.
  */
 
 #ifndef DIG_H
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index a47d64dcc42..6379b933f26 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 #include <config.h>
diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index 4c32977e481..3aff4e984dd 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2004-2007, 2010, 2013-2017  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.
 -->
 
 <!--
@@ -67,6 +70,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 30c5736613d..afdb717c6c8 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000-2002, 2004, 2005, 2007-2009, 2012-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c
index f3c6f8101ef..91d4b863a96 100644
--- a/bin/dnssec/dnssec-cds.c
+++ b/bin/dnssec/dnssec-cds.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*
diff --git a/bin/dnssec/dnssec-cds.docbook b/bin/dnssec/dnssec-cds.docbook
index a003706840a..9f671a7af6f 100644
--- a/bin/dnssec/dnssec-cds.docbook
+++ b/bin/dnssec/dnssec-cds.docbook
@@ -1,9 +1,12 @@
 <!--
- - 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.
 -->
 
 <refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-cds">
diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index 8597d05cfdd..a5bb03a0f9c 100644
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008-2012, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/bin/dnssec/dnssec-dsfromkey.docbook b/bin/dnssec/dnssec-dsfromkey.docbook
index 69bd7d773cb..fad4f56fbd7 100644
--- a/bin/dnssec/dnssec-dsfromkey.docbook
+++ b/bin/dnssec/dnssec-dsfromkey.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2008-2012, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -37,6 +40,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
index cdb4c502de3..75ee872a375 100644
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013-2017  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.
  */
 
 /*! \file */
diff --git a/bin/dnssec/dnssec-importkey.docbook b/bin/dnssec/dnssec-importkey.docbook
index ed579f7a034..df8efa355b4 100644
--- a/bin/dnssec/dnssec-importkey.docbook
+++ b/bin/dnssec/dnssec-importkey.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2013-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -34,6 +37,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index 89425ba8577..69cece8bfa2 100644
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2007-2012, 2014-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.
  */
 
 /*! \file */
diff --git a/bin/dnssec/dnssec-keyfromlabel.docbook b/bin/dnssec/dnssec-keyfromlabel.docbook
index 9913f607b89..b3f88b9330e 100644
--- a/bin/dnssec/dnssec-keyfromlabel.docbook
+++ b/bin/dnssec/dnssec-keyfromlabel.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2008-2012, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -39,6 +42,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 79ab89c0681..70b28860934 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -5,7 +5,10 @@
  * 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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index e3fe19eedde..0c89828c2ba 100644
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000-2005, 2007-2012, 2014-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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c
index 70998e85469..0b68e9940e7 100644
--- a/bin/dnssec/dnssec-revoke.c
+++ b/bin/dnssec/dnssec-revoke.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009-2012, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/bin/dnssec/dnssec-revoke.docbook b/bin/dnssec/dnssec-revoke.docbook
index a5aab1a5c32..acb2e9d6170 100644
--- a/bin/dnssec/dnssec-revoke.docbook
+++ b/bin/dnssec/dnssec-revoke.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2011, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -34,6 +37,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index f5bf724e1f3..b7bf171855c 100644
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009-2017  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.
  */
 
 /*! \file */
diff --git a/bin/dnssec/dnssec-settime.docbook b/bin/dnssec/dnssec-settime.docbook
index ac08a3582ee..f73fe02074d 100644
--- a/bin/dnssec/dnssec-settime.docbook
+++ b/bin/dnssec/dnssec-settime.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009-2011, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -36,6 +39,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 92025c16421..b8dd69ce799 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -5,7 +5,10 @@
  * 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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index ef0557c508a..5ea46dd021d 100644
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000-2009, 2011-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -46,6 +49,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
index c5f394efe55..d27dcae6a49 100644
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/bin/dnssec/dnssec-verify.docbook b/bin/dnssec/dnssec-verify.docbook
index e1ed25f963f..b2951e1c30b 100644
--- a/bin/dnssec/dnssec-verify.docbook
+++ b/bin/dnssec/dnssec-verify.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2012, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -33,6 +36,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index f4b5e74a6c3..d7c3ccabb03 100644
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2009-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.
  */
 
 /*! \file */
diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index 8de518b2bab..6e2dc338a37 100644
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2007-2012, 2014-2017  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.
  */
 
 /* $Id: dnssectool.h,v 1.33 2011/10/20 23:46:51 tbox Exp $ */
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index d2979d7bb82..db8e5464ef8 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2002, 2004-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 1bcb30498b6..4f3778ef591 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- - Copyright (C) 2006-2009, 2012-2017  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.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index f8969a96846..ac0cbfd4d0f 100644
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-2005, 2007, 2009-2017  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.
  */
 
 /* $Id: builtin.c,v 1.26 2012/01/21 19:44:18 each Exp $ */
diff --git a/bin/named/config.c b/bin/named/config.c
index 8d7af71fb5f..43269b4a3a7 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-2017  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.
  */
 
 /*! \file */
diff --git a/bin/named/control.c b/bin/named/control.c
index 875fd74022e..04563078890 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-2007, 2009-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.
  */
 
 /* $Id: control.c,v 1.49 2012/01/31 23:47:31 tbox Exp $ */
diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 040a62dd7dc..fc0a914b172 100644
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-2008, 2011-2017  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.
  */
 
 /*! \file */
diff --git a/bin/named/convertxsl.pl b/bin/named/convertxsl.pl
index 01e499a2683..6ab2f4b9c1d 100755
--- a/bin/named/convertxsl.pl
+++ b/bin/named/convertxsl.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2006-2008, 2012, 2014, 2016  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.
 
 # $Id: convertxsl.pl,v 1.14 2008/07/17 23:43:26 jinmei Exp $
 
diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c
index b5c81bdb6dd..b935764c7b2 100644
--- a/bin/named/fuzz.c
+++ b/bin/named/fuzz.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 #include "config.h"
diff --git a/bin/named/geoip.c b/bin/named/geoip.c
index 3f3703229d4..59683e744a5 100644
--- a/bin/named/geoip.c
+++ b/bin/named/geoip.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2014, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/bin/named/include/dlz/dlz_dlopen_driver.h b/bin/named/include/dlz/dlz_dlopen_driver.h
index 3103c1f2497..23bbb25f55b 100644
--- a/bin/named/include/dlz/dlz_dlopen_driver.h
+++ b/bin/named/include/dlz/dlz_dlopen_driver.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: dlz_dlopen_driver.h,v 1.4 2011/03/17 09:25:53 fdupont Exp $ */
diff --git a/bin/named/include/named/builtin.h b/bin/named/include/named/builtin.h
index 762f4718256..720eee634ae 100644
--- a/bin/named/include/named/builtin.h
+++ b/bin/named/include/named/builtin.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2016, 2017  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.
  */
 
 #ifndef NAMED_BUILTIN_H
diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index ba384d5c4c4..a3ab9aa9e26 100644
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2002, 2004-2007, 2009, 2013, 2016, 2017  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.
  */
 
 /* $Id: config.h,v 1.16 2009/06/11 23:47:55 tbox Exp $ */
diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index c05ec531bd3..6a31e6407cb 100644
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-2007, 2009-2012, 2014-2017  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.
  */
 
 #ifndef NAMED_CONTROL_H
diff --git a/bin/named/include/named/fuzz.h b/bin/named/include/named/fuzz.h
index 80af281932e..132d8920c28 100644
--- a/bin/named/include/named/fuzz.h
+++ b/bin/named/include/named/fuzz.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 #include <isc/fuzz.h>
diff --git a/bin/named/include/named/geoip.h b/bin/named/include/named/geoip.h
index 1b3624c3812..2dc0ce2019a 100644
--- a/bin/named/include/named/geoip.h
+++ b/bin/named/include/named/geoip.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016, 2017  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.
  */
 
 #ifndef _GEOIP_H
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 388dc9766d6..8f59dfc7a1b 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2017  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.
  */
 
 #ifndef NAMED_GLOBALS_H
diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h
index 3492f824a71..8346ffde962 100644
--- a/bin/named/include/named/log.h
+++ b/bin/named/include/named/log.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2015-2017  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.
  */
 
 #ifndef NAMED_LOG_H
diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h
index 63090a7243c..53281b3191d 100644
--- a/bin/named/include/named/logconf.h
+++ b/bin/named/include/named/logconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016, 2017  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.
  */
 
 /* $Id: logconf.h,v 1.17 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/named/include/named/main.h b/bin/named/include/named/main.h
index c20348db04a..a126e935c8b 100644
--- a/bin/named/include/named/main.h
+++ b/bin/named/include/named/main.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2013, 2015-2017  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.
  */
 
 #ifndef NAMED_MAIN_H
diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index a73bf33edb9..296ac8e4175 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2017  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.
  */
 
 #ifndef NAMED_SERVER_H
diff --git a/bin/named/include/named/smf_globals.h b/bin/named/include/named/smf_globals.h
index c5285c9727c..e06823654b1 100644
--- a/bin/named/include/named/smf_globals.h
+++ b/bin/named/include/named/smf_globals.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NAMED_SMF_GLOBALS_H
diff --git a/bin/named/include/named/statschannel.h b/bin/named/include/named/statschannel.h
index 31788da07be..dff0088c367 100644
--- a/bin/named/include/named/statschannel.h
+++ b/bin/named/include/named/statschannel.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2016, 2017  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.
  */
 
 #ifndef NAMED_STATSCHANNEL_H
diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h
index 992a9c8fccb..4b586329380 100644
--- a/bin/named/include/named/tkeyconf.h
+++ b/bin/named/include/named/tkeyconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016, 2017  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.
  */
 
 #ifndef NAMED_TKEYCONF_H
diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h
index efa31391402..9c49ba72b09 100644
--- a/bin/named/include/named/tsigconf.h
+++ b/bin/named/include/named/tsigconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2016, 2017  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.
  */
 
 #ifndef NAMED_TSIGCONF_H
diff --git a/bin/named/include/named/types.h b/bin/named/include/named/types.h
index 20701b3576c..0701091f9f0 100644
--- a/bin/named/include/named/types.h
+++ b/bin/named/include/named/types.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2009, 2015-2017  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.
  */
 
 #ifndef NAMED_TYPES_H
diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h
index e9d1e873c7c..2fc0755fa03 100644
--- a/bin/named/include/named/zoneconf.h
+++ b/bin/named/include/named/zoneconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2010, 2011, 2015-2017  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.
  */
 
 #ifndef NAMED_ZONECONF_H
diff --git a/bin/named/log.c b/bin/named/log.c
index a61b598fcf6..0e3ac72c8ef 100644
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009, 2013, 2014, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index e686cc22861..b18416df28b 100644
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2011, 2013-2017  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.
  */
 
 /*! \file */
diff --git a/bin/named/main.c b/bin/named/main.c
index a3e1b84f0a2..7b66126bccb 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /*! \file */
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index f3fce006294..7f11110daf9 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2004-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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index 0c0b3c015d8..66e1878febd 100644
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000, 2001, 2003-2009, 2011, 2013-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -44,6 +47,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/named/server.c b/bin/named/server.c
index 89cf2800b63..7582b2ea4d4 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /*! \file */
diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index cc8cde80aa4..7055d269e75 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008-2017  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.
  */
 
 /*! \file */
diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index 31eb332fd08..16434507743 100644
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2010, 2012, 2014, 2016, 2017  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.
  */
 
 /* $Id: tkeyconf.c,v 1.33 2010/12/20 23:47:20 tbox Exp $ */
diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index 7f58a8112e8..85a2bede605 100644
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2011, 2012, 2016, 2017  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.
  */
 
 /* $Id: tsigconf.c,v 1.35 2011/01/11 23:47:12 tbox Exp $ */
diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in
index 31da150253e..548aa37cf3c 100644
--- a/bin/named/unix/Makefile.in
+++ b/bin/named/unix/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2009, 2011, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.15 2011/03/10 23:47:49 tbox Exp $
 
diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 49db360d7a7..15e2afce87f 100644
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/bin/named/unix/include/named/os.h b/bin/named/unix/include/named/os.h
index 872d7b14572..5a32ed5aa8f 100644
--- a/bin/named/unix/include/named/os.h
+++ b/bin/named/unix/include/named/os.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007-2009, 2014, 2016, 2017  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.
  */
 
 #ifndef NAMED_OS_H
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index cfabc3a0c1b..d3b2b2215ec 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2011, 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.
  */
 
 /*! \file */
diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c
index 8f9a0051743..d1d0dc542c2 100644
--- a/bin/named/win32/dlz_dlopen_driver.c
+++ b/bin/named/win32/dlz_dlopen_driver.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2014, 2016  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.
  */
 
 /* $Id: dlz_dlopen_driver.c,v 1.5 2011/10/14 00:52:32 marka Exp $ */
diff --git a/bin/named/win32/include/named/ntservice.h b/bin/named/win32/include/named/ntservice.h
index ace05b43e4d..45890332933 100644
--- a/bin/named/win32/include/named/ntservice.h
+++ b/bin/named/win32/include/named/ntservice.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2004, 2007, 2016  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.
  */
 
 /* $Id: ntservice.h,v 1.6 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/named/win32/include/named/os.h b/bin/named/win32/include/named/os.h
index 1344ec0f99a..3995a138189 100644
--- a/bin/named/win32/include/named/os.h
+++ b/bin/named/win32/include/named/os.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2007-2009, 2014, 2016, 2017  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.
  */
 
 #ifndef NAMED_OS_H
diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c
index b0dd641054a..388eaab5308 100644
--- a/bin/named/win32/ntservice.c
+++ b/bin/named/win32/ntservice.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2006, 2007, 2009, 2011, 2013-2017  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.
  */
 
 /* $Id: ntservice.c,v 1.16 2011/01/13 08:50:29 tbox Exp $ */
diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index 450b01f1112..d7558894587 100644
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007-2009, 2012-2017  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.
  */
 
 #include <config.h>
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 93d3c5c1449..428266221f4 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 #include <config.h>
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 2342d36b88f..81cdb1c5fe4 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000-2002, 2004, 2006-2009, 2012-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 4b6be545e35..0243140b7d5 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 /*! \file */
diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index a74d99a0a31..56bce9f1442 100644
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000-2012, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -45,6 +48,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index f0fc37c8438..d33fc2094ac 100644
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/pkcs11/pkcs11-destroy.docbook b/bin/pkcs11/pkcs11-destroy.docbook
index f66bc75fcc6..8b862d68b8e 100644
--- a/bin/pkcs11/pkcs11-destroy.docbook
+++ b/bin/pkcs11/pkcs11-destroy.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -33,6 +36,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/pkcs11/pkcs11-keygen.docbook b/bin/pkcs11/pkcs11-keygen.docbook
index 784bdf0a605..fb8c7e2c73a 100644
--- a/bin/pkcs11/pkcs11-keygen.docbook
+++ b/bin/pkcs11/pkcs11-keygen.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -34,6 +37,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/pkcs11/pkcs11-list.c b/bin/pkcs11/pkcs11-list.c
index 05d24d9deef..bb9cec38431 100644
--- a/bin/pkcs11/pkcs11-list.c
+++ b/bin/pkcs11/pkcs11-list.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 /*
diff --git a/bin/pkcs11/pkcs11-list.docbook b/bin/pkcs11/pkcs11-list.docbook
index 570ef1f999f..3befcf49f65 100644
--- a/bin/pkcs11/pkcs11-list.docbook
+++ b/bin/pkcs11/pkcs11-list.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -33,6 +36,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/pkcs11/pkcs11-tokens.c b/bin/pkcs11/pkcs11-tokens.c
index 3ae354a32f0..ea1366690d6 100644
--- a/bin/pkcs11/pkcs11-tokens.c
+++ b/bin/pkcs11/pkcs11-tokens.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/pkcs11/pkcs11-tokens.docbook b/bin/pkcs11/pkcs11-tokens.docbook
index 93f4bbb9c65..d1170e6d39a 100644
--- a/bin/pkcs11/pkcs11-tokens.docbook
+++ b/bin/pkcs11/pkcs11-tokens.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -32,6 +35,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
index cfc7c7fe65f..aa678d47abb 100644
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2012-2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/python/dnssec-checkds.docbook b/bin/python/dnssec-checkds.docbook
index 069d6e99523..4b827dc559a 100644
--- a/bin/python/dnssec-checkds.docbook
+++ b/bin/python/dnssec-checkds.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2012-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -35,6 +38,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
index 615dcdb181a..ed5ac374889 100644
--- a/bin/python/dnssec-checkds.py.in
+++ b/bin/python/dnssec-checkds.py.in
@@ -1,10 +1,13 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2012-2017  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.
 ############################################################################
 
 import os
diff --git a/bin/python/dnssec-coverage.docbook b/bin/python/dnssec-coverage.docbook
index 7400d7e63f3..46f92117c0c 100644
--- a/bin/python/dnssec-coverage.docbook
+++ b/bin/python/dnssec-coverage.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2013-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -33,6 +36,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/python/dnssec-coverage.py.in b/bin/python/dnssec-coverage.py.in
index 8b7a93dc952..8518dc3b668 100644
--- a/bin/python/dnssec-coverage.py.in
+++ b/bin/python/dnssec-coverage.py.in
@@ -1,10 +1,13 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2013-2017  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.
 ############################################################################
 
 import os
diff --git a/bin/python/dnssec-keymgr.docbook b/bin/python/dnssec-keymgr.docbook
index bcfd264637a..1a42a75b873 100644
--- a/bin/python/dnssec-keymgr.docbook
+++ b/bin/python/dnssec-keymgr.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2016, 2017  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.
 -->
 
 <refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-keymgr">
@@ -30,6 +33,7 @@
     <copyright>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/python/dnssec-keymgr.py.in b/bin/python/dnssec-keymgr.py.in
index 561e41a981c..c8453a78a6f 100644
--- a/bin/python/dnssec-keymgr.py.in
+++ b/bin/python/dnssec-keymgr.py.in
@@ -1,10 +1,13 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2016, 2017  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.
 ############################################################################
 
 import os
diff --git a/bin/python/isc/Makefile.in b/bin/python/isc/Makefile.in
index 8d16273b41a..ec17b6bd45a 100644
--- a/bin/python/isc/Makefile.in
+++ b/bin/python/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/python/isc/__init__.py.in b/bin/python/isc/__init__.py.in
index dd10003b5da..916333c3f89 100644
--- a/bin/python/isc/__init__.py.in
+++ b/bin/python/isc/__init__.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 __all__ = ['checkds', 'coverage', 'keymgr', 'dnskey', 'eventlist',
diff --git a/bin/python/isc/checkds.py.in b/bin/python/isc/checkds.py.in
index de2d12bfe49..727acae255a 100644
--- a/bin/python/isc/checkds.py.in
+++ b/bin/python/isc/checkds.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2012-2017  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.
 ############################################################################
 
 import argparse
diff --git a/bin/python/isc/coverage.py.in b/bin/python/isc/coverage.py.in
index adecf8c2fb3..4e392a780ef 100644
--- a/bin/python/isc/coverage.py.in
+++ b/bin/python/isc/coverage.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2013-2017  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.
 ############################################################################
 
 from __future__ import print_function
diff --git a/bin/python/isc/dnskey.py.in b/bin/python/isc/dnskey.py.in
index 5c5e4a545b9..8c5a80f7c1b 100644
--- a/bin/python/isc/dnskey.py.in
+++ b/bin/python/isc/dnskey.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2013-2017  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.
 ############################################################################
 
 import os
diff --git a/bin/python/isc/eventlist.py.in b/bin/python/isc/eventlist.py.in
index 909305fcc18..5c1b31aebb9 100644
--- a/bin/python/isc/eventlist.py.in
+++ b/bin/python/isc/eventlist.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2015, 2016  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.
 ############################################################################
 
 from collections import defaultdict
diff --git a/bin/python/isc/keydict.py.in b/bin/python/isc/keydict.py.in
index 64d4783513d..578a8478885 100644
--- a/bin/python/isc/keydict.py.in
+++ b/bin/python/isc/keydict.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 from collections import defaultdict
diff --git a/bin/python/isc/keyevent.py.in b/bin/python/isc/keyevent.py.in
index edc6e0c326d..cfc935a643c 100644
--- a/bin/python/isc/keyevent.py.in
+++ b/bin/python/isc/keyevent.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2013-2016  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.
 ############################################################################
 
 import time
diff --git a/bin/python/isc/keymgr.py.in b/bin/python/isc/keymgr.py.in
index 98c003f8e26..c193daa48c8 100644
--- a/bin/python/isc/keymgr.py.in
+++ b/bin/python/isc/keymgr.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 from __future__ import print_function
diff --git a/bin/python/isc/keyseries.py.in b/bin/python/isc/keyseries.py.in
index 09fc3377178..e1241f00710 100644
--- a/bin/python/isc/keyseries.py.in
+++ b/bin/python/isc/keyseries.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 from collections import defaultdict
diff --git a/bin/python/isc/keyzone.py.in b/bin/python/isc/keyzone.py.in
index 40ca2abe1d9..2451d439e4b 100644
--- a/bin/python/isc/keyzone.py.in
+++ b/bin/python/isc/keyzone.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2013-2016  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.
 ############################################################################
 
 import os
diff --git a/bin/python/isc/policy.py.in b/bin/python/isc/policy.py.in
index 2c6fbd6a7b9..fd6cdf85bc2 100644
--- a/bin/python/isc/policy.py.in
+++ b/bin/python/isc/policy.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016, 2017  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.
 ############################################################################
 
 import re
diff --git a/bin/python/isc/rndc.py.in b/bin/python/isc/rndc.py.in
index 78d18c4db3b..e1a3e77761d 100644
--- a/bin/python/isc/rndc.py.in
+++ b/bin/python/isc/rndc.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 ############################################################################
diff --git a/bin/python/isc/tests/Makefile.in b/bin/python/isc/tests/Makefile.in
index e5aeef48fec..60b9bd77c8e 100644
--- a/bin/python/isc/tests/Makefile.in
+++ b/bin/python/isc/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/python/isc/tests/dnskey_test.py.in b/bin/python/isc/tests/dnskey_test.py.in
index 18cc24de315..91d52452a00 100644
--- a/bin/python/isc/tests/dnskey_test.py.in
+++ b/bin/python/isc/tests/dnskey_test.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 import sys
diff --git a/bin/python/isc/tests/policy_test.py.in b/bin/python/isc/tests/policy_test.py.in
index 7bd93e6622e..b09c62f8aac 100644
--- a/bin/python/isc/tests/policy_test.py.in
+++ b/bin/python/isc/tests/policy_test.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016, 2017  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.
 ############################################################################
 
 import sys
diff --git a/bin/python/isc/tests/test-policies/01-keysize.pol b/bin/python/isc/tests/test-policies/01-keysize.pol
index 2439aa72343..8b62c5fd44f 100644
--- a/bin/python/isc/tests/test-policies/01-keysize.pol
+++ b/bin/python/isc/tests/test-policies/01-keysize.pol
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 policy keysize_rsa {
diff --git a/bin/python/isc/tests/test-policies/02-prepublish.pol b/bin/python/isc/tests/test-policies/02-prepublish.pol
index 10c692cd013..bd3538660fb 100644
--- a/bin/python/isc/tests/test-policies/02-prepublish.pol
+++ b/bin/python/isc/tests/test-policies/02-prepublish.pol
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 policy prepublish_rsa {
diff --git a/bin/python/isc/tests/test-policies/03-postpublish.pol b/bin/python/isc/tests/test-policies/03-postpublish.pol
index 3cfe6131bc3..4d4a8efa3ef 100644
--- a/bin/python/isc/tests/test-policies/03-postpublish.pol
+++ b/bin/python/isc/tests/test-policies/03-postpublish.pol
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 policy postpublish_rsa {
diff --git a/bin/python/isc/tests/test-policies/04-combined-pre-post.pol b/bin/python/isc/tests/test-policies/04-combined-pre-post.pol
index b4c34a05b27..d612d816f45 100644
--- a/bin/python/isc/tests/test-policies/04-combined-pre-post.pol
+++ b/bin/python/isc/tests/test-policies/04-combined-pre-post.pol
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 policy combined_pre_post_rsa {
diff --git a/bin/python/isc/tests/test-policies/05-numeric-zone.pol b/bin/python/isc/tests/test-policies/05-numeric-zone.pol
index 995cf3118dd..1db8c08a1b8 100644
--- a/bin/python/isc/tests/test-policies/05-numeric-zone.pol
+++ b/bin/python/isc/tests/test-policies/05-numeric-zone.pol
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 // Zone policy that uses a numeric name
diff --git a/bin/python/isc/utils.py.in b/bin/python/isc/utils.py.in
index 777764276dd..0241871960d 100644
--- a/bin/python/isc/utils.py.in
+++ b/bin/python/isc/utils.py.in
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 import os
diff --git a/bin/python/setup.py b/bin/python/setup.py
index e71afd9cd8b..d7bdfb08fe0 100644
--- a/bin/python/setup.py
+++ b/bin/python/setup.py
@@ -1,9 +1,12 @@
 ############################################################################
-# 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.
 ############################################################################
 
 from distutils.core import setup
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 67c27dad8c0..ba68e781f84 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000-2002, 2004, 2007, 2009, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/rndc/include/rndc/os.h b/bin/rndc/include/rndc/os.h
index bec3c326c40..a7ace0cb448 100644
--- a/bin/rndc/include/rndc/os.h
+++ b/bin/rndc/include/rndc/os.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2009, 2016  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.
  */
 
 /* $Id: os.h,v 1.12 2009/06/10 00:27:21 each Exp $ */
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index e73f9c21eaa..9590c6cf311 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 /*! \file */
diff --git a/bin/rndc/rndc.conf b/bin/rndc/rndc.conf
index fbbb0ccd7ca..68003315f9a 100644
--- a/bin/rndc/rndc.conf
+++ b/bin/rndc/rndc.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2014, 2016  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.
  */
 
 /*
diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook
index 84284c73d5c..5c8890d3f0a 100644
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000, 2001, 2004, 2005, 2007, 2013-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -38,6 +41,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 0c88cfea66c..afda6f6e8ee 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000, 2001, 2004, 2005, 2007, 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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/bin/rndc/util.c b/bin/rndc/util.c
index 8b4b219ee44..f408c5b44fd 100644
--- a/bin/rndc/util.c
+++ b/bin/rndc/util.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 /* $Id: util.c,v 1.7 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/rndc/util.h b/bin/rndc/util.h
index d75b4236cf0..1049d3df595 100644
--- a/bin/rndc/util.h
+++ b/bin/rndc/util.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2016  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.
  */
 
 /* $Id: util.h,v 1.12 2009/09/29 23:48:03 tbox Exp $ */
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 28e54266b34..ffb5ef4a1f0 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/adb_test.c b/bin/tests/adb_test.c
index 9a56f6c342b..4f0b3b34ed7 100644
--- a/bin/tests/adb_test.c
+++ b/bin/tests/adb_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2011-2013, 2015, 2016  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.
  */
 
 /* $Id: adb_test.c,v 1.73 2011/08/30 23:46:51 tbox Exp $ */
diff --git a/bin/tests/atomic/Makefile.in b/bin/tests/atomic/Makefile.in
index 031d8eaa99c..932a77397dd 100644
--- a/bin/tests/atomic/Makefile.in
+++ b/bin/tests/atomic/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2011, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/atomic/t_atomic.c b/bin/tests/atomic/t_atomic.c
index 299ff0b259b..2e465039246 100644
--- a/bin/tests/atomic/t_atomic.c
+++ b/bin/tests/atomic/t_atomic.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2013, 2015-2017  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.
  */
 
 #include <config.h>
diff --git a/bin/tests/b8t.mk b/bin/tests/b8t.mk
index 49d909aa76e..9b1a88251b4 100644
--- a/bin/tests/b8t.mk
+++ b/bin/tests/b8t.mk
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: b8t.mk,v 1.11 2007/06/19 23:46:59 tbox Exp $
 
diff --git a/bin/tests/b9t.mk b/bin/tests/b9t.mk
index 45e1cbb5733..3bd2ae85d46 100644
--- a/bin/tests/b9t.mk
+++ b/bin/tests/b9t.mk
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: b9t.mk,v 1.13 2007/06/19 23:46:59 tbox Exp $
 
diff --git a/bin/tests/backtrace_test.c b/bin/tests/backtrace_test.c
index 0ff692079ae..f18d9ed1a68 100644
--- a/bin/tests/backtrace_test.c
+++ b/bin/tests/backtrace_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2013, 2015, 2016  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.
  */
 
 /* $Id: backtrace_test.c,v 1.4 2009/09/02 23:48:01 tbox Exp $ */
diff --git a/bin/tests/bigtest/README b/bin/tests/bigtest/README
index 127f5cdcdce..067771b1b18 100644
--- a/bin/tests/bigtest/README
+++ b/bin/tests/bigtest/README
@@ -1,9 +1,12 @@
-Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2013, 2016, 2018  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.
+
 	bash buildzones.sh < zones	# creates setup, run, servers/* master/*
 					# named.conf
 	sudo sh setup			# configure interfaces
diff --git a/bin/tests/bigtest/buildzones.sh b/bin/tests/bigtest/buildzones.sh
index f8ca0b0d8e1..f8d531a789f 100644
--- a/bin/tests/bigtest/buildzones.sh
+++ b/bin/tests/bigtest/buildzones.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 #
-# Copyright (C) 2013, 2016  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.
 
 SYSTEMTESTTOP=..
 . ../conf.sh
diff --git a/bin/tests/bigtest/tests.sh b/bin/tests/bigtest/tests.sh
index d2a2ab667a3..7b3bd8f04ee 100644
--- a/bin/tests/bigtest/tests.sh
+++ b/bin/tests/bigtest/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 #
-# Copyright (C) 2013, 2016  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.
 
 TOP=$( (cd ../../.. && pwd) )
 dig=${TOP}/bin/dig/dig
diff --git a/bin/tests/byaddr_test.c b/bin/tests/byaddr_test.c
index ee57c9be123..ba3ab02a7c0 100644
--- a/bin/tests/byaddr_test.c
+++ b/bin/tests/byaddr_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007, 2012, 2015, 2016  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.
  */
 
 /* $Id: byaddr_test.c,v 1.28 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c
index 91b56a0e86c..c5458a77abb 100644
--- a/bin/tests/byname_test.c
+++ b/bin/tests/byname_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2012, 2015-2017  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.
  */
 
 /* $Id: byname_test.c,v 1.33 2009/09/02 23:48:01 tbox Exp $ */
diff --git a/bin/tests/cfg_test.c b/bin/tests/cfg_test.c
index 07e466aa932..5cd7f65caf5 100644
--- a/bin/tests/cfg_test.c
+++ b/bin/tests/cfg_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2002, 2004, 2005, 2007, 2009-2011, 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.
  */
 
 /* $Id: cfg_test.c,v 1.25 2011/09/05 23:46:54 tbox Exp $ */
diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index 3fba772726b..3ec4b3542bf 100644
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2002, 2004, 2007, 2009, 2010, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c
index e7030ab5427..917fb902df0 100644
--- a/bin/tests/db/t_db.c
+++ b/bin/tests/db/t_db.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2011-2013, 2015-2017  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.
  */
 
 /* $Id: t_db.c,v 1.41 2011/03/12 04:59:46 tbox Exp $ */
diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c
index c7ed5c58178..f22cde5d640 100644
--- a/bin/tests/db_test.c
+++ b/bin/tests/db_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007-2009, 2011-2013, 2015-2017  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.
  */
 
 /* $Id: db_test.c,v 1.70 2011/08/29 23:46:44 tbox Exp $ */
diff --git a/bin/tests/dnssec-signzone/run-test.sh b/bin/tests/dnssec-signzone/run-test.sh
index fefad28c6a9..9a5d53e9081 100644
--- a/bin/tests/dnssec-signzone/run-test.sh
+++ b/bin/tests/dnssec-signzone/run-test.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2012, 2016  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.
 
 # $Id: run-test.sh,v 1.3 2009/06/04 02:56:47 tbox Exp $
 
diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index 794ca6623e1..c408d9a009e 100644
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2002, 2004, 2006-2010, 2012-2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c
index d499e986a51..867668b7912 100644
--- a/bin/tests/dst/dst_test.c
+++ b/bin/tests/dst/dst_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2012, 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.
  */
 
 /* $Id: dst_test.c,v 1.46 2009/09/01 00:22:25 jinmei Exp $ */
diff --git a/bin/tests/dst/gsstest.c b/bin/tests/dst/gsstest.c
index 6496b16b120..da6636b8028 100644
--- a/bin/tests/dst/gsstest.c
+++ b/bin/tests/dst/gsstest.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 2009-2011, 2013-2016  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.
  */
 
 /* $Id: gsstest.c,v 1.19 2011/11/30 00:48:51 marka Exp $ */
diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index 32595b1fdbf..b702e4c0827 100644
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007-2009, 2011-2014, 2016, 2017  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.
  */
 
 /* $Id: t_dst.c,v 1.60 2011/03/17 23:47:29 tbox Exp $ */
diff --git a/bin/tests/entropy2_test.c b/bin/tests/entropy2_test.c
index 1545506cd1c..b1208e3e0db 100644
--- a/bin/tests/entropy2_test.c
+++ b/bin/tests/entropy2_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 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.
  */
 
 /* $Id: entropy2_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/entropy_test.c b/bin/tests/entropy_test.c
index d89a38c4237..e2656403dfc 100644
--- a/bin/tests/entropy_test.c
+++ b/bin/tests/entropy_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 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.
  */
 
 /* $Id: entropy_test.c,v 1.23 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/fromhex.pl b/bin/tests/fromhex.pl
index c87e2c95484..ab8a74c1fe1 100644
--- a/bin/tests/fromhex.pl
+++ b/bin/tests/fromhex.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015, 2016  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.
 
 # Converts hex ascii into raw data.
 # (This can be used, for example, to construct input for "wire_data -d".)
diff --git a/bin/tests/fsaccess_test.c b/bin/tests/fsaccess_test.c
index 460f2a58cf6..d2bd4404535 100644
--- a/bin/tests/fsaccess_test.c
+++ b/bin/tests/fsaccess_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2012, 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.
  */
 
 /* $Id: fsaccess_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/hash_test.c b/bin/tests/hash_test.c
index bcf7fe5c16c..20d2dd3922b 100644
--- a/bin/tests/hash_test.c
+++ b/bin/tests/hash_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2014-2017  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.
  */
 
 /* $Id: hash_test.c,v 1.19 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/hashes/Makefile.in b/bin/tests/hashes/Makefile.in
index ce941d894fc..a1276ff7898 100644
--- a/bin/tests/hashes/Makefile.in
+++ b/bin/tests/hashes/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/hashes/t_hashes.c b/bin/tests/hashes/t_hashes.c
index bcedb6d1df5..279ccff0ad6 100644
--- a/bin/tests/hashes/t_hashes.c
+++ b/bin/tests/hashes/t_hashes.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2013, 2016  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.
  */
 
 /* $Id: t_hashes.c,v 1.5 2010/10/04 22:27:41 marka Exp $ */
diff --git a/bin/tests/headerdep_test.sh.in b/bin/tests/headerdep_test.sh.in
index 9c931aa05e5..73656122e9e 100644
--- a/bin/tests/headerdep_test.sh.in
+++ b/bin/tests/headerdep_test.sh.in
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: headerdep_test.sh.in,v 1.8 2007/06/19 23:46:59 tbox Exp $
 
diff --git a/bin/tests/inter_test.c b/bin/tests/inter_test.c
index 3caa2d2fe4f..42a4ec5b90d 100644
--- a/bin/tests/inter_test.c
+++ b/bin/tests/inter_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2008, 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.
  */
 
 /*! \file */
diff --git a/bin/tests/keyboard_test.c b/bin/tests/keyboard_test.c
index a4b924e6631..ab4be5ffac6 100644
--- a/bin/tests/keyboard_test.c
+++ b/bin/tests/keyboard_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 /* $Id: keyboard_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/lex_test.c b/bin/tests/lex_test.c
index 8891a836fb4..4c9221b0a24 100644
--- a/bin/tests/lex_test.c
+++ b/bin/tests/lex_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 /* $Id: lex_test.c,v 1.23 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/lfsr_test.c b/bin/tests/lfsr_test.c
index 93273e33e9a..adf28582657 100644
--- a/bin/tests/lfsr_test.c
+++ b/bin/tests/lfsr_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 /* $Id: lfsr_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/log_test.c b/bin/tests/log_test.c
index 2839439e972..93fb6b78e44 100644
--- a/bin/tests/log_test.c
+++ b/bin/tests/log_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2011, 2014-2016  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.
  */
 
 /* $Id: log_test.c,v 1.29 2011/08/28 23:46:51 marka Exp $ */
diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c
index 599db75b8a6..a8af02bcae1 100644
--- a/bin/tests/makejournal.c
+++ b/bin/tests/makejournal.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 /*! \file */
diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index 0a56d3998c3..4764a113e6c 100644
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2002, 2004, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c
index d912ac5faf6..96f1b40313a 100644
--- a/bin/tests/master/t_master.c
+++ b/bin/tests/master/t_master.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2011, 2013, 2016, 2017  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.
  */
 
 /* $Id: t_master.c,v 1.41 2011/03/12 04:59:46 tbox Exp $ */
diff --git a/bin/tests/master_test.c b/bin/tests/master_test.c
index a51b2b48b25..ae7c0a6518f 100644
--- a/bin/tests/master_test.c
+++ b/bin/tests/master_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2009, 2015-2017  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.
  */
 
 /* $Id: master_test.c,v 1.32 2009/09/02 23:48:01 tbox Exp $ */
diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in
index 3925cb4fd9a..cd83865005f 100644
--- a/bin/tests/mem/Makefile.in
+++ b/bin/tests/mem/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2002, 2004, 2005, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/mem/t_mem.c b/bin/tests/mem/t_mem.c
index c55d7ea2f9a..a6081aa2878 100644
--- a/bin/tests/mem/t_mem.c
+++ b/bin/tests/mem/t_mem.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2009, 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.
  */
 
 /* $Id: t_mem.c,v 1.15 2009/01/22 23:47:54 tbox Exp $ */
diff --git a/bin/tests/mempool_test.c b/bin/tests/mempool_test.c
index 39a5fbea3be..7074450f95a 100644
--- a/bin/tests/mempool_test.c
+++ b/bin/tests/mempool_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: mempool_test.c,v 1.17 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c
index 57081c19c1f..c9837418798 100644
--- a/bin/tests/name_test.c
+++ b/bin/tests/name_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 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.
  */
 
 #include <config.h>
diff --git a/bin/tests/named.conf b/bin/tests/named.conf
index e4d5b72677f..d4d32023241 100644
--- a/bin/tests/named.conf
+++ b/bin/tests/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2011, 2015, 2016  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.
  */
 
 /* $Id: named.conf,v 1.60 2011/03/03 23:47:31 tbox Exp $ */
diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index 6e75102584e..27fc124cdd3 100644
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2002, 2004, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index b22f5aea52c..59e396b36f3 100644
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2009, 2011-2016  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.
  */
 
 /* $Id: t_names.c,v 1.52 2011/03/12 04:59:46 tbox Exp $ */
diff --git a/bin/tests/ndc.conf b/bin/tests/ndc.conf
index b8c50ef712c..aa06c3eda3b 100644
--- a/bin/tests/ndc.conf
+++ b/bin/tests/ndc.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: ndc.conf,v 1.11 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/ndc.conf-include b/bin/tests/ndc.conf-include
index af65dddf36d..8884d75ffa2 100644
--- a/bin/tests/ndc.conf-include
+++ b/bin/tests/ndc.conf-include
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: ndc.conf-include,v 1.6 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in
index d8a68a55388..d34e1e62544 100644
--- a/bin/tests/net/Makefile.in
+++ b/bin/tests/net/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000-2002, 2004, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/net/driver.c b/bin/tests/net/driver.c
index 2d574bb0359..69ad6dd9a29 100644
--- a/bin/tests/net/driver.c
+++ b/bin/tests/net/driver.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2015-2017  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.
  */
 
 /* $Id: driver.c,v 1.11 2007/06/19 23:47:00 tbox Exp $ */
diff --git a/bin/tests/net/driver.h b/bin/tests/net/driver.h
index 33a531cde31..23c256b748d 100644
--- a/bin/tests/net/driver.h
+++ b/bin/tests/net/driver.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: driver.h,v 1.8 2007/06/19 23:47:00 tbox Exp $ */
diff --git a/bin/tests/net/netaddr_multicast.c b/bin/tests/net/netaddr_multicast.c
index 5303bb2e6a9..9fb21ec5fc6 100644
--- a/bin/tests/net/netaddr_multicast.c
+++ b/bin/tests/net/netaddr_multicast.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2015, 2016  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.
  */
 
 /* $Id: netaddr_multicast.c,v 1.12 2007/06/19 23:47:00 tbox Exp $ */
diff --git a/bin/tests/net/sockaddr_multicast.c b/bin/tests/net/sockaddr_multicast.c
index e6dff99deb7..de216e390a4 100644
--- a/bin/tests/net/sockaddr_multicast.c
+++ b/bin/tests/net/sockaddr_multicast.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: sockaddr_multicast.c,v 1.8 2007/06/19 23:47:00 tbox Exp $ */
diff --git a/bin/tests/net/testsuite.h b/bin/tests/net/testsuite.h
index 069276da225..cb06b19e4f1 100644
--- a/bin/tests/net/testsuite.h
+++ b/bin/tests/net/testsuite.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: testsuite.h,v 1.7 2007/06/19 23:47:00 tbox Exp $ */
diff --git a/bin/tests/nsecify.c b/bin/tests/nsecify.c
index c74c93b64f4..4b06d1e085b 100644
--- a/bin/tests/nsecify.c
+++ b/bin/tests/nsecify.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003, 2004, 2007-2009, 2011, 2015-2017  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.
  */
 
 /* $Id: nsecify.c,v 1.12 2011/08/29 23:46:44 tbox Exp $ */
diff --git a/bin/tests/pkcs11/Makefile.in b/bin/tests/pkcs11/Makefile.in
index d3412ca6a2c..73e05967050 100644
--- a/bin/tests/pkcs11/Makefile.in
+++ b/bin/tests/pkcs11/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/pkcs11/benchmarks/Makefile.in b/bin/tests/pkcs11/benchmarks/Makefile.in
index 921be88f272..15f5460044b 100644
--- a/bin/tests/pkcs11/benchmarks/Makefile.in
+++ b/bin/tests/pkcs11/benchmarks/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/pkcs11/benchmarks/create.c b/bin/tests/pkcs11/benchmarks/create.c
index 9ed9e920009..d704fa33995 100644
--- a/bin/tests/pkcs11/benchmarks/create.c
+++ b/bin/tests/pkcs11/benchmarks/create.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/find.c b/bin/tests/pkcs11/benchmarks/find.c
index 8205f091796..c1a6fea2ae3 100644
--- a/bin/tests/pkcs11/benchmarks/find.c
+++ b/bin/tests/pkcs11/benchmarks/find.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/genrsa.c b/bin/tests/pkcs11/benchmarks/genrsa.c
index 02024b6b889..8e1da3fa3c6 100644
--- a/bin/tests/pkcs11/benchmarks/genrsa.c
+++ b/bin/tests/pkcs11/benchmarks/genrsa.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/login.c b/bin/tests/pkcs11/benchmarks/login.c
index 0a2260153ce..e1170523ae0 100644
--- a/bin/tests/pkcs11/benchmarks/login.c
+++ b/bin/tests/pkcs11/benchmarks/login.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/privrsa.c b/bin/tests/pkcs11/benchmarks/privrsa.c
index 52427140357..ce8e21d36fe 100644
--- a/bin/tests/pkcs11/benchmarks/privrsa.c
+++ b/bin/tests/pkcs11/benchmarks/privrsa.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/pubrsa.c b/bin/tests/pkcs11/benchmarks/pubrsa.c
index 9de9b5f1ea7..64d85c26b0f 100644
--- a/bin/tests/pkcs11/benchmarks/pubrsa.c
+++ b/bin/tests/pkcs11/benchmarks/pubrsa.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/random.c b/bin/tests/pkcs11/benchmarks/random.c
index 87e3c3b5052..0638968eb5f 100644
--- a/bin/tests/pkcs11/benchmarks/random.c
+++ b/bin/tests/pkcs11/benchmarks/random.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/session.c b/bin/tests/pkcs11/benchmarks/session.c
index ea15854fd54..c8e1f484f0d 100644
--- a/bin/tests/pkcs11/benchmarks/session.c
+++ b/bin/tests/pkcs11/benchmarks/session.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/sha1.c b/bin/tests/pkcs11/benchmarks/sha1.c
index 19040632f3b..0c206743d9a 100644
--- a/bin/tests/pkcs11/benchmarks/sha1.c
+++ b/bin/tests/pkcs11/benchmarks/sha1.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/sign.c b/bin/tests/pkcs11/benchmarks/sign.c
index 00779f83c66..ace18e34dac 100644
--- a/bin/tests/pkcs11/benchmarks/sign.c
+++ b/bin/tests/pkcs11/benchmarks/sign.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/benchmarks/verify.c b/bin/tests/pkcs11/benchmarks/verify.c
index 40192caae5d..38c71965720 100644
--- a/bin/tests/pkcs11/benchmarks/verify.c
+++ b/bin/tests/pkcs11/benchmarks/verify.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/pkcs11-hmacmd5.c b/bin/tests/pkcs11/pkcs11-hmacmd5.c
index 9cbac452546..3673fac0fb2 100644
--- a/bin/tests/pkcs11/pkcs11-hmacmd5.c
+++ b/bin/tests/pkcs11/pkcs11-hmacmd5.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/pkcs11/pkcs11-md5sum.c b/bin/tests/pkcs11/pkcs11-md5sum.c
index 7fbdb2623e7..425ded0dacd 100644
--- a/bin/tests/pkcs11/pkcs11-md5sum.c
+++ b/bin/tests/pkcs11/pkcs11-md5sum.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*
diff --git a/bin/tests/ratelimiter_test.c b/bin/tests/ratelimiter_test.c
index ebf59d04958..5fa5ed55dca 100644
--- a/bin/tests/ratelimiter_test.c
+++ b/bin/tests/ratelimiter_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2015, 2016  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.
  */
 
 /* $Id: ratelimiter_test.c,v 1.18 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index c3defd9b7f0..3322da3a17c 100644
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2002, 2004, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index 5acae8173d0..7398914b42b 100644
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2011-2013, 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.
  */
 
 /* $Id: t_rbt.c,v 1.35 2011/03/12 04:59:46 tbox Exp $ */
diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c
index f536c9fe47e..4bec961b18a 100644
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/rbt_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2011, 2012, 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.
  */
 
 /* $Id: rbt_test.c,v 1.52 2011/08/28 23:46:41 tbox Exp $ */
diff --git a/bin/tests/rbt_test.txt b/bin/tests/rbt_test.txt
index 2792c9f4b1e..2acee1ee6cd 100644
--- a/bin/tests/rbt_test.txt
+++ b/bin/tests/rbt_test.txt
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: rbt_test.txt,v 1.17 2007/06/19 23:46:59 tbox Exp $
 
diff --git a/bin/tests/resolv.conf.sample b/bin/tests/resolv.conf.sample
index 17f5819559c..35b210a2934 100644
--- a/bin/tests/resolv.conf.sample
+++ b/bin/tests/resolv.conf.sample
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: resolv.conf.sample,v 1.11 2007/06/19 23:46:59 tbox Exp $
 
diff --git a/bin/tests/resolver/Makefile.in b/bin/tests/resolver/Makefile.in
index 67d36a9c6df..e29b0df7151 100644
--- a/bin/tests/resolver/Makefile.in
+++ b/bin/tests/resolver/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2011, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/resolver/t_resolver.c b/bin/tests/resolver/t_resolver.c
index a1fab5dfd42..738b7203df5 100644
--- a/bin/tests/resolver/t_resolver.c
+++ b/bin/tests/resolver/t_resolver.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2014, 2016  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.
  */
 
 /* $Id: t_resolver.c,v 1.3 2011/02/03 12:18:11 tbox Exp $ */
diff --git a/bin/tests/rwlock_test.c b/bin/tests/rwlock_test.c
index 8cf7c708ea7..a3178908a35 100644
--- a/bin/tests/rwlock_test.c
+++ b/bin/tests/rwlock_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 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.
  */
 
 /* $Id: rwlock_test.c,v 1.26 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/serial_test.c b/bin/tests/serial_test.c
index d29bbe93943..61b31c8b416 100644
--- a/bin/tests/serial_test.c
+++ b/bin/tests/serial_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003, 2004, 2007, 2015, 2016  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.
  */
 
 /* $Id: serial_test.c,v 1.15 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c
index 923aac02303..f4f041197f6 100644
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/shutdown_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2011, 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.
  */
 
 /* $Id: shutdown_test.c,v 1.25 2011/08/28 23:46:41 tbox Exp $ */
diff --git a/bin/tests/sig0_test.c b/bin/tests/sig0_test.c
index 886b6e9fa1c..343f023a608 100644
--- a/bin/tests/sig0_test.c
+++ b/bin/tests/sig0_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2012, 2015, 2016  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.
  */
 
 /* $Id: sig0_test.c,v 1.19 2009/09/02 23:48:01 tbox Exp $ */
diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index 1846eb2139b..22c4ee7bf06 100644
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2008, 2012-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.
  */
 
 /* $Id: sock_test.c,v 1.55 2008/07/23 23:27:54 marka Exp $ */
diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in
index be1688c51c1..6a1dba16c10 100644
--- a/bin/tests/sockaddr/Makefile.in
+++ b/bin/tests/sockaddr/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2002, 2004, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/sockaddr/t_sockaddr.c b/bin/tests/sockaddr/t_sockaddr.c
index 95e8bfe6d20..cf1934cf554 100644
--- a/bin/tests/sockaddr/t_sockaddr.c
+++ b/bin/tests/sockaddr/t_sockaddr.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2013, 2016  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.
  */
 
 /* $Id: t_sockaddr.c,v 1.14 2007/06/19 23:47:00 tbox Exp $ */
diff --git a/bin/tests/startperf/clean.sh b/bin/tests/startperf/clean.sh
index 491474d0645..d6997d2fd47 100644
--- a/bin/tests/startperf/clean.sh
+++ b/bin/tests/startperf/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2016  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.
 
 # $Id: clean.sh,v 1.3 2011/09/02 23:46:31 tbox Exp $
 
diff --git a/bin/tests/startperf/makenames.pl b/bin/tests/startperf/makenames.pl
index 617aec5a9d3..d5442d48737 100644
--- a/bin/tests/startperf/makenames.pl
+++ b/bin/tests/startperf/makenames.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2016  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.
 
 # $Id: makenames.pl,v 1.3 2011/09/02 21:15:35 each Exp $
 use strict;
diff --git a/bin/tests/startperf/mkzonefile.pl b/bin/tests/startperf/mkzonefile.pl
index 43c41a1e5f1..9d33d223c00 100644
--- a/bin/tests/startperf/mkzonefile.pl
+++ b/bin/tests/startperf/mkzonefile.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2016  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.
 
 # $Id: mkzonefile.pl,v 1.2 2011/09/02 21:15:35 each Exp $
 use strict;
diff --git a/bin/tests/startperf/setup.sh b/bin/tests/startperf/setup.sh
index 44a5db58bc0..6fe10ed9eea 100644
--- a/bin/tests/startperf/setup.sh
+++ b/bin/tests/startperf/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2016  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.
 
 # $Id: setup.sh,v 1.4 2011/09/02 21:15:35 each Exp $
 
diff --git a/bin/tests/startperf/smallzone.db b/bin/tests/startperf/smallzone.db
index 427df4b02c0..9a87b360cdc 100644
--- a/bin/tests/startperf/smallzone.db
+++ b/bin/tests/startperf/smallzone.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: smallzone.db,v 1.3 2011/07/07 23:47:49 tbox Exp $
 
diff --git a/bin/tests/sym_test.c b/bin/tests/sym_test.c
index be85151c737..6ff95d8bba2 100644
--- a/bin/tests/sym_test.c
+++ b/bin/tests/sym_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 /* $Id: sym_test.c,v 1.28 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index f24568640bd..1b7ff31dd7a 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010-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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/README b/bin/tests/system/README
index ddd39509cb8..4bf6719d442 100644
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -4,6 +4,9 @@ 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.
+
 Introduction
 ===
 This directory holds a simple test environment for running bind9 system tests
diff --git a/bin/tests/system/acl/clean.sh b/bin/tests/system/acl/clean.sh
index bfe1b8151bc..75acebacaee 100644
--- a/bin/tests/system/acl/clean.sh
+++ b/bin/tests/system/acl/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 2014-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.
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
index 6d8e201c551..0ea65027086 100644
--- a/bin/tests/system/acl/ns2/named1.conf.in
+++ b/bin/tests/system/acl/ns2/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in
index 51a10047f35..b8778805542 100644
--- a/bin/tests/system/acl/ns2/named2.conf.in
+++ b/bin/tests/system/acl/ns2/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in
index ee63a59c28c..0a950622a2b 100644
--- a/bin/tests/system/acl/ns2/named3.conf.in
+++ b/bin/tests/system/acl/ns2/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in
index 42f585fc21a..7cdcb6e3415 100644
--- a/bin/tests/system/acl/ns2/named4.conf.in
+++ b/bin/tests/system/acl/ns2/named4.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
index 3a3a3ace9f7..4b4e05027aa 100644
--- a/bin/tests/system/acl/ns2/named5.conf.in
+++ b/bin/tests/system/acl/ns2/named5.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/acl/ns2/named6.conf.in b/bin/tests/system/acl/ns2/named6.conf.in
index a61e1df001a..805942dbae4 100644
--- a/bin/tests/system/acl/ns2/named6.conf.in
+++ b/bin/tests/system/acl/ns2/named6.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/acl/ns2/named7.conf.in b/bin/tests/system/acl/ns2/named7.conf.in
index 4b9209651c6..5dde6580c64 100644
--- a/bin/tests/system/acl/ns2/named7.conf.in
+++ b/bin/tests/system/acl/ns2/named7.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/acl/ns3/example.db b/bin/tests/system/acl/ns3/example.db
index 6ce4cc6af32..ae1ceabee90 100644
--- a/bin/tests/system/acl/ns3/example.db
+++ b/bin/tests/system/acl/ns3/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	ns root (
diff --git a/bin/tests/system/acl/ns3/named.conf.in b/bin/tests/system/acl/ns3/named.conf.in
index 6b570d244d2..760c2bc8ff5 100644
--- a/bin/tests/system/acl/ns3/named.conf.in
+++ b/bin/tests/system/acl/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/acl/ns4/example.db b/bin/tests/system/acl/ns4/example.db
index cb4d2f10476..f5e178d5ab5 100644
--- a/bin/tests/system/acl/ns4/example.db
+++ b/bin/tests/system/acl/ns4/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	ns root (
diff --git a/bin/tests/system/acl/ns4/existing.db b/bin/tests/system/acl/ns4/existing.db
index cb4d2f10476..f5e178d5ab5 100644
--- a/bin/tests/system/acl/ns4/existing.db
+++ b/bin/tests/system/acl/ns4/existing.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	ns root (
diff --git a/bin/tests/system/acl/ns4/named.conf.in b/bin/tests/system/acl/ns4/named.conf.in
index 35644519a82..17cef4a7ec9 100644
--- a/bin/tests/system/acl/ns4/named.conf.in
+++ b/bin/tests/system/acl/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh
index a2fefffa4f0..e410e03df21 100644
--- a/bin/tests/system/acl/setup.sh
+++ b/bin/tests/system/acl/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index de462f2a80e..09f31f2bb9b 100644
--- a/bin/tests/system/acl/tests.sh
+++ b/bin/tests/system/acl/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/additional/clean.sh b/bin/tests/system/additional/clean.sh
index 1803deb5f3a..03e55cd3331 100644
--- a/bin/tests/system/additional/clean.sh
+++ b/bin/tests/system/additional/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 #
 # Clean up after tests.
diff --git a/bin/tests/system/additional/ns1/mx.db b/bin/tests/system/additional/ns1/mx.db
index f4aa03553ad..32a2b87ba7f 100644
--- a/bin/tests/system/additional/ns1/mx.db
+++ b/bin/tests/system/additional/ns1/mx.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 86400
 @	IN	SOA	ns1 hostmaster ( 2 8H 2H 4W 1D );
diff --git a/bin/tests/system/additional/ns1/named1.conf.in b/bin/tests/system/additional/ns1/named1.conf.in
index 7265f643e94..3ab05a3458a 100644
--- a/bin/tests/system/additional/ns1/named1.conf.in
+++ b/bin/tests/system/additional/ns1/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/additional/ns1/named2.conf.in b/bin/tests/system/additional/ns1/named2.conf.in
index 18fc79c2060..5b053d841ad 100644
--- a/bin/tests/system/additional/ns1/named2.conf.in
+++ b/bin/tests/system/additional/ns1/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/additional/ns1/named3.conf.in b/bin/tests/system/additional/ns1/named3.conf.in
index 3c60213d69b..7c2e05c42ee 100644
--- a/bin/tests/system/additional/ns1/named3.conf.in
+++ b/bin/tests/system/additional/ns1/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/additional/ns1/named4.conf.in b/bin/tests/system/additional/ns1/named4.conf.in
index 935ede55c6e..7ba958aca5e 100644
--- a/bin/tests/system/additional/ns1/named4.conf.in
+++ b/bin/tests/system/additional/ns1/named4.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/additional/ns1/naptr.db b/bin/tests/system/additional/ns1/naptr.db
index fc41481ca76..d604a3ac236 100644
--- a/bin/tests/system/additional/ns1/naptr.db
+++ b/bin/tests/system/additional/ns1/naptr.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 86400
 @ IN SOA ns1 hostmaster ( 2 8H 2H 4W 1D );
diff --git a/bin/tests/system/additional/ns1/naptr2.db b/bin/tests/system/additional/ns1/naptr2.db
index f9ee5531407..090e9b62411 100644
--- a/bin/tests/system/additional/ns1/naptr2.db
+++ b/bin/tests/system/additional/ns1/naptr2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 86400
 @ IN SOA ns1 hostmaster ( 2 8H 2H 4W 1D );
diff --git a/bin/tests/system/additional/ns1/nid.db b/bin/tests/system/additional/ns1/nid.db
index 81bf9ccad04..70e4dc839cb 100644
--- a/bin/tests/system/additional/ns1/nid.db
+++ b/bin/tests/system/additional/ns1/nid.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 86400
 @ IN SOA ns1 hostmaster ( 2 8H 2H 4W 1D );
diff --git a/bin/tests/system/additional/ns1/rt.db b/bin/tests/system/additional/ns1/rt.db
index 3a29854d023..57ee400ec31 100644
--- a/bin/tests/system/additional/ns1/rt.db
+++ b/bin/tests/system/additional/ns1/rt.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 86400
 @ IN SOA ns1 hostmaster ( 2 8H 2H 4W 1D );
diff --git a/bin/tests/system/additional/ns1/rt2.db b/bin/tests/system/additional/ns1/rt2.db
index 7303e36962f..73cb9f30d63 100644
--- a/bin/tests/system/additional/ns1/rt2.db
+++ b/bin/tests/system/additional/ns1/rt2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 86400
 @ IN SOA ns1 hostmaster ( 2 8H 2H 4W 1D );
diff --git a/bin/tests/system/additional/ns1/srv.db b/bin/tests/system/additional/ns1/srv.db
index 39901d9c76b..bc8d58190bc 100644
--- a/bin/tests/system/additional/ns1/srv.db
+++ b/bin/tests/system/additional/ns1/srv.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 86400
 @	IN	SOA	ns1 hostmaster ( 2 8H 2H 4W 1D );
diff --git a/bin/tests/system/additional/ns3/named.conf.in b/bin/tests/system/additional/ns3/named.conf.in
index ba620a96fc5..f01bd47b737 100644
--- a/bin/tests/system/additional/ns3/named.conf.in
+++ b/bin/tests/system/additional/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 controls { /* empty */ };
diff --git a/bin/tests/system/additional/ns3/root.hint b/bin/tests/system/additional/ns3/root.hint
index a871ab2bb41..c1784c7ee88 100644
--- a/bin/tests/system/additional/ns3/root.hint
+++ b/bin/tests/system/additional/ns3/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 . NS ns1.
 ns1. A 10.53.0.1
diff --git a/bin/tests/system/additional/setup.sh b/bin/tests/system/additional/setup.sh
index bf8f201087f..417a8b872f1 100644
--- a/bin/tests/system/additional/setup.sh
+++ b/bin/tests/system/additional/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 887250a19e3..692af541ff3 100644
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index 6666af6acd7..40f9609023b 100644
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-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.
 
 rm -f dig.out.*
 rm -f rndc.out*
diff --git a/bin/tests/system/addzone/ns1/inlineslave.db b/bin/tests/system/addzone/ns1/inlineslave.db
index 14ad88ce096..625349ec4d9 100644
--- a/bin/tests/system/addzone/ns1/inlineslave.db
+++ b/bin/tests/system/addzone/ns1/inlineslave.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $ORIGIN inlineslave.example.
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/addzone/ns1/named.conf.in b/bin/tests/system/addzone/ns1/named.conf.in
index 6af9862720b..3939091de8c 100644
--- a/bin/tests/system/addzone/ns1/named.conf.in
+++ b/bin/tests/system/addzone/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/addzone/ns1/redirect.db.1 b/bin/tests/system/addzone/ns1/redirect.db.1
index be6241ddc96..7b40db9c33e 100644
--- a/bin/tests/system/addzone/ns1/redirect.db.1
+++ b/bin/tests/system/addzone/ns1/redirect.db.1
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	0	SOA	. . 0 0 0 0 0
 @	0	NS	.
diff --git a/bin/tests/system/addzone/ns1/redirect.db.2 b/bin/tests/system/addzone/ns1/redirect.db.2
index 9b25a534e1d..a4f0d3806c1 100644
--- a/bin/tests/system/addzone/ns1/redirect.db.2
+++ b/bin/tests/system/addzone/ns1/redirect.db.2
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	0	SOA	. . 1 0 0 0 0
 @	0	NS	.
diff --git a/bin/tests/system/addzone/ns2/added.db b/bin/tests/system/addzone/ns2/added.db
index 55bf1709338..56e0d7f2f37 100644
--- a/bin/tests/system/addzone/ns2/added.db
+++ b/bin/tests/system/addzone/ns2/added.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2013, 2016  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.
 
 ; $Id: added.db,v 1.2 2010/08/11 18:14:18 each Exp $
 
diff --git a/bin/tests/system/addzone/ns2/hints.db b/bin/tests/system/addzone/ns2/hints.db
index 5f952ab8fa5..7f5cc13dbb6 100644
--- a/bin/tests/system/addzone/ns2/hints.db
+++ b/bin/tests/system/addzone/ns2/hints.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 ; $Id: root.hint,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/addzone/ns2/inline.db b/bin/tests/system/addzone/ns2/inline.db
index 8e2912994d5..a45d30e0b15 100644
--- a/bin/tests/system/addzone/ns2/inline.db
+++ b/bin/tests/system/addzone/ns2/inline.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $ORIGIN inline.example.
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/addzone/ns2/named1.conf.in b/bin/tests/system/addzone/ns2/named1.conf.in
index c22270c07d0..47a3cc99695 100644
--- a/bin/tests/system/addzone/ns2/named1.conf.in
+++ b/bin/tests/system/addzone/ns2/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/addzone/ns2/named2.conf.in b/bin/tests/system/addzone/ns2/named2.conf.in
index 797e5d98d0e..c063d425f0c 100644
--- a/bin/tests/system/addzone/ns2/named2.conf.in
+++ b/bin/tests/system/addzone/ns2/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/addzone/ns2/named3.conf.in b/bin/tests/system/addzone/ns2/named3.conf.in
index 75a3a5a71bd..4afb0a783f6 100644
--- a/bin/tests/system/addzone/ns2/named3.conf.in
+++ b/bin/tests/system/addzone/ns2/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/addzone/ns2/normal.db b/bin/tests/system/addzone/ns2/normal.db
index 268d849acfe..7f3e17193dc 100644
--- a/bin/tests/system/addzone/ns2/normal.db
+++ b/bin/tests/system/addzone/ns2/normal.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: normal.db,v 1.2 2010/08/11 18:14:19 each Exp $
 
diff --git a/bin/tests/system/addzone/ns2/previous.db b/bin/tests/system/addzone/ns2/previous.db
index 40f3e1c4462..8f34292f325 100644
--- a/bin/tests/system/addzone/ns2/previous.db
+++ b/bin/tests/system/addzone/ns2/previous.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: previous.db,v 1.2 2010/08/11 18:14:19 each Exp $
 
diff --git a/bin/tests/system/addzone/ns2/redirect.db.1 b/bin/tests/system/addzone/ns2/redirect.db.1
index 2016ae3c50e..7b40db9c33e 100644
--- a/bin/tests/system/addzone/ns2/redirect.db.1
+++ b/bin/tests/system/addzone/ns2/redirect.db.1
@@ -1,8 +1,11 @@
-; Copyright (C) 2016, 2017  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.
 
 @	0	SOA	. . 0 0 0 0 0
 @	0	NS	.
diff --git a/bin/tests/system/addzone/ns2/redirect.db.2 b/bin/tests/system/addzone/ns2/redirect.db.2
index f81bb6bb3d4..a4f0d3806c1 100644
--- a/bin/tests/system/addzone/ns2/redirect.db.2
+++ b/bin/tests/system/addzone/ns2/redirect.db.2
@@ -1,8 +1,11 @@
-; Copyright (C) 2016, 2017  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.
 
 @	0	SOA	. . 1 0 0 0 0
 @	0	NS	.
diff --git a/bin/tests/system/addzone/ns3/e.db b/bin/tests/system/addzone/ns3/e.db
index 44c8d993999..d5f7ff9c25a 100644
--- a/bin/tests/system/addzone/ns3/e.db
+++ b/bin/tests/system/addzone/ns3/e.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	SOA	ns3 hostmaster 0 0 0 0 0
 @	NS	ns3
diff --git a/bin/tests/system/addzone/ns3/named1.conf.in b/bin/tests/system/addzone/ns3/named1.conf.in
index b78d305c61e..d802506f218 100644
--- a/bin/tests/system/addzone/ns3/named1.conf.in
+++ b/bin/tests/system/addzone/ns3/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/addzone/ns3/named2.conf.in b/bin/tests/system/addzone/ns3/named2.conf.in
index acf7f0ae47d..5aa682fb388 100644
--- a/bin/tests/system/addzone/ns3/named2.conf.in
+++ b/bin/tests/system/addzone/ns3/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/addzone/ns3/redirect.db.1 b/bin/tests/system/addzone/ns3/redirect.db.1
index 05301e7fd8a..6444bad4d4c 100644
--- a/bin/tests/system/addzone/ns3/redirect.db.1
+++ b/bin/tests/system/addzone/ns3/redirect.db.1
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	0	SOA	. . 0 0 0 0 0
 @	0	NS	.
diff --git a/bin/tests/system/addzone/ns3/redirect.db.2 b/bin/tests/system/addzone/ns3/redirect.db.2
index 1fd4debef68..aa98885563f 100644
--- a/bin/tests/system/addzone/ns3/redirect.db.2
+++ b/bin/tests/system/addzone/ns3/redirect.db.2
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	0	SOA	. . 1 0 0 0 0
 @	0	NS	.
diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index 98632c2e652..89134db4cb4 100644
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index c1d63d13feb..d9b376e853f 100755
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/allow_query/clean.sh b/bin/tests/system/allow_query/clean.sh
index 1675d52581d..33f9894d77d 100644
--- a/bin/tests/system/allow_query/clean.sh
+++ b/bin/tests/system/allow_query/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 #
 # Clean up after allow query tests.
diff --git a/bin/tests/system/allow_query/ns2/aclallow.db b/bin/tests/system/allow_query/ns2/aclallow.db
index c389f8bb281..21e9f07dfcc 100644
--- a/bin/tests/system/allow_query/ns2/aclallow.db
+++ b/bin/tests/system/allow_query/ns2/aclallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: aclallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/acldisallow.db b/bin/tests/system/allow_query/ns2/acldisallow.db
index eeb956f2208..b831346a413 100644
--- a/bin/tests/system/allow_query/ns2/acldisallow.db
+++ b/bin/tests/system/allow_query/ns2/acldisallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: acldisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/aclnotallow.db b/bin/tests/system/allow_query/ns2/aclnotallow.db
index 4cc4eef76de..0d6792dac48 100644
--- a/bin/tests/system/allow_query/ns2/aclnotallow.db
+++ b/bin/tests/system/allow_query/ns2/aclnotallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: aclnotallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/added.db b/bin/tests/system/allow_query/ns2/added.db
index 24ba37fba49..29773c5f403 100644
--- a/bin/tests/system/allow_query/ns2/added.db
+++ b/bin/tests/system/allow_query/ns2/added.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: added.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/addrallow.db b/bin/tests/system/allow_query/ns2/addrallow.db
index a7e6785a463..5532b23c518 100644
--- a/bin/tests/system/allow_query/ns2/addrallow.db
+++ b/bin/tests/system/allow_query/ns2/addrallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: addrallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/addrdisallow.db b/bin/tests/system/allow_query/ns2/addrdisallow.db
index 490cf765fc9..585acb72300 100644
--- a/bin/tests/system/allow_query/ns2/addrdisallow.db
+++ b/bin/tests/system/allow_query/ns2/addrdisallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: addrdisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/addrnotallow.db b/bin/tests/system/allow_query/ns2/addrnotallow.db
index b9401a3a060..31a6acc7096 100644
--- a/bin/tests/system/allow_query/ns2/addrnotallow.db
+++ b/bin/tests/system/allow_query/ns2/addrnotallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: addrnotallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/any.db b/bin/tests/system/allow_query/ns2/any.db
index 82063ba6761..f9d5a554e92 100644
--- a/bin/tests/system/allow_query/ns2/any.db
+++ b/bin/tests/system/allow_query/ns2/any.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: any.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/keyallow.db b/bin/tests/system/allow_query/ns2/keyallow.db
index fd4f07503fd..298d84feafa 100644
--- a/bin/tests/system/allow_query/ns2/keyallow.db
+++ b/bin/tests/system/allow_query/ns2/keyallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: keyallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/keydisallow.db b/bin/tests/system/allow_query/ns2/keydisallow.db
index b45eba7fc77..698d60bb7a5 100644
--- a/bin/tests/system/allow_query/ns2/keydisallow.db
+++ b/bin/tests/system/allow_query/ns2/keydisallow.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: keydisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/named01.conf.in b/bin/tests/system/allow_query/ns2/named01.conf.in
index 05412714697..f39281cd4c9 100644
--- a/bin/tests/system/allow_query/ns2/named01.conf.in
+++ b/bin/tests/system/allow_query/ns2/named01.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named02.conf.in b/bin/tests/system/allow_query/ns2/named02.conf.in
index a78e76d8ddd..efdc494b9fa 100644
--- a/bin/tests/system/allow_query/ns2/named02.conf.in
+++ b/bin/tests/system/allow_query/ns2/named02.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named03.conf.in b/bin/tests/system/allow_query/ns2/named03.conf.in
index 08ee3a297ec..ff0fb71409a 100644
--- a/bin/tests/system/allow_query/ns2/named03.conf.in
+++ b/bin/tests/system/allow_query/ns2/named03.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named04.conf.in b/bin/tests/system/allow_query/ns2/named04.conf.in
index 01dee4181f8..5d77e660160 100644
--- a/bin/tests/system/allow_query/ns2/named04.conf.in
+++ b/bin/tests/system/allow_query/ns2/named04.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named05.conf.in b/bin/tests/system/allow_query/ns2/named05.conf.in
index 7d6cafae3c1..c733194e4c2 100644
--- a/bin/tests/system/allow_query/ns2/named05.conf.in
+++ b/bin/tests/system/allow_query/ns2/named05.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named06.conf.in b/bin/tests/system/allow_query/ns2/named06.conf.in
index ecf8fe8ab39..abac57e2f38 100644
--- a/bin/tests/system/allow_query/ns2/named06.conf.in
+++ b/bin/tests/system/allow_query/ns2/named06.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named07.conf.in b/bin/tests/system/allow_query/ns2/named07.conf.in
index 0632e1d0f6f..f7771c90eb2 100644
--- a/bin/tests/system/allow_query/ns2/named07.conf.in
+++ b/bin/tests/system/allow_query/ns2/named07.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl accept { 10.53.0.2; };
diff --git a/bin/tests/system/allow_query/ns2/named08.conf.in b/bin/tests/system/allow_query/ns2/named08.conf.in
index 0ab477cdf95..386594ab03d 100644
--- a/bin/tests/system/allow_query/ns2/named08.conf.in
+++ b/bin/tests/system/allow_query/ns2/named08.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl accept { 10.53.0.1; };
diff --git a/bin/tests/system/allow_query/ns2/named09.conf.in b/bin/tests/system/allow_query/ns2/named09.conf.in
index 3abcf13be81..5f1568f5f12 100644
--- a/bin/tests/system/allow_query/ns2/named09.conf.in
+++ b/bin/tests/system/allow_query/ns2/named09.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl accept { 10.53.0.2; };
diff --git a/bin/tests/system/allow_query/ns2/named10.conf.in b/bin/tests/system/allow_query/ns2/named10.conf.in
index eb4c22d775a..c6ed24c2594 100644
--- a/bin/tests/system/allow_query/ns2/named10.conf.in
+++ b/bin/tests/system/allow_query/ns2/named10.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key one {
diff --git a/bin/tests/system/allow_query/ns2/named11.conf.in b/bin/tests/system/allow_query/ns2/named11.conf.in
index 4aaa567b950..1cd7738d79c 100644
--- a/bin/tests/system/allow_query/ns2/named11.conf.in
+++ b/bin/tests/system/allow_query/ns2/named11.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key one {
diff --git a/bin/tests/system/allow_query/ns2/named12.conf.in b/bin/tests/system/allow_query/ns2/named12.conf.in
index 163870ddca1..83688013fcf 100644
--- a/bin/tests/system/allow_query/ns2/named12.conf.in
+++ b/bin/tests/system/allow_query/ns2/named12.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key one {
diff --git a/bin/tests/system/allow_query/ns2/named21.conf.in b/bin/tests/system/allow_query/ns2/named21.conf.in
index d688b6b5c42..7cee3e8c0a5 100644
--- a/bin/tests/system/allow_query/ns2/named21.conf.in
+++ b/bin/tests/system/allow_query/ns2/named21.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named22.conf.in b/bin/tests/system/allow_query/ns2/named22.conf.in
index 526734cb753..0e9c7f8a84c 100644
--- a/bin/tests/system/allow_query/ns2/named22.conf.in
+++ b/bin/tests/system/allow_query/ns2/named22.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named23.conf.in b/bin/tests/system/allow_query/ns2/named23.conf.in
index 23cf7736adb..86baa766c24 100644
--- a/bin/tests/system/allow_query/ns2/named23.conf.in
+++ b/bin/tests/system/allow_query/ns2/named23.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named24.conf.in b/bin/tests/system/allow_query/ns2/named24.conf.in
index 05c179210be..ed81fc25f63 100644
--- a/bin/tests/system/allow_query/ns2/named24.conf.in
+++ b/bin/tests/system/allow_query/ns2/named24.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named25.conf.in b/bin/tests/system/allow_query/ns2/named25.conf.in
index ed009e2313f..a54088180f9 100644
--- a/bin/tests/system/allow_query/ns2/named25.conf.in
+++ b/bin/tests/system/allow_query/ns2/named25.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named26.conf.in b/bin/tests/system/allow_query/ns2/named26.conf.in
index 76d1cff3ca2..856924a823c 100644
--- a/bin/tests/system/allow_query/ns2/named26.conf.in
+++ b/bin/tests/system/allow_query/ns2/named26.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named27.conf.in b/bin/tests/system/allow_query/ns2/named27.conf.in
index fc5d216f1aa..00d3f512697 100644
--- a/bin/tests/system/allow_query/ns2/named27.conf.in
+++ b/bin/tests/system/allow_query/ns2/named27.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl accept { 10.53.0.2; };
diff --git a/bin/tests/system/allow_query/ns2/named28.conf.in b/bin/tests/system/allow_query/ns2/named28.conf.in
index 037b02101a7..7c2772ceb5b 100644
--- a/bin/tests/system/allow_query/ns2/named28.conf.in
+++ b/bin/tests/system/allow_query/ns2/named28.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl accept { 10.53.0.1; };
diff --git a/bin/tests/system/allow_query/ns2/named29.conf.in b/bin/tests/system/allow_query/ns2/named29.conf.in
index 657fe86aa73..f9ebc6c4cc6 100644
--- a/bin/tests/system/allow_query/ns2/named29.conf.in
+++ b/bin/tests/system/allow_query/ns2/named29.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl accept { 10.53.0.2; };
diff --git a/bin/tests/system/allow_query/ns2/named30.conf.in b/bin/tests/system/allow_query/ns2/named30.conf.in
index 90dc8033d90..58987cada0b 100644
--- a/bin/tests/system/allow_query/ns2/named30.conf.in
+++ b/bin/tests/system/allow_query/ns2/named30.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key one {
diff --git a/bin/tests/system/allow_query/ns2/named31.conf.in b/bin/tests/system/allow_query/ns2/named31.conf.in
index a4cdadcedf2..954577aeac2 100644
--- a/bin/tests/system/allow_query/ns2/named31.conf.in
+++ b/bin/tests/system/allow_query/ns2/named31.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key one {
diff --git a/bin/tests/system/allow_query/ns2/named32.conf.in b/bin/tests/system/allow_query/ns2/named32.conf.in
index 1f3dc2f2735..d9f9072efa1 100644
--- a/bin/tests/system/allow_query/ns2/named32.conf.in
+++ b/bin/tests/system/allow_query/ns2/named32.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key one {
diff --git a/bin/tests/system/allow_query/ns2/named33.conf.in b/bin/tests/system/allow_query/ns2/named33.conf.in
index 078dfb29996..9282b3199fb 100644
--- a/bin/tests/system/allow_query/ns2/named33.conf.in
+++ b/bin/tests/system/allow_query/ns2/named33.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named34.conf.in b/bin/tests/system/allow_query/ns2/named34.conf.in
index 058bddfafc9..a16f498da5d 100644
--- a/bin/tests/system/allow_query/ns2/named34.conf.in
+++ b/bin/tests/system/allow_query/ns2/named34.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named40.conf.in b/bin/tests/system/allow_query/ns2/named40.conf.in
index 5dc53d14615..626818d387e 100644
--- a/bin/tests/system/allow_query/ns2/named40.conf.in
+++ b/bin/tests/system/allow_query/ns2/named40.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl accept { 10.53.0.2; };
diff --git a/bin/tests/system/allow_query/ns2/named53.conf.in b/bin/tests/system/allow_query/ns2/named53.conf.in
index 476bb09f5f6..93c76252c06 100644
--- a/bin/tests/system/allow_query/ns2/named53.conf.in
+++ b/bin/tests/system/allow_query/ns2/named53.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named54.conf.in b/bin/tests/system/allow_query/ns2/named54.conf.in
index f57ed0b7cce..e823aece378 100644
--- a/bin/tests/system/allow_query/ns2/named54.conf.in
+++ b/bin/tests/system/allow_query/ns2/named54.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named55.conf.in b/bin/tests/system/allow_query/ns2/named55.conf.in
index 039ed2d46e6..483b8530e46 100644
--- a/bin/tests/system/allow_query/ns2/named55.conf.in
+++ b/bin/tests/system/allow_query/ns2/named55.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named56.conf.in b/bin/tests/system/allow_query/ns2/named56.conf.in
index 5768b299a93..3da1036a93e 100644
--- a/bin/tests/system/allow_query/ns2/named56.conf.in
+++ b/bin/tests/system/allow_query/ns2/named56.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named57.conf.in b/bin/tests/system/allow_query/ns2/named57.conf.in
index 45353331cc7..d5d205ae709 100644
--- a/bin/tests/system/allow_query/ns2/named57.conf.in
+++ b/bin/tests/system/allow_query/ns2/named57.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/none.db b/bin/tests/system/allow_query/ns2/none.db
index 4f6a90d7ac4..ba4269f9bdd 100644
--- a/bin/tests/system/allow_query/ns2/none.db
+++ b/bin/tests/system/allow_query/ns2/none.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: none.db,v 1.2 2010/11/16 01:37:39 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/normal.db b/bin/tests/system/allow_query/ns2/normal.db
index 8ef16ab6bd5..33d91e6140d 100644
--- a/bin/tests/system/allow_query/ns2/normal.db
+++ b/bin/tests/system/allow_query/ns2/normal.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: normal.db,v 1.2 2010/11/16 01:37:39 sar Exp $
 
diff --git a/bin/tests/system/allow_query/ns2/previous.db b/bin/tests/system/allow_query/ns2/previous.db
index 09e5d27df87..fb2029aa8c5 100644
--- a/bin/tests/system/allow_query/ns2/previous.db
+++ b/bin/tests/system/allow_query/ns2/previous.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: previous.db,v 1.2 2010/11/16 01:37:39 sar Exp $
 
diff --git a/bin/tests/system/allow_query/setup.sh b/bin/tests/system/allow_query/setup.sh
index 77e5eea4a90..3d2c2c82c43 100644
--- a/bin/tests/system/allow_query/setup.sh
+++ b/bin/tests/system/allow_query/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/allow_query/tests.sh b/bin/tests/system/allow_query/tests.sh
index 5f3509ce714..79acb41aba1 100644
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow_query/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 # Test of allow-query statement.
 # allow-query takes an address match list and can be included in either the
diff --git a/bin/tests/system/ans.pl b/bin/tests/system/ans.pl
index cf308ec0506..d7f9f63cfac 100644
--- a/bin/tests/system/ans.pl
+++ b/bin/tests/system/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 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.
 
 #
 # This is the name server from hell.  It provides canned
diff --git a/bin/tests/system/auth/clean.sh b/bin/tests/system/auth/clean.sh
index be74d1b3852..f18041d5f43 100644
--- a/bin/tests/system/auth/clean.sh
+++ b/bin/tests/system/auth/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 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.
 
 rm -f */named.memstats
 rm -f */named.run
diff --git a/bin/tests/system/auth/ns1/example.com.db b/bin/tests/system/auth/ns1/example.com.db
index f8ae5c7278e..a6c98de41c2 100644
--- a/bin/tests/system/auth/ns1/example.com.db
+++ b/bin/tests/system/auth/ns1/example.com.db
@@ -1,8 +1,11 @@
-; Copyright (C) 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.
 
 $TTL 300        ; 5 minutes
 @                       IN SOA  ns root (
diff --git a/bin/tests/system/auth/ns1/example.net.db b/bin/tests/system/auth/ns1/example.net.db
index 2a4a1c36e5b..66aa33dc5fe 100644
--- a/bin/tests/system/auth/ns1/example.net.db
+++ b/bin/tests/system/auth/ns1/example.net.db
@@ -1,8 +1,11 @@
-; Copyright (C) 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.
 
 $TTL 300        ; 5 minutes
 @                       IN SOA  ns root (
diff --git a/bin/tests/system/auth/ns1/named.conf.in b/bin/tests/system/auth/ns1/named.conf.in
index 7d2ec72757e..f239e15a736 100644
--- a/bin/tests/system/auth/ns1/named.conf.in
+++ b/bin/tests/system/auth/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 options {
diff --git a/bin/tests/system/auth/ns2/named.conf.in b/bin/tests/system/auth/ns2/named.conf.in
index 7b1f91fe5ed..33d5fd120b6 100644
--- a/bin/tests/system/auth/ns2/named.conf.in
+++ b/bin/tests/system/auth/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 options {
diff --git a/bin/tests/system/auth/setup.sh b/bin/tests/system/auth/setup.sh
index c72b22a8139..85855f32289 100644
--- a/bin/tests/system/auth/setup.sh
+++ b/bin/tests/system/auth/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/auth/tests.sh b/bin/tests/system/auth/tests.sh
index 9e7d29f3fa4..348fcf8975d 100644
--- a/bin/tests/system/auth/tests.sh
+++ b/bin/tests/system/auth/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
index 18be2769f9b..f5b2d602058 100644
--- a/bin/tests/system/autosign/clean.sh
+++ b/bin/tests/system/autosign/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-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.
 
 rm -f */K* */dsset-* */*.signed */tmp* */*.jnl */*.bk
 rm -f */core
diff --git a/bin/tests/system/autosign/ns1/keygen.sh b/bin/tests/system/autosign/ns1/keygen.sh
index 2a45fa4c8f8..53312980693 100644
--- a/bin/tests/system/autosign/ns1/keygen.sh
+++ b/bin/tests/system/autosign/ns1/keygen.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009-2012, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/ns1/named.conf.in b/bin/tests/system/autosign/ns1/named.conf.in
index 97bd12c1810..8c2e86c070d 100644
--- a/bin/tests/system/autosign/ns1/named.conf.in
+++ b/bin/tests/system/autosign/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 // NS1
diff --git a/bin/tests/system/autosign/ns1/root.db.in b/bin/tests/system/autosign/ns1/root.db.in
index b2960c90067..a9902f521bc 100644
--- a/bin/tests/system/autosign/ns1/root.db.in
+++ b/bin/tests/system/autosign/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2010, 2016  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.
 
 ; $Id: root.db.in,v 1.6 2010/08/16 22:21:06 marka Exp $
 
diff --git a/bin/tests/system/autosign/ns2/bar.db.in b/bin/tests/system/autosign/ns2/bar.db.in
index e747f6e6ebd..0aacb0f0d00 100644
--- a/bin/tests/system/autosign/ns2/bar.db.in
+++ b/bin/tests/system/autosign/ns2/bar.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: bar.db.in,v 1.3 2010/01/18 23:48:40 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns2/child.nsec3.example.db b/bin/tests/system/autosign/ns2/child.nsec3.example.db
index ab0475c3466..3a6b7e1fc2a 100644
--- a/bin/tests/system/autosign/ns2/child.nsec3.example.db
+++ b/bin/tests/system/autosign/ns2/child.nsec3.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: child.nsec3.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns2/child.optout.example.db b/bin/tests/system/autosign/ns2/child.optout.example.db
index 68159441e3c..b637d8931de 100644
--- a/bin/tests/system/autosign/ns2/child.optout.example.db
+++ b/bin/tests/system/autosign/ns2/child.optout.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: child.optout.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns2/dst.example.db.in b/bin/tests/system/autosign/ns2/dst.example.db.in
index f6dd253de5d..ab610599895 100644
--- a/bin/tests/system/autosign/ns2/dst.example.db.in
+++ b/bin/tests/system/autosign/ns2/dst.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: dst.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns2/example.db.in b/bin/tests/system/autosign/ns2/example.db.in
index 9aaaf99ca15..a6529bc0256 100644
--- a/bin/tests/system/autosign/ns2/example.db.in
+++ b/bin/tests/system/autosign/ns2/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.5 2010/01/18 23:48:40 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns2/insecure.secure.example.db b/bin/tests/system/autosign/ns2/insecure.secure.example.db
index 2dc210fd677..abf727bcb7d 100644
--- a/bin/tests/system/autosign/ns2/insecure.secure.example.db
+++ b/bin/tests/system/autosign/ns2/insecure.secure.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: insecure.secure.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh
index 7e5955c4285..e2535129441 100644
--- a/bin/tests/system/autosign/ns2/keygen.sh
+++ b/bin/tests/system/autosign/ns2/keygen.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009-2012, 2014-2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/ns2/named.conf.in b/bin/tests/system/autosign/ns2/named.conf.in
index 37a4f7fa02f..9f0c617f769 100644
--- a/bin/tests/system/autosign/ns2/named.conf.in
+++ b/bin/tests/system/autosign/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009-2011, 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.
  */
 
 // NS2
diff --git a/bin/tests/system/autosign/ns2/private.secure.example.db.in b/bin/tests/system/autosign/ns2/private.secure.example.db.in
index 4d9dbbbe8d7..422982c4c1a 100644
--- a/bin/tests/system/autosign/ns2/private.secure.example.db.in
+++ b/bin/tests/system/autosign/ns2/private.secure.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: private.secure.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/autonsec3.example.db.in b/bin/tests/system/autosign/ns3/autonsec3.example.db.in
index 39341dae9f8..6e631afc4d8 100644
--- a/bin/tests/system/autosign/ns3/autonsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/autonsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: autonsec3.example.db.in,v 1.3 2011/06/10 23:47:31 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/delay.example.db b/bin/tests/system/autosign/ns3/delay.example.db
index 7c7b43490a5..8ba14542ecb 100644
--- a/bin/tests/system/autosign/ns3/delay.example.db
+++ b/bin/tests/system/autosign/ns3/delay.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: delay.example.db,v 1.2 2011/03/26 01:19:03 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/inacksk2.example.db.in b/bin/tests/system/autosign/ns3/inacksk2.example.db.in
index 8a7f25cee82..90dcba9daf2 100644
--- a/bin/tests/system/autosign/ns3/inacksk2.example.db.in
+++ b/bin/tests/system/autosign/ns3/inacksk2.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/inacksk3.example.db.in b/bin/tests/system/autosign/ns3/inacksk3.example.db.in
index 8a7f25cee82..90dcba9daf2 100644
--- a/bin/tests/system/autosign/ns3/inacksk3.example.db.in
+++ b/bin/tests/system/autosign/ns3/inacksk3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/inaczsk.example.db.in b/bin/tests/system/autosign/ns3/inaczsk.example.db.in
index 64714ee73cf..75ff5c25445 100644
--- a/bin/tests/system/autosign/ns3/inaczsk.example.db.in
+++ b/bin/tests/system/autosign/ns3/inaczsk.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: inaczsk.example.db.in,v 1.2 2011/07/08 01:43:26 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/inaczsk2.example.db.in b/bin/tests/system/autosign/ns3/inaczsk2.example.db.in
index 8a7f25cee82..90dcba9daf2 100644
--- a/bin/tests/system/autosign/ns3/inaczsk2.example.db.in
+++ b/bin/tests/system/autosign/ns3/inaczsk2.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/inaczsk3.example.db.in b/bin/tests/system/autosign/ns3/inaczsk3.example.db.in
index 8a7f25cee82..90dcba9daf2 100644
--- a/bin/tests/system/autosign/ns3/inaczsk3.example.db.in
+++ b/bin/tests/system/autosign/ns3/inaczsk3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/insecure.example.db b/bin/tests/system/autosign/ns3/insecure.example.db
index 43f3807415c..19f9a57160b 100644
--- a/bin/tests/system/autosign/ns3/insecure.example.db
+++ b/bin/tests/system/autosign/ns3/insecure.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: insecure.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
index 192f3705ba7..f96c1fcf608 100644
--- a/bin/tests/system/autosign/ns3/keygen.sh
+++ b/bin/tests/system/autosign/ns3/keygen.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009-2012, 2014-2017  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.
 
 # $Id: keygen.sh,v 1.15 2012/02/06 23:46:46 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/kskonly.example.db.in b/bin/tests/system/autosign/ns3/kskonly.example.db.in
index 40a4719bb3e..c3dbada717a 100644
--- a/bin/tests/system/autosign/ns3/kskonly.example.db.in
+++ b/bin/tests/system/autosign/ns3/kskonly.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
index eed75ff7b4c..06e575fcf8d 100644
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009-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.
  */
 
 // NS3
diff --git a/bin/tests/system/autosign/ns3/nozsk.example.db.in b/bin/tests/system/autosign/ns3/nozsk.example.db.in
index 0de16d0cb20..4dea5908079 100644
--- a/bin/tests/system/autosign/ns3/nozsk.example.db.in
+++ b/bin/tests/system/autosign/ns3/nozsk.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: nozsk.example.db.in,v 1.2 2011/07/08 01:43:26 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/nsec.example.db.in b/bin/tests/system/autosign/ns3/nsec.example.db.in
index 787d0b58ee0..7733b473468 100644
--- a/bin/tests/system/autosign/ns3/nsec.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: nsec.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in b/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in
index e557050887e..152cae17a33 100644
--- a/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: nsec3-to-nsec.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/nsec3.example.db.in b/bin/tests/system/autosign/ns3/nsec3.example.db.in
index 5892ea46747..d3042a45414 100644
--- a/bin/tests/system/autosign/ns3/nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in b/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
index 930849e27f2..e5075523514 100644
--- a/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: nsec3.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in b/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
index 4e0be92567c..cee535cf28a 100644
--- a/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: nsec3.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/oldsigs.example.db.in b/bin/tests/system/autosign/ns3/oldsigs.example.db.in
index 6695207416c..1e63bcaf4a2 100644
--- a/bin/tests/system/autosign/ns3/oldsigs.example.db.in
+++ b/bin/tests/system/autosign/ns3/oldsigs.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: oldsigs.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/optout.example.db.in b/bin/tests/system/autosign/ns3/optout.example.db.in
index 09366d1ce56..de5bd18ea33 100644
--- a/bin/tests/system/autosign/ns3/optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in b/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
index 6695fc9446f..dfdf102adcf 100644
--- a/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: optout.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/optout.optout.example.db.in b/bin/tests/system/autosign/ns3/optout.optout.example.db.in
index 46c85a51995..ab1ebea2b41 100644
--- a/bin/tests/system/autosign/ns3/optout.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: optout.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/rsasha256.example.db.in b/bin/tests/system/autosign/ns3/rsasha256.example.db.in
index cc9202f0fbb..0a81f94f930 100644
--- a/bin/tests/system/autosign/ns3/rsasha256.example.db.in
+++ b/bin/tests/system/autosign/ns3/rsasha256.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: rsasha256.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/rsasha512.example.db.in b/bin/tests/system/autosign/ns3/rsasha512.example.db.in
index b711b15f0f7..62827a9848b 100644
--- a/bin/tests/system/autosign/ns3/rsasha512.example.db.in
+++ b/bin/tests/system/autosign/ns3/rsasha512.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: rsasha512.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
 
diff --git a/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in b/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in
index b756511688d..d3541c977dd 100644
--- a/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: secure-to-insecure.example.db.in,v 1.3 2010/01/18 23:48:40 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in b/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in
index a0a3b354071..36548a14851 100644
--- a/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: secure-to-insecure2.example.db.in,v 1.2 2010/05/19 07:45:38 marka Exp $
 
diff --git a/bin/tests/system/autosign/ns3/secure.example.db.in b/bin/tests/system/autosign/ns3/secure.example.db.in
index 63ef640eafd..6776adc5af4 100644
--- a/bin/tests/system/autosign/ns3/secure.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: secure.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in b/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
index 7855e32bc9b..80b23a2db89 100644
--- a/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: secure.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/secure.optout.example.db.in b/bin/tests/system/autosign/ns3/secure.optout.example.db.in
index e61319754a1..b7cf8bf4f65 100644
--- a/bin/tests/system/autosign/ns3/secure.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: secure.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/sync.example.db.in b/bin/tests/system/autosign/ns3/sync.example.db.in
index b8e46a65992..c3dbada717a 100644
--- a/bin/tests/system/autosign/ns3/sync.example.db.in
+++ b/bin/tests/system/autosign/ns3/sync.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/ttl1.example.db.in b/bin/tests/system/autosign/ns3/ttl1.example.db.in
index 9050ad2e774..293c6bf720a 100644
--- a/bin/tests/system/autosign/ns3/ttl1.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl1.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: ttl1.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/ttl2.example.db.in b/bin/tests/system/autosign/ns3/ttl2.example.db.in
index 53970c0da60..199467beccb 100644
--- a/bin/tests/system/autosign/ns3/ttl2.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl2.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: ttl2.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/ttl3.example.db.in b/bin/tests/system/autosign/ns3/ttl3.example.db.in
index 8377e915ee3..7207d180938 100644
--- a/bin/tests/system/autosign/ns3/ttl3.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: ttl3.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns3/ttl4.example.db.in b/bin/tests/system/autosign/ns3/ttl4.example.db.in
index 6fab8e956da..c52b1e97e73 100644
--- a/bin/tests/system/autosign/ns3/ttl4.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl4.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: ttl4.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
 
diff --git a/bin/tests/system/autosign/ns4/named.conf.in b/bin/tests/system/autosign/ns4/named.conf.in
index 30f32cda506..5c0d8b603f2 100644
--- a/bin/tests/system/autosign/ns4/named.conf.in
+++ b/bin/tests/system/autosign/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 // NS4
diff --git a/bin/tests/system/autosign/ns5/named.conf.in b/bin/tests/system/autosign/ns5/named.conf.in
index f024416e5df..5684cee7ef9 100644
--- a/bin/tests/system/autosign/ns5/named.conf.in
+++ b/bin/tests/system/autosign/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 // NS5
diff --git a/bin/tests/system/autosign/prereq.sh b/bin/tests/system/autosign/prereq.sh
index e9b8291586b..a0d4e9ce14a 100644
--- a/bin/tests/system/autosign/prereq.sh
+++ b/bin/tests/system/autosign/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2010, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 1b1cfe311b4..b08e0e25ea4 100644
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 6cf7153d059..1eab694467f 100755
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/builtin/clean.sh b/bin/tests/system/builtin/clean.sh
index ca32ae3bdbd..93a11156b6a 100644
--- a/bin/tests/system/builtin/clean.sh
+++ b/bin/tests/system/builtin/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f ns?/named.run
 rm -f ns?/named.memstats
diff --git a/bin/tests/system/builtin/ns1/named.conf.in b/bin/tests/system/builtin/ns1/named.conf.in
index 14c64b1adbc..d181a36cfd0 100644
--- a/bin/tests/system/builtin/ns1/named.conf.in
+++ b/bin/tests/system/builtin/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/builtin/ns2/named.conf.in b/bin/tests/system/builtin/ns2/named.conf.in
index 0303b0c6b83..e875a923811 100644
--- a/bin/tests/system/builtin/ns2/named.conf.in
+++ b/bin/tests/system/builtin/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/builtin/ns3/named.conf.in b/bin/tests/system/builtin/ns3/named.conf.in
index 3b4ea6def3a..4bce9f7a721 100644
--- a/bin/tests/system/builtin/ns3/named.conf.in
+++ b/bin/tests/system/builtin/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/builtin/setup.sh b/bin/tests/system/builtin/setup.sh
index 08a9c49e8ca..c9f645b29ea 100644
--- a/bin/tests/system/builtin/setup.sh
+++ b/bin/tests/system/builtin/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh
index 4b16bbdc363..4f597c04958 100644
--- a/bin/tests/system/builtin/tests.sh
+++ b/bin/tests/system/builtin/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2011, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index 7a9efb09849..174179c1a05 100644
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 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.
 
 #
 # Clean up after cache cleaner tests.
diff --git a/bin/tests/system/cacheclean/ns1/example.db b/bin/tests/system/cacheclean/ns1/example.db
index 12bb4cf7818..cb116a05c36 100644
--- a/bin/tests/system/cacheclean/ns1/example.db
+++ b/bin/tests/system/cacheclean/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2001, 2004, 2007, 2012, 2016  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.
 
 ; $Id: example.db,v 1.5 2007/06/19 23:47:00 tbox Exp $
 
diff --git a/bin/tests/system/cacheclean/ns1/expire-test.db b/bin/tests/system/cacheclean/ns1/expire-test.db
index 35027c239cb..32d708189a7 100644
--- a/bin/tests/system/cacheclean/ns1/expire-test.db
+++ b/bin/tests/system/cacheclean/ns1/expire-test.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 3600
 @			IN SOA	hostmaster.ns ns (
diff --git a/bin/tests/system/cacheclean/ns1/flushtest.db b/bin/tests/system/cacheclean/ns1/flushtest.db
index efc2075aaa6..940a547f7d6 100644
--- a/bin/tests/system/cacheclean/ns1/flushtest.db
+++ b/bin/tests/system/cacheclean/ns1/flushtest.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: flushtest.db,v 1.3 2011/08/03 23:47:48 tbox Exp $
 
diff --git a/bin/tests/system/cacheclean/ns1/named.conf.in b/bin/tests/system/cacheclean/ns1/named.conf.in
index 085030f753a..35c080115f8 100644
--- a/bin/tests/system/cacheclean/ns1/named.conf.in
+++ b/bin/tests/system/cacheclean/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index 657ea166322..c3c42609776 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/cacheclean/setup.sh b/bin/tests/system/cacheclean/setup.sh
index c72b22a8139..85855f32289 100644
--- a/bin/tests/system/cacheclean/setup.sh
+++ b/bin/tests/system/cacheclean/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index da88070bcd2..2e032e69978 100755
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/case/clean.sh b/bin/tests/system/case/clean.sh
index af4ea3476df..646f3f6c169 100644
--- a/bin/tests/system/case/clean.sh
+++ b/bin/tests/system/case/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f dig.ns*.test*
 rm -f ns*/named.conf
diff --git a/bin/tests/system/case/ns1/dynamic.db.in b/bin/tests/system/case/ns1/dynamic.db.in
index ce913b2597c..ee1c464e38c 100644
--- a/bin/tests/system/case/ns1/dynamic.db.in
+++ b/bin/tests/system/case/ns1/dynamic.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/case/ns1/example.db b/bin/tests/system/case/ns1/example.db
index 2e977ac0196..8aba2936833 100644
--- a/bin/tests/system/case/ns1/example.db
+++ b/bin/tests/system/case/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/case/ns1/named.conf.in b/bin/tests/system/case/ns1/named.conf.in
index 65f69787ce8..f2310562bfa 100644
--- a/bin/tests/system/case/ns1/named.conf.in
+++ b/bin/tests/system/case/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 options {
diff --git a/bin/tests/system/case/ns2/named.conf.in b/bin/tests/system/case/ns2/named.conf.in
index 31355d2a1c2..473444ac29d 100644
--- a/bin/tests/system/case/ns2/named.conf.in
+++ b/bin/tests/system/case/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-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.
  */
 
 options {
diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh
index 9900ae20116..066ceb2e0dc 100644
--- a/bin/tests/system/case/setup.sh
+++ b/bin/tests/system/case/setup.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/case/tests.sh b/bin/tests/system/case/tests.sh
index c2a3a9e7287..5873ffc3a54 100644
--- a/bin/tests/system/case/tests.sh
+++ b/bin/tests/system/case/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/catz/clean.sh b/bin/tests/system/catz/clean.sh
index cdc5c9c8383..b4293791ec3 100644
--- a/bin/tests/system/catz/clean.sh
+++ b/bin/tests/system/catz/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f dig.out.*
 rm -f ns*/*.jnl
diff --git a/bin/tests/system/catz/ns1/catalog.example.db.in b/bin/tests/system/catz/ns1/catalog.example.db.in
index d11d42bb938..dc18bf5b731 100644
--- a/bin/tests/system/catz/ns1/catalog.example.db.in
+++ b/bin/tests/system/catz/ns1/catalog.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 @ 3600 SOA . . 1 86400 3600 86400 3600
 @ 3600 IN NS invalid.
diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
index d798f54506d..74b7d371b71 100644
--- a/bin/tests/system/catz/ns1/named.conf.in
+++ b/bin/tests/system/catz/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in
index 9451b6caeaa..ee83efbee46 100644
--- a/bin/tests/system/catz/ns2/named.conf.in
+++ b/bin/tests/system/catz/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/catz/ns3/dom5.example.db b/bin/tests/system/catz/ns3/dom5.example.db
index 2422ed495b1..f61860dd806 100644
--- a/bin/tests/system/catz/ns3/dom5.example.db
+++ b/bin/tests/system/catz/ns3/dom5.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 @ 3600 IN SOA . . 1 3600 3600 3600 3600
 @ IN NS invalid.
diff --git a/bin/tests/system/catz/ns3/dom6.example.db b/bin/tests/system/catz/ns3/dom6.example.db
index 2422ed495b1..f61860dd806 100644
--- a/bin/tests/system/catz/ns3/dom6.example.db
+++ b/bin/tests/system/catz/ns3/dom6.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 @ 3600 IN SOA . . 1 3600 3600 3600 3600
 @ IN NS invalid.
diff --git a/bin/tests/system/catz/ns3/named.conf.in b/bin/tests/system/catz/ns3/named.conf.in
index 08507e864f1..d5ee7c87ad1 100644
--- a/bin/tests/system/catz/ns3/named.conf.in
+++ b/bin/tests/system/catz/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
index 8a7252edb10..19e11c9daea 100644
--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index d3af71285be..01f2bf45803 100644
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -x
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/cds/checkmtime.pl b/bin/tests/system/cds/checkmtime.pl
index fa7855693cf..aba2105c032 100644
--- a/bin/tests/system/cds/checkmtime.pl
+++ b/bin/tests/system/cds/checkmtime.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  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.
 
 my $target = shift;
 my $file = shift;
diff --git a/bin/tests/system/cds/checktime.pl b/bin/tests/system/cds/checktime.pl
index f51857f5a3e..d26dbf12690 100644
--- a/bin/tests/system/cds/checktime.pl
+++ b/bin/tests/system/cds/checktime.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  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.
 
 $target = shift;
 while (<>) {
diff --git a/bin/tests/system/cds/clean.sh b/bin/tests/system/cds/clean.sh
index b53f306bfab..ea839db44fe 100644
--- a/bin/tests/system/cds/clean.sh
+++ b/bin/tests/system/cds/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 rm -f CDNSKEY* CDS* DS*
 rm -f K*
diff --git a/bin/tests/system/cds/mangle.pl b/bin/tests/system/cds/mangle.pl
index 7c42df603f5..d73625811c2 100644
--- a/bin/tests/system/cds/mangle.pl
+++ b/bin/tests/system/cds/mangle.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  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.
 
 my $re = $ARGV[0];
 shift;
diff --git a/bin/tests/system/cds/prereq.sh b/bin/tests/system/cds/prereq.sh
index 0de9fa3a872..a0d4e9ce14a 100644
--- a/bin/tests/system/cds/prereq.sh
+++ b/bin/tests/system/cds/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/cds/setup.sh b/bin/tests/system/cds/setup.sh
index 147e3ed0bc3..5c26dcac3dc 100644
--- a/bin/tests/system/cds/setup.sh
+++ b/bin/tests/system/cds/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 set -eu
 
diff --git a/bin/tests/system/cds/tests.sh b/bin/tests/system/cds/tests.sh
index b89d6db5553..7ef22895d04 100644
--- a/bin/tests/system/cds/tests.sh
+++ b/bin/tests/system/cds/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/chain/README b/bin/tests/system/chain/README
index 38eea39ae7d..c4144ac0f93 100644
--- a/bin/tests/system/chain/README
+++ b/bin/tests/system/chain/README
@@ -1,9 +1,12 @@
-Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2017, 2018  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.
+
 ns1 is the root server.
 
 ns2 and ns5 are both authoritative servers.
diff --git a/bin/tests/system/chain/ans3/ans.pl b/bin/tests/system/chain/ans3/ans.pl
index 07fb9de876f..cdbfc84c136 100644
--- a/bin/tests/system/chain/ans3/ans.pl
+++ b/bin/tests/system/chain/ans3/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# 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.
 
 use strict;
 use warnings;
diff --git a/bin/tests/system/chain/ans4/README.anspy b/bin/tests/system/chain/ans4/README.anspy
index b83eac19d68..f6b40a953fa 100644
--- a/bin/tests/system/chain/ans4/README.anspy
+++ b/bin/tests/system/chain/ans4/README.anspy
@@ -4,6 +4,9 @@ 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.
+
 REQUIREMENTS
 ans.py requires at least dnspython 1.12.0.
 
diff --git a/bin/tests/system/chain/ans4/ans.py b/bin/tests/system/chain/ans4/ans.py
index 0423e917b9e..2dd7def0194 100755
--- a/bin/tests/system/chain/ans4/ans.py
+++ b/bin/tests/system/chain/ans4/ans.py
@@ -1,9 +1,12 @@
 ############################################################################
-# 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.
 ############################################################################
 
 ############################################################################
diff --git a/bin/tests/system/chain/clean.sh b/bin/tests/system/chain/clean.sh
index 7b52f83fb73..265123f0c6a 100755
--- a/bin/tests/system/chain/clean.sh
+++ b/bin/tests/system/chain/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014-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.
 
 rm -f dig.out.* named*.pid
 rm -f ns*/named.conf
diff --git a/bin/tests/system/chain/ns1/named.conf.in b/bin/tests/system/chain/ns1/named.conf.in
index ab83a309448..5815c3c756c 100644
--- a/bin/tests/system/chain/ns1/named.conf.in
+++ b/bin/tests/system/chain/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/chain/ns1/root.db b/bin/tests/system/chain/ns1/root.db
index c00dcd82c1d..bc70f8c2a0d 100644
--- a/bin/tests/system/chain/ns1/root.db
+++ b/bin/tests/system/chain/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016, 2017  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.
 
 $TTL 300
 . 			IN SOA	root.domain.nil a.root.servers.nil. (
diff --git a/bin/tests/system/chain/ns2/example.db b/bin/tests/system/chain/ns2/example.db
index f7de615f343..5f29f861067 100644
--- a/bin/tests/system/chain/ns2/example.db
+++ b/bin/tests/system/chain/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016, 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/chain/ns2/generic.db b/bin/tests/system/chain/ns2/generic.db
index 44b4dc5b184..60568dd6420 100644
--- a/bin/tests/system/chain/ns2/generic.db
+++ b/bin/tests/system/chain/ns2/generic.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	86400	SOA	ns2.nil. hostmaster.ns2.nil. 0 1 1 1 1
 @	86400	NS 	ns2.nil.
diff --git a/bin/tests/system/chain/ns2/named.conf.in b/bin/tests/system/chain/ns2/named.conf.in
index f153d541639..519bfb3494e 100644
--- a/bin/tests/system/chain/ns2/named.conf.in
+++ b/bin/tests/system/chain/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/chain/ns2/sign.sh b/bin/tests/system/chain/ns2/sign.sh
index 127e33e69c0..11b87ad4027 100644
--- a/bin/tests/system/chain/ns2/sign.sh
+++ b/bin/tests/system/chain/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/chain/ns2/sub.db b/bin/tests/system/chain/ns2/sub.db
index 508e0397028..5e65fdf5c8a 100644
--- a/bin/tests/system/chain/ns2/sub.db
+++ b/bin/tests/system/chain/ns2/sub.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/chain/ns5/named.conf.in b/bin/tests/system/chain/ns5/named.conf.in
index fd9bcf53f28..d6813b6f695 100644
--- a/bin/tests/system/chain/ns5/named.conf.in
+++ b/bin/tests/system/chain/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/chain/ns5/sub.db b/bin/tests/system/chain/ns5/sub.db
index eb2b4c866bc..9ddb4313ed8 100644
--- a/bin/tests/system/chain/ns5/sub.db
+++ b/bin/tests/system/chain/ns5/sub.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/chain/ns7/named.conf.in b/bin/tests/system/chain/ns7/named.conf.in
index dcf7b28ddba..21f5a998c5f 100644
--- a/bin/tests/system/chain/ns7/named.conf.in
+++ b/bin/tests/system/chain/ns7/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/chain/ns7/root.hint b/bin/tests/system/chain/ns7/root.hint
index ddbd6509629..ab755ba29fa 100644
--- a/bin/tests/system/chain/ns7/root.hint
+++ b/bin/tests/system/chain/ns7/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 999999
 .                        IN NS  a.root-servers.nil.
diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh
index 499fec887d0..f3f1939b2a2 100644
--- a/bin/tests/system/chain/prereq.sh
+++ b/bin/tests/system/chain/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/chain/setup.sh b/bin/tests/system/chain/setup.sh
index 0f117ca6867..c2b0d69de79 100644
--- a/bin/tests/system/chain/setup.sh
+++ b/bin/tests/system/chain/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh
index 59125e21f7c..fa422439016 100644
--- a/bin/tests/system/chain/tests.sh
+++ b/bin/tests/system/chain/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2011, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checkconf/altdb.conf b/bin/tests/system/checkconf/altdb.conf
index 5131b7f6fde..0ee9680dcbb 100644
--- a/bin/tests/system/checkconf/altdb.conf
+++ b/bin/tests/system/checkconf/altdb.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 view override_bind chaos {
diff --git a/bin/tests/system/checkconf/altdlz.conf b/bin/tests/system/checkconf/altdlz.conf
index 7c875c3113a..86331971663 100644
--- a/bin/tests/system/checkconf/altdlz.conf
+++ b/bin/tests/system/checkconf/altdlz.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 dlz external {
diff --git a/bin/tests/system/checkconf/bad-acl.conf b/bin/tests/system/checkconf/bad-acl.conf
index 803a199febf..02d1cc0d104 100644
--- a/bin/tests/system/checkconf/bad-acl.conf
+++ b/bin/tests/system/checkconf/bad-acl.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 acl a {
diff --git a/bin/tests/system/checkconf/bad-also-notify.conf b/bin/tests/system/checkconf/bad-also-notify.conf
index 2fd3dc7ce41..a1e7f5e2adc 100644
--- a/bin/tests/system/checkconf/bad-also-notify.conf
+++ b/bin/tests/system/checkconf/bad-also-notify.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/checkconf/bad-catz-zone.conf b/bin/tests/system/checkconf/bad-catz-zone.conf
index 710f4fcae07..429a21456d0 100644
--- a/bin/tests/system/checkconf/bad-catz-zone.conf
+++ b/bin/tests/system/checkconf/bad-catz-zone.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-dnssec.conf b/bin/tests/system/checkconf/bad-dnssec.conf
index 5b73512765f..c5f3ac20038 100644
--- a/bin/tests/system/checkconf/bad-dnssec.conf
+++ b/bin/tests/system/checkconf/bad-dnssec.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/checkconf/bad-glue-cache-bogus.conf b/bin/tests/system/checkconf/bad-glue-cache-bogus.conf
index d57c9cabce5..be45bbd81c6 100644
--- a/bin/tests/system/checkconf/bad-glue-cache-bogus.conf
+++ b/bin/tests/system/checkconf/bad-glue-cache-bogus.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-hint.conf b/bin/tests/system/checkconf/bad-hint.conf
index 8cbae5dae76..a99ddba4507 100644
--- a/bin/tests/system/checkconf/bad-hint.conf
+++ b/bin/tests/system/checkconf/bad-hint.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 zone "." {
diff --git a/bin/tests/system/checkconf/bad-inline-slave.conf b/bin/tests/system/checkconf/bad-inline-slave.conf
index e792bcdfc88..ff283b62cd7 100644
--- a/bin/tests/system/checkconf/bad-inline-slave.conf
+++ b/bin/tests/system/checkconf/bad-inline-slave.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
  /*
diff --git a/bin/tests/system/checkconf/bad-keep-response-order.conf b/bin/tests/system/checkconf/bad-keep-response-order.conf
index b49d182b372..c2c8929ca53 100644
--- a/bin/tests/system/checkconf/bad-keep-response-order.conf
+++ b/bin/tests/system/checkconf/bad-keep-response-order.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-lifetime.conf b/bin/tests/system/checkconf/bad-lifetime.conf
index 789f877316d..b5926f0eaea 100644
--- a/bin/tests/system/checkconf/bad-lifetime.conf
+++ b/bin/tests/system/checkconf/bad-lifetime.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf
index c46b2ba0657..17d2ac5954e 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf
index e8c8af3d2ae..99540cae4d9 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf
index 046d5f27b81..e5e50f7f38c 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf
index c6ea8600131..252ab3666c1 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-many.conf b/bin/tests/system/checkconf/bad-many.conf
index 55fdda0416c..bd3f0a2e7ee 100644
--- a/bin/tests/system/checkconf/bad-many.conf
+++ b/bin/tests/system/checkconf/bad-many.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2012, 2015, 2016  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.
  */
 
 /* $Id: bad.conf,v 1.4 2007/06/19 23:47:01 tbox Exp $ */
diff --git a/bin/tests/system/checkconf/bad-master-request-ixfr.conf b/bin/tests/system/checkconf/bad-master-request-ixfr.conf
index 59a4ff83a05..2d3913f71cd 100644
--- a/bin/tests/system/checkconf/bad-master-request-ixfr.conf
+++ b/bin/tests/system/checkconf/bad-master-request-ixfr.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*
diff --git a/bin/tests/system/checkconf/bad-maxttlmap.conf b/bin/tests/system/checkconf/bad-maxttlmap.conf
index a7d675a76b3..f404b3e86bf 100644
--- a/bin/tests/system/checkconf/bad-maxttlmap.conf
+++ b/bin/tests/system/checkconf/bad-maxttlmap.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 zone example {
diff --git a/bin/tests/system/checkconf/bad-noddns.conf b/bin/tests/system/checkconf/bad-noddns.conf
index a6f62f3432d..d4e93dcbf64 100644
--- a/bin/tests/system/checkconf/bad-noddns.conf
+++ b/bin/tests/system/checkconf/bad-noddns.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 zone example {
diff --git a/bin/tests/system/checkconf/bad-options-also-notify.conf b/bin/tests/system/checkconf/bad-options-also-notify.conf
index 9814e27698c..d5a28c0e3a3 100644
--- a/bin/tests/system/checkconf/bad-options-also-notify.conf
+++ b/bin/tests/system/checkconf/bad-options-also-notify.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-printtime.conf b/bin/tests/system/checkconf/bad-printtime.conf
index 13807b18435..318e4533247 100644
--- a/bin/tests/system/checkconf/bad-printtime.conf
+++ b/bin/tests/system/checkconf/bad-printtime.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 logging {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-acl.conf b/bin/tests/system/checkconf/bad-rate-limit-acl.conf
index 9e92577086b..b344a0ffe31 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-acl.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-acl.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-all-per-second.conf b/bin/tests/system/checkconf/bad-rate-limit-all-per-second.conf
index 72b760d9b3b..6a60a8bfc24 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-all-per-second.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-all-per-second.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-errors-per-second.conf b/bin/tests/system/checkconf/bad-rate-limit-errors-per-second.conf
index 485ea888f97..bea963956f1 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-errors-per-second.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-errors-per-second.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-ipv4-prefix-length.conf b/bin/tests/system/checkconf/bad-rate-limit-ipv4-prefix-length.conf
index 8f0f9ea56d7..b94d8db7326 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-ipv4-prefix-length.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-ipv4-prefix-length.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-ipv6-prefix-length.conf b/bin/tests/system/checkconf/bad-rate-limit-ipv6-prefix-length.conf
index 2c1869250ac..4378e718460 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-ipv6-prefix-length.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-ipv6-prefix-length.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-max-table-size.conf b/bin/tests/system/checkconf/bad-rate-limit-max-table-size.conf
index 3497ab38d9d..ed05f576b86 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-max-table-size.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-max-table-size.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-nodata-per-second.conf b/bin/tests/system/checkconf/bad-rate-limit-nodata-per-second.conf
index 40f98586677..893640ee7fe 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-nodata-per-second.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-nodata-per-second.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-nxdomains-per-second.conf b/bin/tests/system/checkconf/bad-rate-limit-nxdomains-per-second.conf
index 6ccfc02ec5f..8e2f407953a 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-nxdomains-per-second.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-nxdomains-per-second.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-qps-scale.conf b/bin/tests/system/checkconf/bad-rate-limit-qps-scale.conf
index 1d6fd4f0b08..585e90e2750 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-qps-scale.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-qps-scale.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-referrals-per-second.conf b/bin/tests/system/checkconf/bad-rate-limit-referrals-per-second.conf
index 6c59ff96db9..21f528cdaf3 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-referrals-per-second.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-referrals-per-second.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-responses-per-second.conf b/bin/tests/system/checkconf/bad-rate-limit-responses-per-second.conf
index 42f34b588cf..784f529beb3 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-responses-per-second.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-responses-per-second.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-slip.conf b/bin/tests/system/checkconf/bad-rate-limit-slip.conf
index e9fc9d1cf5d..c6162952eec 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-slip.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-slip.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rate-limit-window.conf b/bin/tests/system/checkconf/bad-rate-limit-window.conf
index bcfdc707959..5a0bcdb4ab2 100644
--- a/bin/tests/system/checkconf/bad-rate-limit-window.conf
+++ b/bin/tests/system/checkconf/bad-rate-limit-window.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-rpz-zone.conf b/bin/tests/system/checkconf/bad-rpz-zone.conf
index 07ed2a7887b..120c8e4fe40 100644
--- a/bin/tests/system/checkconf/bad-rpz-zone.conf
+++ b/bin/tests/system/checkconf/bad-rpz-zone.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/bad-sharedwritable1.conf b/bin/tests/system/checkconf/bad-sharedwritable1.conf
index 67a3acce6f6..38d244a6968 100644
--- a/bin/tests/system/checkconf/bad-sharedwritable1.conf
+++ b/bin/tests/system/checkconf/bad-sharedwritable1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 zone a {
diff --git a/bin/tests/system/checkconf/bad-sharedwritable2.conf b/bin/tests/system/checkconf/bad-sharedwritable2.conf
index 3c17fdf9380..31c77c417c9 100644
--- a/bin/tests/system/checkconf/bad-sharedwritable2.conf
+++ b/bin/tests/system/checkconf/bad-sharedwritable2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 zone a {
diff --git a/bin/tests/system/checkconf/bad-sharedzone1.conf b/bin/tests/system/checkconf/bad-sharedzone1.conf
index 5b117649641..3782991fa54 100644
--- a/bin/tests/system/checkconf/bad-sharedzone1.conf
+++ b/bin/tests/system/checkconf/bad-sharedzone1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 view "first" {
diff --git a/bin/tests/system/checkconf/bad-sharedzone2.conf b/bin/tests/system/checkconf/bad-sharedzone2.conf
index 6546a7a5ab0..91b0472d9a9 100644
--- a/bin/tests/system/checkconf/bad-sharedzone2.conf
+++ b/bin/tests/system/checkconf/bad-sharedzone2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 view "first" {
diff --git a/bin/tests/system/checkconf/bad-tsig.conf b/bin/tests/system/checkconf/bad-tsig.conf
index 8e1e365aedf..e98f1c366de 100644
--- a/bin/tests/system/checkconf/bad-tsig.conf
+++ b/bin/tests/system/checkconf/bad-tsig.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/checkconf/bad-update-policy1.conf b/bin/tests/system/checkconf/bad-update-policy1.conf
index 1abbf5b7ed4..13e21db605c 100644
--- a/bin/tests/system/checkconf/bad-update-policy1.conf
+++ b/bin/tests/system/checkconf/bad-update-policy1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy2.conf b/bin/tests/system/checkconf/bad-update-policy2.conf
index 581669f25a4..987e0967c3a 100644
--- a/bin/tests/system/checkconf/bad-update-policy2.conf
+++ b/bin/tests/system/checkconf/bad-update-policy2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy3.conf b/bin/tests/system/checkconf/bad-update-policy3.conf
index ac8a4d40fee..ff0811f9477 100644
--- a/bin/tests/system/checkconf/bad-update-policy3.conf
+++ b/bin/tests/system/checkconf/bad-update-policy3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy4.conf b/bin/tests/system/checkconf/bad-update-policy4.conf
index 7032dc5ff2a..396f69b81e2 100644
--- a/bin/tests/system/checkconf/bad-update-policy4.conf
+++ b/bin/tests/system/checkconf/bad-update-policy4.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy5.conf b/bin/tests/system/checkconf/bad-update-policy5.conf
index e5b153ae021..718dad5346e 100644
--- a/bin/tests/system/checkconf/bad-update-policy5.conf
+++ b/bin/tests/system/checkconf/bad-update-policy5.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy6.conf b/bin/tests/system/checkconf/bad-update-policy6.conf
index 9cd4f5f39a9..992e384a50d 100644
--- a/bin/tests/system/checkconf/bad-update-policy6.conf
+++ b/bin/tests/system/checkconf/bad-update-policy6.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy7.conf b/bin/tests/system/checkconf/bad-update-policy7.conf
index 8b0b0b74c1f..3bd2185aebf 100644
--- a/bin/tests/system/checkconf/bad-update-policy7.conf
+++ b/bin/tests/system/checkconf/bad-update-policy7.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy8.conf b/bin/tests/system/checkconf/bad-update-policy8.conf
index 5e9502e5735..c88b0e25190 100644
--- a/bin/tests/system/checkconf/bad-update-policy8.conf
+++ b/bin/tests/system/checkconf/bad-update-policy8.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-update-policy9.conf b/bin/tests/system/checkconf/bad-update-policy9.conf
index 91c98b09d30..382f899fec5 100644
--- a/bin/tests/system/checkconf/bad-update-policy9.conf
+++ b/bin/tests/system/checkconf/bad-update-policy9.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/bad-view-also-notify.conf b/bin/tests/system/checkconf/bad-view-also-notify.conf
index c2eb01367e4..418fa47a8fb 100644
--- a/bin/tests/system/checkconf/bad-view-also-notify.conf
+++ b/bin/tests/system/checkconf/bad-view-also-notify.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 view example {
diff --git a/bin/tests/system/checkconf/check-dlv-ksk-key.conf b/bin/tests/system/checkconf/check-dlv-ksk-key.conf
index 9f6b70f14db..2322e7ddaa1 100644
--- a/bin/tests/system/checkconf/check-dlv-ksk-key.conf
+++ b/bin/tests/system/checkconf/check-dlv-ksk-key.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 trusted-keys {
diff --git a/bin/tests/system/checkconf/check-dup-records-fail.conf b/bin/tests/system/checkconf/check-dup-records-fail.conf
index 514b9dcb61b..684e8c6ee02 100644
--- a/bin/tests/system/checkconf/check-dup-records-fail.conf
+++ b/bin/tests/system/checkconf/check-dup-records-fail.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/check-dup-records.db b/bin/tests/system/checkconf/check-dup-records.db
index dd61a92a9ac..3d148e5d39c 100644
--- a/bin/tests/system/checkconf/check-dup-records.db
+++ b/bin/tests/system/checkconf/check-dup-records.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600	; 10 minutes
 @		IN SOA	mname1. . (
diff --git a/bin/tests/system/checkconf/check-mx-cname-fail.conf b/bin/tests/system/checkconf/check-mx-cname-fail.conf
index a081a9eb666..71292c8881b 100644
--- a/bin/tests/system/checkconf/check-mx-cname-fail.conf
+++ b/bin/tests/system/checkconf/check-mx-cname-fail.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/check-mx-cname.db b/bin/tests/system/checkconf/check-mx-cname.db
index dc1b918ec97..321c38e107d 100644
--- a/bin/tests/system/checkconf/check-mx-cname.db
+++ b/bin/tests/system/checkconf/check-mx-cname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600	; 10 minutes
 @		IN SOA	mname1. . (
diff --git a/bin/tests/system/checkconf/check-mx-fail.conf b/bin/tests/system/checkconf/check-mx-fail.conf
index f408a8dbf84..2eb8ad676bd 100644
--- a/bin/tests/system/checkconf/check-mx-fail.conf
+++ b/bin/tests/system/checkconf/check-mx-fail.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/check-mx.db b/bin/tests/system/checkconf/check-mx.db
index 10c5e103c89..28331b4a19e 100644
--- a/bin/tests/system/checkconf/check-mx.db
+++ b/bin/tests/system/checkconf/check-mx.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600	; 10 minutes
 @		IN SOA	mname1. . (
diff --git a/bin/tests/system/checkconf/check-names-fail.conf b/bin/tests/system/checkconf/check-names-fail.conf
index 55893ece910..9c0ac26eae8 100644
--- a/bin/tests/system/checkconf/check-names-fail.conf
+++ b/bin/tests/system/checkconf/check-names-fail.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/check-names.db b/bin/tests/system/checkconf/check-names.db
index 1629c745dcd..7763647fbcf 100644
--- a/bin/tests/system/checkconf/check-names.db
+++ b/bin/tests/system/checkconf/check-names.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600	; 10 minutes
 @		IN SOA	mname1. . (
diff --git a/bin/tests/system/checkconf/check-root-ksk-2010.conf b/bin/tests/system/checkconf/check-root-ksk-2010.conf
index 560b545158a..025564cc211 100644
--- a/bin/tests/system/checkconf/check-root-ksk-2010.conf
+++ b/bin/tests/system/checkconf/check-root-ksk-2010.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 trusted-keys {
diff --git a/bin/tests/system/checkconf/check-root-ksk-2017.conf b/bin/tests/system/checkconf/check-root-ksk-2017.conf
index bec3c8ed4f9..ebefd9c9778 100644
--- a/bin/tests/system/checkconf/check-root-ksk-2017.conf
+++ b/bin/tests/system/checkconf/check-root-ksk-2017.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 trusted-keys {
diff --git a/bin/tests/system/checkconf/check-root-ksk-both.conf b/bin/tests/system/checkconf/check-root-ksk-both.conf
index 09af02dd89c..aebf7f5b870 100644
--- a/bin/tests/system/checkconf/check-root-ksk-both.conf
+++ b/bin/tests/system/checkconf/check-root-ksk-both.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 trusted-keys {
diff --git a/bin/tests/system/checkconf/check-srv-cname-fail.conf b/bin/tests/system/checkconf/check-srv-cname-fail.conf
index f5d7c243b68..e84630729a0 100644
--- a/bin/tests/system/checkconf/check-srv-cname-fail.conf
+++ b/bin/tests/system/checkconf/check-srv-cname-fail.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/check-srv-cname.db b/bin/tests/system/checkconf/check-srv-cname.db
index 9ed7293515f..8bc71bdbe7d 100644
--- a/bin/tests/system/checkconf/check-srv-cname.db
+++ b/bin/tests/system/checkconf/check-srv-cname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600	; 10 minutes
 @		IN SOA	mname1. . (
diff --git a/bin/tests/system/checkconf/clean.sh b/bin/tests/system/checkconf/clean.sh
index a5212c905c2..9ac839b09dc 100644
--- a/bin/tests/system/checkconf/clean.sh
+++ b/bin/tests/system/checkconf/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014, 2016  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.
 
 rm -f good.conf.in good.conf.out badzero.conf *.out
 rm -rf test.keydir
diff --git a/bin/tests/system/checkconf/dlz-bad.conf b/bin/tests/system/checkconf/dlz-bad.conf
index dd896c2415a..de2f4da1fc8 100644
--- a/bin/tests/system/checkconf/dlz-bad.conf
+++ b/bin/tests/system/checkconf/dlz-bad.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/checkconf/dnssec.1 b/bin/tests/system/checkconf/dnssec.1
index b80814bd549..429bb4abc9a 100644
--- a/bin/tests/system/checkconf/dnssec.1
+++ b/bin/tests/system/checkconf/dnssec.1
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: dnssec.1,v 1.4 2011/05/08 07:12:47 marka Exp $ */
diff --git a/bin/tests/system/checkconf/dnssec.2 b/bin/tests/system/checkconf/dnssec.2
index 76aebd4900a..ee9fb4871e7 100644
--- a/bin/tests/system/checkconf/dnssec.2
+++ b/bin/tests/system/checkconf/dnssec.2
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: dnssec.2,v 1.5 2011/11/07 00:14:11 marka Exp $ */
diff --git a/bin/tests/system/checkconf/dnssec.3 b/bin/tests/system/checkconf/dnssec.3
index 87313c1ab29..a07a8cc6fd9 100644
--- a/bin/tests/system/checkconf/dnssec.3
+++ b/bin/tests/system/checkconf/dnssec.3
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016, 2017  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.
  */
 
 /* $Id: dnssec.3,v 1.5 2011/11/07 00:14:11 marka Exp $ */
diff --git a/bin/tests/system/checkconf/good-acl.conf b/bin/tests/system/checkconf/good-acl.conf
index c80ed0cd8a0..532189916a1 100644
--- a/bin/tests/system/checkconf/good-acl.conf
+++ b/bin/tests/system/checkconf/good-acl.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 acl a {
diff --git a/bin/tests/system/checkconf/good-class.conf b/bin/tests/system/checkconf/good-class.conf
index d10fcd9ee09..1839fe231ba 100644
--- a/bin/tests/system/checkconf/good-class.conf
+++ b/bin/tests/system/checkconf/good-class.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 view "example" class00 { };
diff --git a/bin/tests/system/checkconf/good-dlv-dlv.example.com.conf b/bin/tests/system/checkconf/good-dlv-dlv.example.com.conf
index fdcd6eac022..fd242bceb7e 100644
--- a/bin/tests/system/checkconf/good-dlv-dlv.example.com.conf
+++ b/bin/tests/system/checkconf/good-dlv-dlv.example.com.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/good-glue-cache.conf b/bin/tests/system/checkconf/good-glue-cache.conf
index 8802bc66c3d..f5e9f79ac32 100644
--- a/bin/tests/system/checkconf/good-glue-cache.conf
+++ b/bin/tests/system/checkconf/good-glue-cache.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf b/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf
index 5f06995ada7..a01fbc494a1 100644
--- a/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf
+++ b/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf b/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf
index 6a7a0998c7f..797395f83e8 100644
--- a/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf
+++ b/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/good-nested.conf b/bin/tests/system/checkconf/good-nested.conf
index 67f3dd20ee8..4523b40108f 100644
--- a/bin/tests/system/checkconf/good-nested.conf
+++ b/bin/tests/system/checkconf/good-nested.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 acl a { 127.0.0.1; ::1; };
diff --git a/bin/tests/system/checkconf/good-options-also-notify.conf b/bin/tests/system/checkconf/good-options-also-notify.conf
index 8225482dd19..fcb01638d96 100644
--- a/bin/tests/system/checkconf/good-options-also-notify.conf
+++ b/bin/tests/system/checkconf/good-options-also-notify.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/good-printtime.conf b/bin/tests/system/checkconf/good-printtime.conf
index 700e349452a..deff1d878a3 100644
--- a/bin/tests/system/checkconf/good-printtime.conf
+++ b/bin/tests/system/checkconf/good-printtime.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 logging {
diff --git a/bin/tests/system/checkconf/good-response-dot.conf b/bin/tests/system/checkconf/good-response-dot.conf
index dbfa3ec5b2a..68e511f9be2 100644
--- a/bin/tests/system/checkconf/good-response-dot.conf
+++ b/bin/tests/system/checkconf/good-response-dot.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 zone "example.com." {
diff --git a/bin/tests/system/checkconf/good-update-policy1.conf b/bin/tests/system/checkconf/good-update-policy1.conf
index 2685bbff056..8d345186bcc 100644
--- a/bin/tests/system/checkconf/good-update-policy1.conf
+++ b/bin/tests/system/checkconf/good-update-policy1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy10.conf b/bin/tests/system/checkconf/good-update-policy10.conf
index ddfeb817bce..60bea6b56fe 100644
--- a/bin/tests/system/checkconf/good-update-policy10.conf
+++ b/bin/tests/system/checkconf/good-update-policy10.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy11.conf b/bin/tests/system/checkconf/good-update-policy11.conf
index 3d486630712..ba6f396f5ba 100644
--- a/bin/tests/system/checkconf/good-update-policy11.conf
+++ b/bin/tests/system/checkconf/good-update-policy11.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy12.conf b/bin/tests/system/checkconf/good-update-policy12.conf
index f8df4552499..09bd926a4c6 100644
--- a/bin/tests/system/checkconf/good-update-policy12.conf
+++ b/bin/tests/system/checkconf/good-update-policy12.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy2.conf b/bin/tests/system/checkconf/good-update-policy2.conf
index 29cad1c427d..5b453e73072 100644
--- a/bin/tests/system/checkconf/good-update-policy2.conf
+++ b/bin/tests/system/checkconf/good-update-policy2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy3.conf b/bin/tests/system/checkconf/good-update-policy3.conf
index 08d6b101194..3f4cef24ab2 100644
--- a/bin/tests/system/checkconf/good-update-policy3.conf
+++ b/bin/tests/system/checkconf/good-update-policy3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy4.conf b/bin/tests/system/checkconf/good-update-policy4.conf
index 60819bc02d4..a3ef5343a32 100644
--- a/bin/tests/system/checkconf/good-update-policy4.conf
+++ b/bin/tests/system/checkconf/good-update-policy4.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy5.conf b/bin/tests/system/checkconf/good-update-policy5.conf
index 15be41273db..1f70f0c2f64 100644
--- a/bin/tests/system/checkconf/good-update-policy5.conf
+++ b/bin/tests/system/checkconf/good-update-policy5.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy6.conf b/bin/tests/system/checkconf/good-update-policy6.conf
index bb948ff00fe..ac43c48ddae 100644
--- a/bin/tests/system/checkconf/good-update-policy6.conf
+++ b/bin/tests/system/checkconf/good-update-policy6.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy7.conf b/bin/tests/system/checkconf/good-update-policy7.conf
index 56f127af9a7..96431a3e49b 100644
--- a/bin/tests/system/checkconf/good-update-policy7.conf
+++ b/bin/tests/system/checkconf/good-update-policy7.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy8.conf b/bin/tests/system/checkconf/good-update-policy8.conf
index 0412a22f77f..cd33559dda1 100644
--- a/bin/tests/system/checkconf/good-update-policy8.conf
+++ b/bin/tests/system/checkconf/good-update-policy8.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-update-policy9.conf b/bin/tests/system/checkconf/good-update-policy9.conf
index b5380cecf37..dcb5b461d91 100644
--- a/bin/tests/system/checkconf/good-update-policy9.conf
+++ b/bin/tests/system/checkconf/good-update-policy9.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 zone "example.com" {
diff --git a/bin/tests/system/checkconf/good-view-also-notify.conf b/bin/tests/system/checkconf/good-view-also-notify.conf
index 3d1268219d6..b8a46e98577 100644
--- a/bin/tests/system/checkconf/good-view-also-notify.conf
+++ b/bin/tests/system/checkconf/good-view-also-notify.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 view example {
diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf
index 9e07b096f3d..4c8eef2ca59 100644
--- a/bin/tests/system/checkconf/good.conf
+++ b/bin/tests/system/checkconf/good.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2010-2017  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.
  */
 
 /*
diff --git a/bin/tests/system/checkconf/hint-nofile.conf b/bin/tests/system/checkconf/hint-nofile.conf
index 6baa13bb405..f0ef89fb142 100644
--- a/bin/tests/system/checkconf/hint-nofile.conf
+++ b/bin/tests/system/checkconf/hint-nofile.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 zone "." {
diff --git a/bin/tests/system/checkconf/in-view-good.conf b/bin/tests/system/checkconf/in-view-good.conf
index 56dcc527ea3..3161c38131c 100644
--- a/bin/tests/system/checkconf/in-view-good.conf
+++ b/bin/tests/system/checkconf/in-view-good.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 view internal {
diff --git a/bin/tests/system/checkconf/inline-bad.conf b/bin/tests/system/checkconf/inline-bad.conf
index 14b7df7efef..011bea91bec 100644
--- a/bin/tests/system/checkconf/inline-bad.conf
+++ b/bin/tests/system/checkconf/inline-bad.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 acl "transferees" {};
diff --git a/bin/tests/system/checkconf/inline-good.conf b/bin/tests/system/checkconf/inline-good.conf
index 857b7458b71..8e3115b19ca 100644
--- a/bin/tests/system/checkconf/inline-good.conf
+++ b/bin/tests/system/checkconf/inline-good.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 acl "transferees" {};
diff --git a/bin/tests/system/checkconf/inline-no.conf b/bin/tests/system/checkconf/inline-no.conf
index e17b38f5160..c441fa9c9a8 100644
--- a/bin/tests/system/checkconf/inline-no.conf
+++ b/bin/tests/system/checkconf/inline-no.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 acl "transferees" {};
diff --git a/bin/tests/system/checkconf/max-cache-size-good.conf b/bin/tests/system/checkconf/max-cache-size-good.conf
index a5bfc5523ea..ff9dc8fc9ea 100644
--- a/bin/tests/system/checkconf/max-cache-size-good.conf
+++ b/bin/tests/system/checkconf/max-cache-size-good.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/max-ttl.conf b/bin/tests/system/checkconf/max-ttl.conf
index 479087c5d90..074bc2cbbd4 100644
--- a/bin/tests/system/checkconf/max-ttl.conf
+++ b/bin/tests/system/checkconf/max-ttl.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/maxttl-bad.conf b/bin/tests/system/checkconf/maxttl-bad.conf
index 52a64827bbc..ac4ca6548b7 100644
--- a/bin/tests/system/checkconf/maxttl-bad.conf
+++ b/bin/tests/system/checkconf/maxttl-bad.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/maxttl-bad.db b/bin/tests/system/checkconf/maxttl-bad.db
index 53ac5028176..9c8aa7e19e0 100644
--- a/bin/tests/system/checkconf/maxttl-bad.db
+++ b/bin/tests/system/checkconf/maxttl-bad.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
diff --git a/bin/tests/system/checkconf/maxttl.db b/bin/tests/system/checkconf/maxttl.db
index f5625f7f31a..21536b484f3 100644
--- a/bin/tests/system/checkconf/maxttl.db
+++ b/bin/tests/system/checkconf/maxttl.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600	; 10 minutes
 @                       IN SOA	mname1. . (
diff --git a/bin/tests/system/checkconf/notify.conf b/bin/tests/system/checkconf/notify.conf
index 72b02564fb2..60c4f15dda7 100644
--- a/bin/tests/system/checkconf/notify.conf
+++ b/bin/tests/system/checkconf/notify.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 view one {
diff --git a/bin/tests/system/checkconf/portrange-good.conf b/bin/tests/system/checkconf/portrange-good.conf
index 201d84416db..e02097f138a 100644
--- a/bin/tests/system/checkconf/portrange-good.conf
+++ b/bin/tests/system/checkconf/portrange-good.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/range.conf b/bin/tests/system/checkconf/range.conf
index d74efc693bf..a7f94d9f50b 100644
--- a/bin/tests/system/checkconf/range.conf
+++ b/bin/tests/system/checkconf/range.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/shared.example.db b/bin/tests/system/checkconf/shared.example.db
index 936a13c1a2d..7b40db9c33e 100644
--- a/bin/tests/system/checkconf/shared.example.db
+++ b/bin/tests/system/checkconf/shared.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 @	0	SOA	. . 0 0 0 0 0
 @	0	NS	.
diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 78c3a5e3d72..89b6fdaef32 100644
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2005, 2007, 2010-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checkconf/view-class-any1.conf b/bin/tests/system/checkconf/view-class-any1.conf
index 3fffab2d811..9832ce02aa7 100644
--- a/bin/tests/system/checkconf/view-class-any1.conf
+++ b/bin/tests/system/checkconf/view-class-any1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 view "example" any { };
diff --git a/bin/tests/system/checkconf/view-class-any2.conf b/bin/tests/system/checkconf/view-class-any2.conf
index 336383fd6e2..03f08030df3 100644
--- a/bin/tests/system/checkconf/view-class-any2.conf
+++ b/bin/tests/system/checkconf/view-class-any2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 view "example" class255 { };
diff --git a/bin/tests/system/checkconf/view-class-in1.conf b/bin/tests/system/checkconf/view-class-in1.conf
index d159131d776..794f9e00de5 100644
--- a/bin/tests/system/checkconf/view-class-in1.conf
+++ b/bin/tests/system/checkconf/view-class-in1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 view "example" in { };
diff --git a/bin/tests/system/checkconf/view-class-in2.conf b/bin/tests/system/checkconf/view-class-in2.conf
index a664ea1322c..c519b1a66b0 100644
--- a/bin/tests/system/checkconf/view-class-in2.conf
+++ b/bin/tests/system/checkconf/view-class-in2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 view "example" class1 { };
diff --git a/bin/tests/system/checkconf/warn-dlv-auto.conf b/bin/tests/system/checkconf/warn-dlv-auto.conf
index bf58a35fd65..3ba734204f1 100644
--- a/bin/tests/system/checkconf/warn-dlv-auto.conf
+++ b/bin/tests/system/checkconf/warn-dlv-auto.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/warn-dlv-dlv.isc.org.conf b/bin/tests/system/checkconf/warn-dlv-dlv.isc.org.conf
index f7e5937d6ab..49b11bc56c3 100644
--- a/bin/tests/system/checkconf/warn-dlv-dlv.isc.org.conf
+++ b/bin/tests/system/checkconf/warn-dlv-dlv.isc.org.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/checkconf/warn-keydir.conf b/bin/tests/system/checkconf/warn-keydir.conf
index 76a13b2ec18..502a4f3d30a 100644
--- a/bin/tests/system/checkconf/warn-keydir.conf
+++ b/bin/tests/system/checkconf/warn-keydir.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /*
diff --git a/bin/tests/system/checkds/clean.sh b/bin/tests/system/checkds/clean.sh
index 9540f898821..e4ad79edd20 100644
--- a/bin/tests/system/checkds/clean.sh
+++ b/bin/tests/system/checkds/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014, 2016, 2017  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.
 
 rm -f checkds.*
 rm -f ns*/named.lock
diff --git a/bin/tests/system/checkds/dig.pl b/bin/tests/system/checkds/dig.pl
index 45e470646b1..35cf973e5d8 100644
--- a/bin/tests/system/checkds/dig.pl
+++ b/bin/tests/system/checkds/dig.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2014, 2016, 2017  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.
 
 my $arg;
 my $ext;
diff --git a/bin/tests/system/checkds/dig.sh b/bin/tests/system/checkds/dig.sh
index 289adf261f6..41354fa627a 100755
--- a/bin/tests/system/checkds/dig.sh
+++ b/bin/tests/system/checkds/dig.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2013, 2016, 2017  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.
 
 while [ "$#" != 0 ]; do
     case $1 in
diff --git a/bin/tests/system/checkds/setup.sh b/bin/tests/system/checkds/setup.sh
index 81f00e6c7ff..1405375c032 100644
--- a/bin/tests/system/checkds/setup.sh
+++ b/bin/tests/system/checkds/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checkds/tests.sh b/bin/tests/system/checkds/tests.sh
index ba82ef34460..d8e0eefc8c8 100644
--- a/bin/tests/system/checkds/tests.sh
+++ b/bin/tests/system/checkds/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh
index 2e7e80cb773..83073f9e6e0 100644
--- a/bin/tests/system/checknames/clean.sh
+++ b/bin/tests/system/checknames/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 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.
 
 rm -f ns*/named.conf
 rm -f dig.out.ns?.test*
diff --git a/bin/tests/system/checknames/ns1/fail.example.db.in b/bin/tests/system/checknames/ns1/fail.example.db.in
index e069a3b9e15..cb61359f090 100644
--- a/bin/tests/system/checknames/ns1/fail.example.db.in
+++ b/bin/tests/system/checknames/ns1/fail.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: fail.example.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns1/fail.update.db.in b/bin/tests/system/checknames/ns1/fail.update.db.in
index f378804c8b6..b0c65797417 100644
--- a/bin/tests/system/checknames/ns1/fail.update.db.in
+++ b/bin/tests/system/checknames/ns1/fail.update.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: fail.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns1/ignore.example.db.in b/bin/tests/system/checknames/ns1/ignore.example.db.in
index 18bff573ecd..f99ba478a2c 100644
--- a/bin/tests/system/checknames/ns1/ignore.example.db.in
+++ b/bin/tests/system/checknames/ns1/ignore.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: ignore.example.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns1/ignore.update.db.in b/bin/tests/system/checknames/ns1/ignore.update.db.in
index 9be34096275..1c77f119c34 100644
--- a/bin/tests/system/checknames/ns1/ignore.update.db.in
+++ b/bin/tests/system/checknames/ns1/ignore.update.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: ignore.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns1/named.conf.in b/bin/tests/system/checknames/ns1/named.conf.in
index 182e559ead4..99b8004eb42 100644
--- a/bin/tests/system/checknames/ns1/named.conf.in
+++ b/bin/tests/system/checknames/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/checknames/ns1/root.db b/bin/tests/system/checknames/ns1/root.db
index 2a41146ac4b..a47e05191de 100644
--- a/bin/tests/system/checknames/ns1/root.db
+++ b/bin/tests/system/checknames/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns1/warn.example.db.in b/bin/tests/system/checknames/ns1/warn.example.db.in
index 04591dcbacf..eccd876634e 100644
--- a/bin/tests/system/checknames/ns1/warn.example.db.in
+++ b/bin/tests/system/checknames/ns1/warn.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: warn.example.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns1/warn.update.db.in b/bin/tests/system/checknames/ns1/warn.update.db.in
index a1c80c1123d..28230ae70e3 100644
--- a/bin/tests/system/checknames/ns1/warn.update.db.in
+++ b/bin/tests/system/checknames/ns1/warn.update.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: warn.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns2/named.conf.in b/bin/tests/system/checknames/ns2/named.conf.in
index df38af2d981..ed625e53e55 100644
--- a/bin/tests/system/checknames/ns2/named.conf.in
+++ b/bin/tests/system/checknames/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/checknames/ns2/root.hints b/bin/tests/system/checknames/ns2/root.hints
index 5bd961dc9b1..05378430f0c 100644
--- a/bin/tests/system/checknames/ns2/root.hints
+++ b/bin/tests/system/checknames/ns2/root.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: root.hints,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns3/named.conf.in b/bin/tests/system/checknames/ns3/named.conf.in
index 052a9dcf475..5e6034f0033 100644
--- a/bin/tests/system/checknames/ns3/named.conf.in
+++ b/bin/tests/system/checknames/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/checknames/ns3/root.hints b/bin/tests/system/checknames/ns3/root.hints
index 5bd961dc9b1..05378430f0c 100644
--- a/bin/tests/system/checknames/ns3/root.hints
+++ b/bin/tests/system/checknames/ns3/root.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: root.hints,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns4/master-ignore.update.db.in b/bin/tests/system/checknames/ns4/master-ignore.update.db.in
index c14cee9585c..1c77f119c34 100644
--- a/bin/tests/system/checknames/ns4/master-ignore.update.db.in
+++ b/bin/tests/system/checknames/ns4/master-ignore.update.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id: ignore.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/ns4/named.conf.in b/bin/tests/system/checknames/ns4/named.conf.in
index 4272c8f348b..f37d543899b 100644
--- a/bin/tests/system/checknames/ns4/named.conf.in
+++ b/bin/tests/system/checknames/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/checknames/ns4/root.hints b/bin/tests/system/checknames/ns4/root.hints
index b663ebcb008..05378430f0c 100644
--- a/bin/tests/system/checknames/ns4/root.hints
+++ b/bin/tests/system/checknames/ns4/root.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id: root.hints,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh
index 3ce5c852a41..28d0c448252 100644
--- a/bin/tests/system/checknames/setup.sh
+++ b/bin/tests/system/checknames/setup.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2004, 2007, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh
index 22fa2e3f517..eae657454b3 100644
--- a/bin/tests/system/checknames/tests.sh
+++ b/bin/tests/system/checknames/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checkzone/clean.sh b/bin/tests/system/checkzone/clean.sh
index 8fa735592f6..95d3caaaae6 100644
--- a/bin/tests/system/checkzone/clean.sh
+++ b/bin/tests/system/checkzone/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2011-2014, 2016  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.
 
 rm -f test.* good1.db.map good1.db.raw named-compilezone
 rm -f ns*/named.lock
diff --git a/bin/tests/system/checkzone/setup.sh b/bin/tests/system/checkzone/setup.sh
index cfa7cccd07e..5fde7f6650d 100644
--- a/bin/tests/system/checkzone/setup.sh
+++ b/bin/tests/system/checkzone/setup.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index 4b0c1a04b85..96215663b5c 100644
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/checkzone/zones/bad-caa-rr.db b/bin/tests/system/checkzone/zones/bad-caa-rr.db
index 2964986b933..9d22cd33273 100644
Binary files a/bin/tests/system/checkzone/zones/bad-caa-rr.db and b/bin/tests/system/checkzone/zones/bad-caa-rr.db differ
diff --git a/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db b/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db
index 63ed4950aea..9635a7ab1e4 100644
--- a/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db
+++ b/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 	60
 @	IN	SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/checkzone/zones/bad-generate-tkey.db b/bin/tests/system/checkzone/zones/bad-generate-tkey.db
index c50b7d2fbb0..f86f15c7934 100644
--- a/bin/tests/system/checkzone/zones/bad-generate-tkey.db
+++ b/bin/tests/system/checkzone/zones/bad-generate-tkey.db
@@ -1,8 +1,11 @@
-; Copyright (C) 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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad-nsap-empty.db b/bin/tests/system/checkzone/zones/bad-nsap-empty.db
index 86c8fbdf270..3ed2451a8a2 100644
--- a/bin/tests/system/checkzone/zones/bad-nsap-empty.db
+++ b/bin/tests/system/checkzone/zones/bad-nsap-empty.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad-nsap-odd-nibble.db b/bin/tests/system/checkzone/zones/bad-nsap-odd-nibble.db
index 1b31a6a4162..f8c82f5a073 100644
--- a/bin/tests/system/checkzone/zones/bad-nsap-odd-nibble.db
+++ b/bin/tests/system/checkzone/zones/bad-nsap-odd-nibble.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad-nsec3-padded.db b/bin/tests/system/checkzone/zones/bad-nsec3-padded.db
index 283a5b88d20..77d8ead2ab7 100644
--- a/bin/tests/system/checkzone/zones/bad-nsec3-padded.db
+++ b/bin/tests/system/checkzone/zones/bad-nsec3-padded.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad-nsec3owner-padded.db b/bin/tests/system/checkzone/zones/bad-nsec3owner-padded.db
index 95d7da4dc68..3f9bbb6a9c8 100644
--- a/bin/tests/system/checkzone/zones/bad-nsec3owner-padded.db
+++ b/bin/tests/system/checkzone/zones/bad-nsec3owner-padded.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad-tkey.db b/bin/tests/system/checkzone/zones/bad-tkey.db
index ae5d068f50c..00f25db9a88 100644
--- a/bin/tests/system/checkzone/zones/bad-tkey.db
+++ b/bin/tests/system/checkzone/zones/bad-tkey.db
@@ -1,8 +1,11 @@
-; Copyright (C) 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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad-tsig.db b/bin/tests/system/checkzone/zones/bad-tsig.db
index 4867f45e78c..76af2e9a2b1 100644
--- a/bin/tests/system/checkzone/zones/bad-tsig.db
+++ b/bin/tests/system/checkzone/zones/bad-tsig.db
@@ -1,8 +1,11 @@
-; Copyright (C) 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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad-unspec.db b/bin/tests/system/checkzone/zones/bad-unspec.db
index 0b258e12e9d..2352ff95f0e 100644
--- a/bin/tests/system/checkzone/zones/bad-unspec.db
+++ b/bin/tests/system/checkzone/zones/bad-unspec.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad1.db b/bin/tests/system/checkzone/zones/bad1.db
index 06410db0e79..c17ab0cdf8d 100644
Binary files a/bin/tests/system/checkzone/zones/bad1.db and b/bin/tests/system/checkzone/zones/bad1.db differ
diff --git a/bin/tests/system/checkzone/zones/bad2.db b/bin/tests/system/checkzone/zones/bad2.db
index aae35ef9d0c..e6afacdd4a3 100644
--- a/bin/tests/system/checkzone/zones/bad2.db
+++ b/bin/tests/system/checkzone/zones/bad2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad3.db b/bin/tests/system/checkzone/zones/bad3.db
index d33f09aefd2..44e45e51024 100644
--- a/bin/tests/system/checkzone/zones/bad3.db
+++ b/bin/tests/system/checkzone/zones/bad3.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/bad4.db b/bin/tests/system/checkzone/zones/bad4.db
index 5e80ced163c..4e6ec79b180 100644
--- a/bin/tests/system/checkzone/zones/bad4.db
+++ b/bin/tests/system/checkzone/zones/bad4.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/badttl.db b/bin/tests/system/checkzone/zones/badttl.db
index 4c485591fd9..43fb41a3ca0 100644
--- a/bin/tests/system/checkzone/zones/badttl.db
+++ b/bin/tests/system/checkzone/zones/badttl.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 
 $TTL
diff --git a/bin/tests/system/checkzone/zones/crashzone.db b/bin/tests/system/checkzone/zones/crashzone.db
index c4cdfc0e23c..c390d0c13e2 100644
--- a/bin/tests/system/checkzone/zones/crashzone.db
+++ b/bin/tests/system/checkzone/zones/crashzone.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 dyn.example.net.	7200	IN SOA	ns1.example.net. hostmaster.example.net. (
 					6  ; serial
diff --git a/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db b/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db
index 9d46e9a7c31..d26f51b5d6a 100644
--- a/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db
+++ b/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300
 example.com.		SOA	marka.isc.org. a.root.servers.nil. (
diff --git a/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db b/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db
index a1843c6ec10..566ce5b3e96 100644
--- a/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db
+++ b/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 	60
 @	IN	SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/checkzone/zones/good-gc-msdcs.db b/bin/tests/system/checkzone/zones/good-gc-msdcs.db
index 9bf3864fea8..cf9bc745855 100644
--- a/bin/tests/system/checkzone/zones/good-gc-msdcs.db
+++ b/bin/tests/system/checkzone/zones/good-gc-msdcs.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/good-nsap.db b/bin/tests/system/checkzone/zones/good-nsap.db
index 6a8576f485d..c7bc655a1c2 100644
--- a/bin/tests/system/checkzone/zones/good-nsap.db
+++ b/bin/tests/system/checkzone/zones/good-nsap.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/good-nsec3-nopadhash.db b/bin/tests/system/checkzone/zones/good-nsec3-nopadhash.db
index e48b4e8a85e..4b4d4e4c578 100644
--- a/bin/tests/system/checkzone/zones/good-nsec3-nopadhash.db
+++ b/bin/tests/system/checkzone/zones/good-nsec3-nopadhash.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 600
 @		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
diff --git a/bin/tests/system/checkzone/zones/good-occulted-ns-by-dname.db b/bin/tests/system/checkzone/zones/good-occulted-ns-by-dname.db
index 66084e615a1..caa78561aac 100644
--- a/bin/tests/system/checkzone/zones/good-occulted-ns-by-dname.db
+++ b/bin/tests/system/checkzone/zones/good-occulted-ns-by-dname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300
 example.	SOA	marka.isc.org. a.root.servers.nil. (
diff --git a/bin/tests/system/checkzone/zones/good-occulted-ns-by-ns.db b/bin/tests/system/checkzone/zones/good-occulted-ns-by-ns.db
index 7e40dc8bfd9..bdc8c6b3357 100644
--- a/bin/tests/system/checkzone/zones/good-occulted-ns-by-ns.db
+++ b/bin/tests/system/checkzone/zones/good-occulted-ns-by-ns.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300
 example.		SOA	marka.isc.org. a.root.servers.nil. (
diff --git a/bin/tests/system/checkzone/zones/good1.db b/bin/tests/system/checkzone/zones/good1.db
index f89b3798af8..3c1b74b2003 100644
--- a/bin/tests/system/checkzone/zones/good1.db
+++ b/bin/tests/system/checkzone/zones/good1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: good1.db,v 1.2 2011/03/02 04:20:34 marka Exp $
 
diff --git a/bin/tests/system/checkzone/zones/inherit.db b/bin/tests/system/checkzone/zones/inherit.db
index 8cf0ec09bac..61c9d2a4975 100644
--- a/bin/tests/system/checkzone/zones/inherit.db
+++ b/bin/tests/system/checkzone/zones/inherit.db
@@ -1,7 +1,10 @@
-; Copyright (C) 2014, 2016  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.
 
 	NS .
diff --git a/bin/tests/system/checkzone/zones/nowarn.inherited.owner.db b/bin/tests/system/checkzone/zones/nowarn.inherited.owner.db
index 292eceff341..4083210eb51 100644
--- a/bin/tests/system/checkzone/zones/nowarn.inherited.owner.db
+++ b/bin/tests/system/checkzone/zones/nowarn.inherited.owner.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @ 0 IN SOA . . 0 0 0 0 0
 $INCLUDE "zones/inherit.db"
diff --git a/bin/tests/system/checkzone/zones/ns-address-below-dname.db b/bin/tests/system/checkzone/zones/ns-address-below-dname.db
index 56d8d11c5b3..7e65e577aef 100644
--- a/bin/tests/system/checkzone/zones/ns-address-below-dname.db
+++ b/bin/tests/system/checkzone/zones/ns-address-below-dname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300
 example.com.		SOA	marka.isc.org. a.root.servers.nil. (
diff --git a/bin/tests/system/checkzone/zones/spf.db b/bin/tests/system/checkzone/zones/spf.db
index aa008b4a18f..6c0e7e5512e 100644
--- a/bin/tests/system/checkzone/zones/spf.db
+++ b/bin/tests/system/checkzone/zones/spf.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 @ 0 IN SOA . . 0 0 0 0 0
 @ 0 IN NS .
diff --git a/bin/tests/system/checkzone/zones/test1.db b/bin/tests/system/checkzone/zones/test1.db
index 1ef215c7769..bb75d3ce820 100644
--- a/bin/tests/system/checkzone/zones/test1.db
+++ b/bin/tests/system/checkzone/zones/test1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 
 $TTL 600
diff --git a/bin/tests/system/checkzone/zones/test2.db b/bin/tests/system/checkzone/zones/test2.db
index 7d86dee86ce..cee52ca6c50 100644
--- a/bin/tests/system/checkzone/zones/test2.db
+++ b/bin/tests/system/checkzone/zones/test2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 
 $TTL 600
diff --git a/bin/tests/system/checkzone/zones/warn.inherit.origin.db b/bin/tests/system/checkzone/zones/warn.inherit.origin.db
index b4f2f0b930f..5057cd95365 100644
--- a/bin/tests/system/checkzone/zones/warn.inherit.origin.db
+++ b/bin/tests/system/checkzone/zones/warn.inherit.origin.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @ 0 IN SOA . . 0 0 0 0 0
 $ORIGIN @
diff --git a/bin/tests/system/checkzone/zones/warn.inherited.owner.db b/bin/tests/system/checkzone/zones/warn.inherited.owner.db
index b7c2b533dbf..0879149f6d1 100644
--- a/bin/tests/system/checkzone/zones/warn.inherited.owner.db
+++ b/bin/tests/system/checkzone/zones/warn.inherited.owner.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @ 0 IN SOA . . 0 0 0 0 0
 $INCLUDE "zones/inherit.db" @
diff --git a/bin/tests/system/clean.sh b/bin/tests/system/clean.sh
index 89a7a06f494..2306ac6cd04 100644
--- a/bin/tests/system/clean.sh
+++ b/bin/tests/system/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 #
 # Clean up after a specified system test.
diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 06b7a5b6ea0..7e800b90171 100644
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-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.
 
 #
 # Clean up after system tests.
diff --git a/bin/tests/system/cleanpkcs11.sh b/bin/tests/system/cleanpkcs11.sh
index e545ad221bf..4096c0bea26 100644
--- a/bin/tests/system/cleanpkcs11.sh
+++ b/bin/tests/system/cleanpkcs11.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 # $Id: cleanpkcs11.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $
 
diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf
index 6ab7cdce893..1a2cb7815d1 100644
--- a/bin/tests/system/common/controls.conf
+++ b/bin/tests/system/common/controls.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 /* $Id: controls.conf,v 1.6 2007/06/19 23:47:01 tbox Exp $ */
diff --git a/bin/tests/system/common/controls.conf.in b/bin/tests/system/common/controls.conf.in
index 2bcd95f4922..69581151d01 100644
--- a/bin/tests/system/common/controls.conf.in
+++ b/bin/tests/system/common/controls.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/common/rndc.conf b/bin/tests/system/common/rndc.conf
index 1934d5d8708..da9d784ed81 100644
--- a/bin/tests/system/common/rndc.conf
+++ b/bin/tests/system/common/rndc.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  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.
  */
 
 /* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */
diff --git a/bin/tests/system/common/rndc.key b/bin/tests/system/common/rndc.key
index 8dbfaaf30b1..7a0f79f9c68 100644
--- a/bin/tests/system/common/rndc.key
+++ b/bin/tests/system/common/rndc.key
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2013, 2016  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.
  */
 
 /* $Id: rndc.key,v 1.3 2011/03/12 04:59:47 tbox Exp $ */
diff --git a/bin/tests/system/common/root.hint b/bin/tests/system/common/root.hint
index 274ec9a8457..7f5cc13dbb6 100644
--- a/bin/tests/system/common/root.hint
+++ b/bin/tests/system/common/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.hint,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 0047b552ccc..62323ffd4bc 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-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.
 
 #
 # Common configuration data for system tests, to be sourced into
diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index a41214be6f6..c17dcae7917 100644
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 #
 # Common configuration data for system tests, to be sourced into
diff --git a/bin/tests/system/cookie/bad-cookie-badhex.conf b/bin/tests/system/cookie/bad-cookie-badhex.conf
index 2d30e88af48..318425f96a5 100644
--- a/bin/tests/system/cookie/bad-cookie-badhex.conf
+++ b/bin/tests/system/cookie/bad-cookie-badhex.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 options {
diff --git a/bin/tests/system/cookie/bad-cookie-badsha1.conf b/bin/tests/system/cookie/bad-cookie-badsha1.conf
index a2c91d83c86..f22dd49e836 100644
--- a/bin/tests/system/cookie/bad-cookie-badsha1.conf
+++ b/bin/tests/system/cookie/bad-cookie-badsha1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/cookie/bad-cookie-badsha256.conf b/bin/tests/system/cookie/bad-cookie-badsha256.conf
index 3ccf77199cc..3442099a685 100644
--- a/bin/tests/system/cookie/bad-cookie-badsha256.conf
+++ b/bin/tests/system/cookie/bad-cookie-badsha256.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/cookie/bad-cookie-toolong.conf b/bin/tests/system/cookie/bad-cookie-toolong.conf
index c45d49b01f0..3171b3c567b 100644
--- a/bin/tests/system/cookie/bad-cookie-toolong.conf
+++ b/bin/tests/system/cookie/bad-cookie-toolong.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 options {
diff --git a/bin/tests/system/cookie/clean.sh b/bin/tests/system/cookie/clean.sh
index f83d7366dc3..01abbc8f6a6 100644
--- a/bin/tests/system/cookie/clean.sh
+++ b/bin/tests/system/cookie/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f ns*/named.conf
 rm -f dig.out.*
diff --git a/bin/tests/system/cookie/good-cookie-sha1.conf b/bin/tests/system/cookie/good-cookie-sha1.conf
index 82a1f358181..315732bfbf3 100644
--- a/bin/tests/system/cookie/good-cookie-sha1.conf
+++ b/bin/tests/system/cookie/good-cookie-sha1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/cookie/good-cookie-sha256.conf b/bin/tests/system/cookie/good-cookie-sha256.conf
index b91ee17e176..2fe68f2e450 100644
--- a/bin/tests/system/cookie/good-cookie-sha256.conf
+++ b/bin/tests/system/cookie/good-cookie-sha256.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/cookie/ns1/example.db b/bin/tests/system/cookie/ns1/example.db
index 88e03fb6fed..fae6856e80e 100644
--- a/bin/tests/system/cookie/ns1/example.db
+++ b/bin/tests/system/cookie/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014-2016  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.
 
 @	SOA	ns1 hostmaster.isc.org. 1 600 600 1200 600
 @ 	NS	ns1
diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.in
index dbfb3b67396..a924e6bc4c7 100644
--- a/bin/tests/system/cookie/ns1/named.conf.in
+++ b/bin/tests/system/cookie/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/cookie/ns1/root.hint b/bin/tests/system/cookie/ns1/root.hint
index 2d75a29cf3c..6671358152a 100644
--- a/bin/tests/system/cookie/ns1/root.hint
+++ b/bin/tests/system/cookie/ns1/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2014-2016  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.
 
 ; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/cookie/ns2/named.conf.in b/bin/tests/system/cookie/ns2/named.conf.in
index 7f4e070abd8..99fb6d26609 100644
--- a/bin/tests/system/cookie/ns2/named.conf.in
+++ b/bin/tests/system/cookie/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-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.
  */
 
 options {
diff --git a/bin/tests/system/cookie/ns2/root.db b/bin/tests/system/cookie/ns2/root.db
index a0d7cd91f19..96410eeffd3 100644
--- a/bin/tests/system/cookie/ns2/root.db
+++ b/bin/tests/system/cookie/ns2/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014-2016  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.
 
 @	SOA	a.root-servers.nil. hostmaster.isc.org. 1 600 600 1200 600
 @ 	NS	a.root-servers.nil.
diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.in
index d6ba8cdfb9f..93f0ae1209c 100644
--- a/bin/tests/system/cookie/ns3/named.conf.in
+++ b/bin/tests/system/cookie/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/cookie/ns3/root.hint b/bin/tests/system/cookie/ns3/root.hint
index be5c782c67e..6671358152a 100644
--- a/bin/tests/system/cookie/ns3/root.hint
+++ b/bin/tests/system/cookie/ns3/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 ; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/cookie/ns4/named.conf.in b/bin/tests/system/cookie/ns4/named.conf.in
index f2dfaa23c43..cd7c07f23c1 100644
--- a/bin/tests/system/cookie/ns4/named.conf.in
+++ b/bin/tests/system/cookie/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/cookie/ns4/root.hint b/bin/tests/system/cookie/ns4/root.hint
index dfb0a86a4d7..6671358152a 100644
--- a/bin/tests/system/cookie/ns4/root.hint
+++ b/bin/tests/system/cookie/ns4/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/cookie/ns5/named.conf.in b/bin/tests/system/cookie/ns5/named.conf.in
index a8eec7854e4..0d050a62eab 100644
--- a/bin/tests/system/cookie/ns5/named.conf.in
+++ b/bin/tests/system/cookie/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/cookie/ns5/root.hint b/bin/tests/system/cookie/ns5/root.hint
index dfb0a86a4d7..6671358152a 100644
--- a/bin/tests/system/cookie/ns5/root.hint
+++ b/bin/tests/system/cookie/ns5/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/cookie/ns6/named.conf.in b/bin/tests/system/cookie/ns6/named.conf.in
index 5fa38782d5a..634a939bd94 100644
--- a/bin/tests/system/cookie/ns6/named.conf.in
+++ b/bin/tests/system/cookie/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/cookie/ns6/root.hint b/bin/tests/system/cookie/ns6/root.hint
index dfb0a86a4d7..6671358152a 100644
--- a/bin/tests/system/cookie/ns6/root.hint
+++ b/bin/tests/system/cookie/ns6/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/cookie/setup.sh b/bin/tests/system/cookie/setup.sh
index d1c5f548709..2e90ba22c33 100644
--- a/bin/tests/system/cookie/setup.sh
+++ b/bin/tests/system/cookie/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh
index 68ab36fc94e..bb96cbde019 100755
--- a/bin/tests/system/cookie/tests.sh
+++ b/bin/tests/system/cookie/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/coverage/clean.sh b/bin/tests/system/coverage/clean.sh
index ade04eb381d..253e8aaca59 100644
--- a/bin/tests/system/coverage/clean.sh
+++ b/bin/tests/system/coverage/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016  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.
 
 rm -f named-compilezone
 rm -f */K*.key
diff --git a/bin/tests/system/coverage/prereq.sh b/bin/tests/system/coverage/prereq.sh
index aa00083191e..a0d4e9ce14a 100644
--- a/bin/tests/system/coverage/prereq.sh
+++ b/bin/tests/system/coverage/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/coverage/setup.sh b/bin/tests/system/coverage/setup.sh
index 826a6b8ce2e..cee4dffdec7 100644
--- a/bin/tests/system/coverage/setup.sh
+++ b/bin/tests/system/coverage/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/coverage/tests.sh b/bin/tests/system/coverage/tests.sh
index 8f0acf2130e..c5ba2117f48 100644
--- a/bin/tests/system/coverage/tests.sh
+++ b/bin/tests/system/coverage/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh
index afc02a82391..5a08ae0c744 100644
--- a/bin/tests/system/database/clean.sh
+++ b/bin/tests/system/database/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 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.
 
 rm -f ns1/named.conf ns1/named.run ns1/named.memstats
 rm -f dig.out.*
diff --git a/bin/tests/system/database/ns1/named1.conf.in b/bin/tests/system/database/ns1/named1.conf.in
index f16989ccdff..8fa82ae050f 100644
--- a/bin/tests/system/database/ns1/named1.conf.in
+++ b/bin/tests/system/database/ns1/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 // NS1
diff --git a/bin/tests/system/database/ns1/named2.conf.in b/bin/tests/system/database/ns1/named2.conf.in
index 3851d40faeb..8238f548b7a 100644
--- a/bin/tests/system/database/ns1/named2.conf.in
+++ b/bin/tests/system/database/ns1/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 // NS1
diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh
index ee733a90b6c..083ebf34af7 100644
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 8ac0588507f..7fa9337bca5 100644
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/delzone/clean.sh b/bin/tests/system/delzone/clean.sh
index c313f083f99..9a1c79fd7f5 100644
--- a/bin/tests/system/delzone/clean.sh
+++ b/bin/tests/system/delzone/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  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.
 
 rm -f dig.out.*
 rm -f rndc.out*
diff --git a/bin/tests/system/delzone/ns1/inlineslave.db b/bin/tests/system/delzone/ns1/inlineslave.db
index b815bd4bb2b..625349ec4d9 100644
--- a/bin/tests/system/delzone/ns1/inlineslave.db
+++ b/bin/tests/system/delzone/ns1/inlineslave.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $ORIGIN inlineslave.example.
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/delzone/ns1/named.conf b/bin/tests/system/delzone/ns1/named.conf
index 531eb964da3..8b6c4415ad8 100644
--- a/bin/tests/system/delzone/ns1/named.conf
+++ b/bin/tests/system/delzone/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 controls { /* empty */ };
diff --git a/bin/tests/system/delzone/ns2/added.db b/bin/tests/system/delzone/ns2/added.db
index a792468bd5d..9b54d19204d 100644
--- a/bin/tests/system/delzone/ns2/added.db
+++ b/bin/tests/system/delzone/ns2/added.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 ;$ORIGIN added.example.
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/delzone/ns2/named.conf b/bin/tests/system/delzone/ns2/named.conf
index 503d3341693..8532e500df6 100644
--- a/bin/tests/system/delzone/ns2/named.conf
+++ b/bin/tests/system/delzone/ns2/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/delzone/ns2/normal.db b/bin/tests/system/delzone/ns2/normal.db
index 32f55597d93..50450928e96 100644
--- a/bin/tests/system/delzone/ns2/normal.db
+++ b/bin/tests/system/delzone/ns2/normal.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $ORIGIN normal.example.
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/delzone/setup.sh b/bin/tests/system/delzone/setup.sh
index 4089384b36a..1405375c032 100644
--- a/bin/tests/system/delzone/setup.sh
+++ b/bin/tests/system/delzone/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/delzone/tests.sh b/bin/tests/system/delzone/tests.sh
index 8bf7a95f5be..dd0a2dec189 100755
--- a/bin/tests/system/delzone/tests.sh
+++ b/bin/tests/system/delzone/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dialup/ns1/example.db b/bin/tests/system/dialup/ns1/example.db
index 87c9cf18723..14fe49ed725 100644
--- a/bin/tests/system/dialup/ns1/example.db
+++ b/bin/tests/system/dialup/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example.db,v 1.6 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf
index 6df9f4fc8d0..99767c1cb45 100644
--- a/bin/tests/system/dialup/ns1/named.conf
+++ b/bin/tests/system/dialup/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: named.conf,v 1.8 2007/06/19 23:47:01 tbox Exp $ */
diff --git a/bin/tests/system/dialup/ns1/root.db b/bin/tests/system/dialup/ns1/root.db
index 971839c82fa..ad26e691816 100644
--- a/bin/tests/system/dialup/ns1/root.db
+++ b/bin/tests/system/dialup/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.6 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/dialup/ns2/hint.db b/bin/tests/system/dialup/ns2/hint.db
index 4ece1f25f4f..d15ffb71322 100644
--- a/bin/tests/system/dialup/ns2/hint.db
+++ b/bin/tests/system/dialup/ns2/hint.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: hint.db,v 1.6 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf
index 1dccd0a075d..7980c664a61 100644
--- a/bin/tests/system/dialup/ns2/named.conf
+++ b/bin/tests/system/dialup/ns2/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: named.conf,v 1.8 2007/06/19 23:47:02 tbox Exp $ */
diff --git a/bin/tests/system/dialup/ns3/hint.db b/bin/tests/system/dialup/ns3/hint.db
index 1075adb9c09..8b422f5096f 100644
--- a/bin/tests/system/dialup/ns3/hint.db
+++ b/bin/tests/system/dialup/ns3/hint.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: hint.db,v 1.6 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf
index 100a10b472b..73a337d7285 100644
--- a/bin/tests/system/dialup/ns3/named.conf
+++ b/bin/tests/system/dialup/ns3/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: named.conf,v 1.8 2007/06/19 23:47:02 tbox Exp $ */
diff --git a/bin/tests/system/dialup/setup.sh b/bin/tests/system/dialup/setup.sh
index 25c5978f340..d34d2980144 100644
--- a/bin/tests/system/dialup/setup.sh
+++ b/bin/tests/system/dialup/setup.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: setup.sh,v 1.6 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh
index 9256a3cc8f5..c82a5379464 100644
--- a/bin/tests/system/dialup/tests.sh
+++ b/bin/tests/system/dialup/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: tests.sh,v 1.6 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl
index ef83da8dfd8..d0696e3a9ae 100644
--- a/bin/tests/system/digcomp.pl
+++ b/bin/tests/system/digcomp.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2013, 2016  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.
 
 # $Id: digcomp.pl,v 1.14 2007/06/19 23:47:00 tbox Exp $
 
diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh
index ee94539f025..dfc6f7c1986 100644
--- a/bin/tests/system/digdelv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */named.memstats
 rm -f */named.run
diff --git a/bin/tests/system/digdelv/ns1/named.conf.in b/bin/tests/system/digdelv/ns1/named.conf.in
index ca5cd2ed9b6..92acac9f4af 100644
--- a/bin/tests/system/digdelv/ns1/named.conf.in
+++ b/bin/tests/system/digdelv/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/digdelv/ns1/root.db b/bin/tests/system/digdelv/ns1/root.db
index fb54fe9c0cc..76ed2a03101 100644
--- a/bin/tests/system/digdelv/ns1/root.db
+++ b/bin/tests/system/digdelv/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/digdelv/ns2/example.db b/bin/tests/system/digdelv/ns2/example.db
index 117776e9c5e..f4e30f51e51 100644
--- a/bin/tests/system/digdelv/ns2/example.db
+++ b/bin/tests/system/digdelv/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/digdelv/ns2/named.conf.in b/bin/tests/system/digdelv/ns2/named.conf.in
index e8c109c418f..98bc5ac38e8 100644
--- a/bin/tests/system/digdelv/ns2/named.conf.in
+++ b/bin/tests/system/digdelv/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/digdelv/ns3/named.conf.in b/bin/tests/system/digdelv/ns3/named.conf.in
index e4236309cd2..b18b44413b8 100644
--- a/bin/tests/system/digdelv/ns3/named.conf.in
+++ b/bin/tests/system/digdelv/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/digdelv/setup.sh b/bin/tests/system/digdelv/setup.sh
index 08a9c49e8ca..c9f645b29ea 100644
--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 7af589b896d..0a7bc3166e4 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ditch.pl b/bin/tests/system/ditch.pl
index 9721352243f..8f1b652a111 100644
--- a/bin/tests/system/ditch.pl
+++ b/bin/tests/system/ditch.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015, 2016  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.
 
 # This is a tool for sending queries via UDP to specified address and
 # port, then exiting without waiting for a response.
diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh
index 49a275de7fe..94cadc69aed 100644
--- a/bin/tests/system/dlv/clean.sh
+++ b/bin/tests/system/dlv/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010-2012, 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.
 
 rm -f ns*/named.run
 rm -f ns*/named.conf
diff --git a/bin/tests/system/dlv/ns1/named.conf.in b/bin/tests/system/dlv/ns1/named.conf.in
index 6818caae03c..337558f9557 100644
--- a/bin/tests/system/dlv/ns1/named.conf.in
+++ b/bin/tests/system/dlv/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/dlv/ns1/root.db.in b/bin/tests/system/dlv/ns1/root.db.in
index 3ec0f450520..e2ce3f07bcd 100644
--- a/bin/tests/system/dlv/ns1/root.db.in
+++ b/bin/tests/system/dlv/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: root.db.in,v 1.3 2011/05/26 23:47:28 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns1/rootservers.utld.db b/bin/tests/system/dlv/ns1/rootservers.utld.db
index 9678c086210..820e610bf17 100644
--- a/bin/tests/system/dlv/ns1/rootservers.utld.db
+++ b/bin/tests/system/dlv/ns1/rootservers.utld.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: rootservers.utld.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh
index 607a4ca9bc8..75c0b372701 100755
--- a/bin/tests/system/dlv/ns1/sign.sh
+++ b/bin/tests/system/dlv/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlv/ns2/druz.db.in b/bin/tests/system/dlv/ns2/druz.db.in
index 362af0dcfac..149ee853769 100644
--- a/bin/tests/system/dlv/ns2/druz.db.in
+++ b/bin/tests/system/dlv/ns2/druz.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: druz.db.in,v 1.4 2011/05/26 23:47:28 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns2/hints b/bin/tests/system/dlv/ns2/hints
index 62ffdfba0f8..5916e9f781f 100644
--- a/bin/tests/system/dlv/ns2/hints
+++ b/bin/tests/system/dlv/ns2/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns2/named.conf.in b/bin/tests/system/dlv/ns2/named.conf.in
index ccc78361957..b08bd13a031 100644
--- a/bin/tests/system/dlv/ns2/named.conf.in
+++ b/bin/tests/system/dlv/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh
index 0aa5adfe141..f2f360ab61d 100755
--- a/bin/tests/system/dlv/ns2/sign.sh
+++ b/bin/tests/system/dlv/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlv/ns2/utld.db b/bin/tests/system/dlv/ns2/utld.db
index ab47de1e57f..c64a02902fc 100644
--- a/bin/tests/system/dlv/ns2/utld.db
+++ b/bin/tests/system/dlv/ns2/utld.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: utld.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns3/child.db.in b/bin/tests/system/dlv/ns3/child.db.in
index 22deab5b9ab..5128a0d8d92 100644
--- a/bin/tests/system/dlv/ns3/child.db.in
+++ b/bin/tests/system/dlv/ns3/child.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2010, 2016  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.
 
 ; $Id: child.db.in,v 1.6 2010/05/27 23:51:08 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns3/dlv.db.in b/bin/tests/system/dlv/ns3/dlv.db.in
index 1b6968c8c84..d25b9d8148f 100644
--- a/bin/tests/system/dlv/ns3/dlv.db.in
+++ b/bin/tests/system/dlv/ns3/dlv.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: dlv.db.in,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns3/hints b/bin/tests/system/dlv/ns3/hints
index 62ffdfba0f8..5916e9f781f 100644
--- a/bin/tests/system/dlv/ns3/hints
+++ b/bin/tests/system/dlv/ns3/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns3/named.conf.in b/bin/tests/system/dlv/ns3/named.conf.in
index 70bed198797..42d712b229f 100644
--- a/bin/tests/system/dlv/ns3/named.conf.in
+++ b/bin/tests/system/dlv/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index 68b35428056..cb991323b61 100755
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2012, 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlv/ns4/child.db b/bin/tests/system/dlv/ns4/child.db
index 42036892bdb..2a94c7968ae 100644
--- a/bin/tests/system/dlv/ns4/child.db
+++ b/bin/tests/system/dlv/ns4/child.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: child.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns4/hints b/bin/tests/system/dlv/ns4/hints
index 62ffdfba0f8..5916e9f781f 100644
--- a/bin/tests/system/dlv/ns4/hints
+++ b/bin/tests/system/dlv/ns4/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns4/named.conf.in b/bin/tests/system/dlv/ns4/named.conf.in
index 972160143a5..805b5f3335b 100644
--- a/bin/tests/system/dlv/ns4/named.conf.in
+++ b/bin/tests/system/dlv/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/dlv/ns5/hints b/bin/tests/system/dlv/ns5/hints
index 62ffdfba0f8..5916e9f781f 100644
--- a/bin/tests/system/dlv/ns5/hints
+++ b/bin/tests/system/dlv/ns5/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns5/named.conf.in b/bin/tests/system/dlv/ns5/named.conf.in
index 3742eb79f6e..11c6041fb91 100644
--- a/bin/tests/system/dlv/ns5/named.conf.in
+++ b/bin/tests/system/dlv/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2011, 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.
  */
 
 include "trusted.conf";
diff --git a/bin/tests/system/dlv/ns5/rndc.conf b/bin/tests/system/dlv/ns5/rndc.conf
index efcc8fa6f11..070afc5ec9e 100644
--- a/bin/tests/system/dlv/ns5/rndc.conf
+++ b/bin/tests/system/dlv/ns5/rndc.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 2013, 2016  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.
  */
 
 /* $Id: rndc.conf,v 1.5 2007/06/19 23:47:02 tbox Exp $ */
diff --git a/bin/tests/system/dlv/ns6/child.db.in b/bin/tests/system/dlv/ns6/child.db.in
index d4c8520e85d..6f884d5b871 100644
--- a/bin/tests/system/dlv/ns6/child.db.in
+++ b/bin/tests/system/dlv/ns6/child.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: child.db.in,v 1.2 2010/05/26 06:28:00 marka Exp $
 
diff --git a/bin/tests/system/dlv/ns6/hints b/bin/tests/system/dlv/ns6/hints
index 6c5ce79f3a2..643113edeec 100644
--- a/bin/tests/system/dlv/ns6/hints
+++ b/bin/tests/system/dlv/ns6/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: hints,v 1.3 2010/05/26 23:50:47 tbox Exp $
 
diff --git a/bin/tests/system/dlv/ns6/named.conf.in b/bin/tests/system/dlv/ns6/named.conf.in
index e293cdf1ce7..fe5c68df6dc 100644
--- a/bin/tests/system/dlv/ns6/named.conf.in
+++ b/bin/tests/system/dlv/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 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.
  */
 
 options {
diff --git a/bin/tests/system/dlv/ns6/sign.sh b/bin/tests/system/dlv/ns6/sign.sh
index 0b96aea59a4..1a07c01f77e 100755
--- a/bin/tests/system/dlv/ns6/sign.sh
+++ b/bin/tests/system/dlv/ns6/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlv/prereq.sh b/bin/tests/system/dlv/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/dlv/prereq.sh
+++ b/bin/tests/system/dlv/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index be8f1292dc4..a8a94e8b870 100644
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2011, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlv/tests.sh b/bin/tests/system/dlv/tests.sh
index f126e6b3ff5..fdf31d954eb 100644
--- a/bin/tests/system/dlv/tests.sh
+++ b/bin/tests/system/dlv/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlz/clean.sh b/bin/tests/system/dlz/clean.sh
index 10153cea266..e38b806ceae 100644
--- a/bin/tests/system/dlz/clean.sh
+++ b/bin/tests/system/dlz/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 rm -f ns*/named.conf
 rm -f dig.out.*
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 24db2ff797b..12662bc50b2 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,8 +1,11 @@
-Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2015, 2016, 2018  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.
+
 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 28da79e7c48..0f12e994577 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,8 +1,11 @@
-Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2015, 2016, 2018  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.
+
 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 fbea3d48c77..c3d874affb5 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,8 +1,11 @@
-Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2015, 2016, 2018  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.
+
 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 5cbdd80b629..72947655084 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,9 +1,12 @@
-Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2010, 2016, 2018  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.
+
 $Id: DNAME=10=example.net.=,v 1.2 2010/08/16 04:46:15 marka Exp $
 
 The contents of this file is not read by the filesystem driver.
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 8c6531bf986..beb2f2320c5 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,9 +1,12 @@
-Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2010, 2016, 2018  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.
+
 $Id: NS=10=example.com.=,v 1.1 2010/08/16 04:46:15 marka Exp $
 
 The contents of this file is not read by the filesystem driver.
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 799530c4cc1..40820c1f71d 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,9 +1,12 @@
-Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2010, 2016, 2018  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.
+
 $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 $
 
 The contents of this file is not read by the filesystem driver.
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 632f6ba1f8a..615baf5812d 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,9 +1,12 @@
-Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2010, 2016, 2018  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.
+
 $Id: 10.53.0.1,v 1.2 2010/08/16 04:46:16 marka Exp $
 
 The contents of this file are not read by the filesystem driver.
diff --git a/bin/tests/system/dlz/ns1/named.conf.in b/bin/tests/system/dlz/ns1/named.conf.in
index 3d2b08b2e72..273ff02c794 100644
--- a/bin/tests/system/dlz/ns1/named.conf.in
+++ b/bin/tests/system/dlz/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 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.
  */
 
 options {
diff --git a/bin/tests/system/dlz/prereq.sh.in b/bin/tests/system/dlz/prereq.sh.in
index 879def8d5f8..afec653e0d9 100644
--- a/bin/tests/system/dlz/prereq.sh.in
+++ b/bin/tests/system/dlz/prereq.sh.in
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlz/setup.sh b/bin/tests/system/dlz/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/dlz/setup.sh
+++ b/bin/tests/system/dlz/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlz/tests.sh b/bin/tests/system/dlz/tests.sh
index 5a69b131bc9..78f74dc0c6c 100644
--- a/bin/tests/system/dlz/tests.sh
+++ b/bin/tests/system/dlz/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2013, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlzexternal/Makefile.in b/bin/tests/system/dlzexternal/Makefile.in
index 96686dc1685..dd04bd7d6ac 100644
--- a/bin/tests/system/dlzexternal/Makefile.in
+++ b/bin/tests/system/dlzexternal/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2011, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh
index b28315c3018..3e6cb9efc96 100644
--- a/bin/tests/system/dlzexternal/clean.sh
+++ b/bin/tests/system/dlzexternal/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 #
 # Clean up after dlzexternal tests.
diff --git a/bin/tests/system/dlzexternal/driver.c b/bin/tests/system/dlzexternal/driver.c
index bca969f80ba..71967d86df9 100644
--- a/bin/tests/system/dlzexternal/driver.c
+++ b/bin/tests/system/dlzexternal/driver.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2017  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.
  */
 
 /*
diff --git a/bin/tests/system/dlzexternal/driver.h b/bin/tests/system/dlzexternal/driver.h
index a650caa2aa6..92e145b82c3 100644
--- a/bin/tests/system/dlzexternal/driver.h
+++ b/bin/tests/system/dlzexternal/driver.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: driver.h,v 1.4 2011/03/17 09:25:54 fdupont Exp $ */
diff --git a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
index 9465fabf56d..d583cb4e1a0 100644
--- a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 dlz "example one" {
diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in
index b910f567261..d35061a8cbd 100644
--- a/bin/tests/system/dlzexternal/ns1/named.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 options {
diff --git a/bin/tests/system/dlzexternal/ns1/root.db b/bin/tests/system/dlzexternal/ns1/root.db
index 4e3e11a450d..7e4a77a5241 100644
--- a/bin/tests/system/dlzexternal/ns1/root.db
+++ b/bin/tests/system/dlzexternal/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id: root.db,v 1.9 2007-06-19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/dlzexternal/prereq.sh b/bin/tests/system/dlzexternal/prereq.sh
index 72cbacf50f4..b3c73c33b56 100644
--- a/bin/tests/system/dlzexternal/prereq.sh
+++ b/bin/tests/system/dlzexternal/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index 8a60cc6f1cc..8b91d55b181 100644
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh
index 1effd9d4d79..87dd13b10ec 100644
--- a/bin/tests/system/dlzexternal/tests.sh
+++ b/bin/tests/system/dlzexternal/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dns64/clean.sh b/bin/tests/system/dns64/clean.sh
index dd3215ff224..fdb0053d9fe 100644
--- a/bin/tests/system/dns64/clean.sh
+++ b/bin/tests/system/dns64/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 rm -f ns*/named.conf
 rm -f ns1/K*
diff --git a/bin/tests/system/dns64/conf/bad1.conf b/bin/tests/system/dns64/conf/bad1.conf
index 75f35bdc76a..fa14e828694 100644
--- a/bin/tests/system/dns64/conf/bad1.conf
+++ b/bin/tests/system/dns64/conf/bad1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad1.conf,v 1.3 2010/12/08 23:51:55 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/bad2.conf b/bin/tests/system/dns64/conf/bad2.conf
index 6492d3574e8..d3eaffb30d5 100644
--- a/bin/tests/system/dns64/conf/bad2.conf
+++ b/bin/tests/system/dns64/conf/bad2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad2.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/bad3.conf b/bin/tests/system/dns64/conf/bad3.conf
index 96afbac6d33..197e8a3dfc5 100644
--- a/bin/tests/system/dns64/conf/bad3.conf
+++ b/bin/tests/system/dns64/conf/bad3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad3.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/bad4.conf b/bin/tests/system/dns64/conf/bad4.conf
index dd471061c1f..9d18f109d20 100644
--- a/bin/tests/system/dns64/conf/bad4.conf
+++ b/bin/tests/system/dns64/conf/bad4.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad4.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/bad5.conf b/bin/tests/system/dns64/conf/bad5.conf
index e2c977dfa78..e93b9758a69 100644
--- a/bin/tests/system/dns64/conf/bad5.conf
+++ b/bin/tests/system/dns64/conf/bad5.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad5.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/bad6.conf b/bin/tests/system/dns64/conf/bad6.conf
index 65021568566..49db7528cac 100644
--- a/bin/tests/system/dns64/conf/bad6.conf
+++ b/bin/tests/system/dns64/conf/bad6.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad6.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/bad7.conf b/bin/tests/system/dns64/conf/bad7.conf
index 16930eb1ca6..bff50bfcc0b 100644
--- a/bin/tests/system/dns64/conf/bad7.conf
+++ b/bin/tests/system/dns64/conf/bad7.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id:$ */
diff --git a/bin/tests/system/dns64/conf/bad8.conf b/bin/tests/system/dns64/conf/bad8.conf
index 19f40224c44..d38b11905ed 100644
--- a/bin/tests/system/dns64/conf/bad8.conf
+++ b/bin/tests/system/dns64/conf/bad8.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id:$ */
diff --git a/bin/tests/system/dns64/conf/bad9.conf b/bin/tests/system/dns64/conf/bad9.conf
index 2142a958cd6..bb889a66df8 100644
--- a/bin/tests/system/dns64/conf/bad9.conf
+++ b/bin/tests/system/dns64/conf/bad9.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id:$ */
diff --git a/bin/tests/system/dns64/conf/good1.conf b/bin/tests/system/dns64/conf/good1.conf
index 9b06b81e65e..770f3e19b2f 100644
--- a/bin/tests/system/dns64/conf/good1.conf
+++ b/bin/tests/system/dns64/conf/good1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good1.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/good2.conf b/bin/tests/system/dns64/conf/good2.conf
index 19969ddd478..ee0c92b71e1 100644
--- a/bin/tests/system/dns64/conf/good2.conf
+++ b/bin/tests/system/dns64/conf/good2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good2.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/good3.conf b/bin/tests/system/dns64/conf/good3.conf
index 41029dd3f82..653d4902649 100644
--- a/bin/tests/system/dns64/conf/good3.conf
+++ b/bin/tests/system/dns64/conf/good3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good3.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/good4.conf b/bin/tests/system/dns64/conf/good4.conf
index 18a24de68a1..0f92f0efdf1 100644
--- a/bin/tests/system/dns64/conf/good4.conf
+++ b/bin/tests/system/dns64/conf/good4.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good4.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/conf/good5.conf b/bin/tests/system/dns64/conf/good5.conf
index 7fdf8e89ca1..031f0e7a97d 100644
--- a/bin/tests/system/dns64/conf/good5.conf
+++ b/bin/tests/system/dns64/conf/good5.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good5.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/bin/tests/system/dns64/ns1/example.db b/bin/tests/system/dns64/ns1/example.db
index 1330ff111f7..65d73a90e44 100644
--- a/bin/tests/system/dns64/ns1/example.db
+++ b/bin/tests/system/dns64/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2011, 2013, 2016  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.
 
 ; $Id: example.db,v 1.5 2011/02/03 12:18:11 tbox Exp $
 
diff --git a/bin/tests/system/dns64/ns1/named.conf.in b/bin/tests/system/dns64/ns1/named.conf.in
index 7eaf18a6610..d8faa1137d0 100644
--- a/bin/tests/system/dns64/ns1/named.conf.in
+++ b/bin/tests/system/dns64/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/dns64/ns1/root.db b/bin/tests/system/dns64/ns1/root.db
index d7580891db0..15ae10ed305 100644
--- a/bin/tests/system/dns64/ns1/root.db
+++ b/bin/tests/system/dns64/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.db,v 1.3 2010/12/08 23:51:56 tbox Exp $
 
diff --git a/bin/tests/system/dns64/ns1/sign.sh b/bin/tests/system/dns64/ns1/sign.sh
index d92828e858e..766fec772c8 100644
--- a/bin/tests/system/dns64/ns1/sign.sh
+++ b/bin/tests/system/dns64/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.3 2010/12/08 23:51:56 tbox Exp $
 
diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
index 0192925419b..070fdecb387 100644
--- a/bin/tests/system/dns64/ns2/named.conf.in
+++ b/bin/tests/system/dns64/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2011, 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.
  */
 
 // NS2
diff --git a/bin/tests/system/dns64/ns2/rpz.db b/bin/tests/system/dns64/ns2/rpz.db
index 02c90df1075..d08a83b38bc 100644
--- a/bin/tests/system/dns64/ns2/rpz.db
+++ b/bin/tests/system/dns64/ns2/rpz.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 86400      ; 1 day
 @               IN SOA  rpz. noc.rpz. (
diff --git a/bin/tests/system/dns64/prereq.sh b/bin/tests/system/dns64/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/dns64/prereq.sh
+++ b/bin/tests/system/dns64/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index 89bd7e0f831..fbaecc308cd 100644
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
index a832a4aad80..ce5287efc6c 100644
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/README b/bin/tests/system/dnssec/README
index b2f80fc4a67..1dc533f83cf 100644
--- a/bin/tests/system/dnssec/README
+++ b/bin/tests/system/dnssec/README
@@ -1,9 +1,12 @@
-Copyright (C) 2000-2002, 2004, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000-2002, 2004, 2011, 2016, 2018  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.
+
 $Id: README,v 1.10 2011/01/04 23:47:13 tbox Exp $
 
 The test setup for the DNSSEC tests has a secure root.
diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index b7be4c8948e..9b79004e196 100644
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002, 2004, 2007-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.
 
 rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed
 rm -f */example.bk
diff --git a/bin/tests/system/dnssec/dnssec_update_test.pl b/bin/tests/system/dnssec/dnssec_update_test.pl
index dbb642d5ad5..6b7412e2de0 100644
--- a/bin/tests/system/dnssec/dnssec_update_test.pl
+++ b/bin/tests/system/dnssec/dnssec_update_test.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2002, 2004, 2007, 2010, 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.
 
 #
 # DNSSEC Dynamic update test suite.
diff --git a/bin/tests/system/dnssec/ns1/named.conf.in b/bin/tests/system/dnssec/ns1/named.conf.in
index 89a5d04cb35..4401f595612 100644
--- a/bin/tests/system/dnssec/ns1/named.conf.in
+++ b/bin/tests/system/dnssec/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 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.
  */
 
 // NS1
diff --git a/bin/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in
index 783a27cdcd9..6a97a0b4663 100644
--- a/bin/tests/system/dnssec/ns1/root.db.in
+++ b/bin/tests/system/dnssec/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2010, 2013, 2014, 2016  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.
 
 ; $Id: root.db.in,v 1.12 2010/11/17 23:47:08 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index 3d90856c709..09837184dea 100644
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2000-2004, 2006-2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/ns2/algroll.db.in b/bin/tests/system/dnssec/ns2/algroll.db.in
index b715ecd7895..ea10cedc01f 100644
--- a/bin/tests/system/dnssec/ns2/algroll.db.in
+++ b/bin/tests/system/dnssec/ns2/algroll.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: algroll.db.in,v 1.3 2010/11/17 23:47:08 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/badparam.db.in b/bin/tests/system/dnssec/ns2/badparam.db.in
index 18b124af036..510908b0ded 100644
--- a/bin/tests/system/dnssec/ns2/badparam.db.in
+++ b/bin/tests/system/dnssec/ns2/badparam.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: badparam.db.in,v 1.2 2010/08/13 06:46:24 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/cdnskey-auto.secure.db.in b/bin/tests/system/dnssec/ns2/cdnskey-auto.secure.db.in
index 9a70a37ff24..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cdnskey-auto.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cdnskey-auto.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/cdnskey-kskonly.secure.db.in b/bin/tests/system/dnssec/ns2/cdnskey-kskonly.secure.db.in
index 6abda5d748f..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cdnskey-kskonly.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cdnskey-kskonly.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/cdnskey-update.secure.db.in b/bin/tests/system/dnssec/ns2/cdnskey-update.secure.db.in
index 9a70a37ff24..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cdnskey-update.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cdnskey-update.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/cdnskey.secure.db.in b/bin/tests/system/dnssec/ns2/cdnskey.secure.db.in
index 9a70a37ff24..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cdnskey.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cdnskey.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/cds-auto.secure.db.in b/bin/tests/system/dnssec/ns2/cds-auto.secure.db.in
index 9a70a37ff24..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cds-auto.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cds-auto.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/cds-kskonly.secure.db.in b/bin/tests/system/dnssec/ns2/cds-kskonly.secure.db.in
index 6abda5d748f..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cds-kskonly.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cds-kskonly.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/cds-update.secure.db.in b/bin/tests/system/dnssec/ns2/cds-update.secure.db.in
index 9a70a37ff24..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cds-update.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cds-update.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/cds.secure.db.in b/bin/tests/system/dnssec/ns2/cds.secure.db.in
index 9a70a37ff24..e42cb4a29eb 100644
--- a/bin/tests/system/dnssec/ns2/cds.secure.db.in
+++ b/bin/tests/system/dnssec/ns2/cds.secure.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/child.nsec3.example.db b/bin/tests/system/dnssec/ns2/child.nsec3.example.db
index bf54a5a82ca..4fae531451e 100644
--- a/bin/tests/system/dnssec/ns2/child.nsec3.example.db
+++ b/bin/tests/system/dnssec/ns2/child.nsec3.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2008, 2016  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.
 
 ; $Id: child.nsec3.example.db,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/child.optout.example.db b/bin/tests/system/dnssec/ns2/child.optout.example.db
index f3de48dbea0..9deaf0ded1b 100644
--- a/bin/tests/system/dnssec/ns2/child.optout.example.db
+++ b/bin/tests/system/dnssec/ns2/child.optout.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2008, 2016  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.
 
 ; $Id: child.optout.example.db,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/dlv.db.in b/bin/tests/system/dnssec/ns2/dlv.db.in
index 6bc3e94731d..7904a300010 100644
--- a/bin/tests/system/dnssec/ns2/dlv.db.in
+++ b/bin/tests/system/dnssec/ns2/dlv.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: dlv.db.in,v 1.5 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/dst.example.db.in b/bin/tests/system/dnssec/ns2/dst.example.db.in
index 86dd21fdf9c..c034f7fd9e9 100644
--- a/bin/tests/system/dnssec/ns2/dst.example.db.in
+++ b/bin/tests/system/dnssec/ns2/dst.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: dst.example.db.in,v 1.4 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in
index 51422375541..cde6307467a 100644
--- a/bin/tests/system/dnssec/ns2/example.db.in
+++ b/bin/tests/system/dnssec/ns2/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2000-2002, 2004, 2007-2014, 2016  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.
 
 ; $Id: example.db.in,v 1.31 2011/11/04 05:36:28 each Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in b/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
index 1fbec6e28af..0884ad0c14c 100644
--- a/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
+++ b/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
diff --git a/bin/tests/system/dnssec/ns2/insecure.secure.example.db b/bin/tests/system/dnssec/ns2/insecure.secure.example.db
index a6d431cb528..78f33257883 100644
--- a/bin/tests/system/dnssec/ns2/insecure.secure.example.db
+++ b/bin/tests/system/dnssec/ns2/insecure.secure.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index 393c8a832d4..329424dccf6 100644
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2006-2008, 2010, 2011, 2014-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.
  */
 
 // NS2
diff --git a/bin/tests/system/dnssec/ns2/private.secure.example.db.in b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
index b2ad172bba1..519bdfe0bf2 100644
--- a/bin/tests/system/dnssec/ns2/private.secure.example.db.in
+++ b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: private.secure.example.db.in,v 1.10 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 2f26bd0970d..be3aaf91733 100644
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2000-2004, 2006-2012, 2014-2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/ns2/single-nsec3.db.in b/bin/tests/system/dnssec/ns2/single-nsec3.db.in
index da133741ec3..ef405a2cfbf 100644
--- a/bin/tests/system/dnssec/ns2/single-nsec3.db.in
+++ b/bin/tests/system/dnssec/ns2/single-nsec3.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: single-nsec3.db.in,v 1.2 2010/09/07 00:58:36 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in b/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in
index 4e6b6da7178..b2a45353c77 100644
--- a/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in
+++ b/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: auto-nsec.example.db.in,v 1.2 2011/02/15 22:02:36 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in b/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in
index c3a114cf0e6..64ee475495b 100644
--- a/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: auto-nsec3.example.db.in,v 1.2 2011/02/15 22:02:36 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/bogus.example.db.in b/bin/tests/system/dnssec/ns3/bogus.example.db.in
index a9a31cb6e9a..9bb46098337 100644
--- a/bin/tests/system/dnssec/ns3/bogus.example.db.in
+++ b/bin/tests/system/dnssec/ns3/bogus.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016  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.
 
 ; $Id: bogus.example.db.in,v 1.9 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/dnskey-nsec3-unknown.example.db.in b/bin/tests/system/dnssec/ns3/dnskey-nsec3-unknown.example.db.in
index 71040712025..e1475c533f5 100644
--- a/bin/tests/system/dnssec/ns3/dnskey-nsec3-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/dnskey-nsec3-unknown.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/dnssec/ns3/dnskey-unknown.example.db.in b/bin/tests/system/dnssec/ns3/dnskey-unknown.example.db.in
index fd2b36bd2d0..c9e7c2b3da7 100644
--- a/bin/tests/system/dnssec/ns3/dnskey-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/dnskey-unknown.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/dynamic.example.db.in b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
index a4787f2a0aa..b9687d34094 100644
--- a/bin/tests/system/dnssec/ns3/dynamic.example.db.in
+++ b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2002, 2004, 2007, 2016  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.
 
 ; $Id: dynamic.example.db.in,v 1.5 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/expired.example.db.in b/bin/tests/system/dnssec/ns3/expired.example.db.in
index e12d28b602a..9f5722bc91d 100644
--- a/bin/tests/system/dnssec/ns3/expired.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expired.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id: expired.example.db.in,v 1.2 2011/02/08 23:10:07 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/expiring.example.db.in b/bin/tests/system/dnssec/ns3/expiring.example.db.in
index 7fbb2e22475..bc33a5eb6c0 100644
--- a/bin/tests/system/dnssec/ns3/expiring.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expiring.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id: expiring.example.db.in,v 1.2 2011/05/21 15:07:10 each Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/future.example.db.in b/bin/tests/system/dnssec/ns3/future.example.db.in
index 28b7f68d31b..2a648799e5a 100644
--- a/bin/tests/system/dnssec/ns3/future.example.db.in
+++ b/bin/tests/system/dnssec/ns3/future.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id: optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/generic.example.db.in b/bin/tests/system/dnssec/ns3/generic.example.db.in
index c9b0167a6cf..dd1778e21a3 100644
--- a/bin/tests/system/dnssec/ns3/generic.example.db.in
+++ b/bin/tests/system/dnssec/ns3/generic.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2001, 2002, 2004, 2007, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/inline.example.db b/bin/tests/system/dnssec/ns3/inline.example.db
index 76847474409..009d2d26593 100644
--- a/bin/tests/system/dnssec/ns3/inline.example.db
+++ b/bin/tests/system/dnssec/ns3/inline.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: insecure.example.db,v 1.9 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
index 681d384baa7..09df781b76d 100644
--- a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: insecure.below-cname.example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/insecure.example.db b/bin/tests/system/dnssec/ns3/insecure.example.db
index b54215740eb..009d2d26593 100644
--- a/bin/tests/system/dnssec/ns3/insecure.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: insecure.example.db,v 1.9 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db b/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db
index bd327f51ae8..e5f82ea743c 100644
--- a/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: insecure.nsec3.example.db,v 1.2 2008/09/24 02:46:21 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/insecure.optout.example.db b/bin/tests/system/dnssec/ns3/insecure.optout.example.db
index a255915a470..ecaab281b9c 100644
--- a/bin/tests/system/dnssec/ns3/insecure.optout.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.optout.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: insecure.optout.example.db,v 1.2 2008/09/24 02:46:21 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/kskonly.example.db.in b/bin/tests/system/dnssec/ns3/kskonly.example.db.in
index fa0f4a560cf..e0b6870e6a0 100644
--- a/bin/tests/system/dnssec/ns3/kskonly.example.db.in
+++ b/bin/tests/system/dnssec/ns3/kskonly.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: kskonly.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/lower.example.db.in b/bin/tests/system/dnssec/ns3/lower.example.db.in
index fda5581f3df..07ea2b89136 100644
--- a/bin/tests/system/dnssec/ns3/lower.example.db.in
+++ b/bin/tests/system/dnssec/ns3/lower.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: lower.example.db.in,v 1.1.2.1 2012/01/17 08:31:00 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/managed-future.example.db.in b/bin/tests/system/dnssec/ns3/managed-future.example.db.in
index 854aa96f176..ddda25d2fd5 100644
--- a/bin/tests/system/dnssec/ns3/managed-future.example.db.in
+++ b/bin/tests/system/dnssec/ns3/managed-future.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/multiple.example.db.in b/bin/tests/system/dnssec/ns3/multiple.example.db.in
index 0e91ef37ae5..4739e0cba5c 100644
--- a/bin/tests/system/dnssec/ns3/multiple.example.db.in
+++ b/bin/tests/system/dnssec/ns3/multiple.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2008, 2016  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.
 
 ; $Id: multiple.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index 42c8f569a90..683b2c6694c 100644
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2006-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.
  */
 
 // NS3
diff --git a/bin/tests/system/dnssec/ns3/nosign.example.db.in b/bin/tests/system/dnssec/ns3/nosign.example.db.in
index 95b11d63cea..620476740b7 100644
--- a/bin/tests/system/dnssec/ns3/nosign.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nosign.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: nosign.example.db.in,v 1.2 2011/05/23 20:10:02 each Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in b/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
index 9d9b209e197..33308f87dcf 100644
--- a/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2008, 2016  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.
 
 ; $Id: nsec3-unknown.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/nsec3.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.example.db.in
index aec7a3d6239..386061af061 100644
--- a/bin/tests/system/dnssec/ns3/nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2008, 2016  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.
 
 ; $Id: nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
index 371465f5193..9e69e15c668 100644
--- a/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: nsec3.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
index 8a532596d21..d4a90f977c4 100644
--- a/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: nsec3.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in b/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
index c9352178506..21a17ea2cb1 100644
--- a/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2008, 2016  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.
 
 ; $Id: optout-unknown.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/optout.example.db.in b/bin/tests/system/dnssec/ns3/optout.example.db.in
index ab1afe2974e..2a648799e5a 100644
--- a/bin/tests/system/dnssec/ns3/optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2008, 2016  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.
 
 ; $Id: optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
index 508f99be75b..13ad8158ddc 100644
--- a/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: optout.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/optout.optout.example.db.in b/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
index 8f6f06d4abf..2b9dc947df9 100644
--- a/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: optout.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in b/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in
index 1dab90eeadc..009d2d26593 100644
--- a/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in
+++ b/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id: insecure.example.db,v 1.9 2007/06/19 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/rsasha256.example.db.in b/bin/tests/system/dnssec/ns3/rsasha256.example.db.in
index 7abbf141a4e..1406e2cebb2 100644
--- a/bin/tests/system/dnssec/ns3/rsasha256.example.db.in
+++ b/bin/tests/system/dnssec/ns3/rsasha256.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: rsasha256.example.db.in,v 1.2 2009/10/27 22:25:37 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/rsasha512.example.db.in b/bin/tests/system/dnssec/ns3/rsasha512.example.db.in
index c19a2da34e1..0886831facb 100644
--- a/bin/tests/system/dnssec/ns3/rsasha512.example.db.in
+++ b/bin/tests/system/dnssec/ns3/rsasha512.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: rsasha512.example.db.in,v 1.2 2009/10/27 22:25:37 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
index 90cc82a64c3..b556a9ed660 100644
--- a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: secure.below-cname.example.db.in,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/secure.example.db.in b/bin/tests/system/dnssec/ns3/secure.example.db.in
index 12ffedd59f4..9d310d8cb2c 100644
--- a/bin/tests/system/dnssec/ns3/secure.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010, 2012-2014, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
index 1619da5a876..2dec1e40bd2 100644
--- a/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: secure.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/secure.optout.example.db.in b/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
index da8d8a96e58..56c4976a7ab 100644
--- a/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2008, 2016  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.
 
 ; $Id: secure.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/siginterval.example.db.in b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
index 37d8fe7f9d7..674ab82c366 100644
--- a/bin/tests/system/dnssec/ns3/siginterval.example.db.in
+++ b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id: upper.example.db.in,v 1.1.2.1 2012/01/17 08:31:00 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/siginterval1.conf b/bin/tests/system/dnssec/ns3/siginterval1.conf
index 5dce0b3dde4..092dcfa29ad 100644
--- a/bin/tests/system/dnssec/ns3/siginterval1.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 zone "siginterval.example" {
diff --git a/bin/tests/system/dnssec/ns3/siginterval2.conf b/bin/tests/system/dnssec/ns3/siginterval2.conf
index e209ac70cc6..9fab130f471 100644
--- a/bin/tests/system/dnssec/ns3/siginterval2.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 zone "siginterval.example" {
diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index 7dd14bb5636..4102466fde7 100644
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2000-2002, 2004, 2006-2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in b/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in
index 5f38cc7314d..81fa6e7c601 100644
--- a/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in
+++ b/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: split-dnssec.example.db.in,v 1.3 2011/03/05 23:52:29 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/split-smart.example.db.in b/bin/tests/system/dnssec/ns3/split-smart.example.db.in
index 7b3a2e01545..497e2be84c8 100644
--- a/bin/tests/system/dnssec/ns3/split-smart.example.db.in
+++ b/bin/tests/system/dnssec/ns3/split-smart.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: split-smart.example.db.in,v 1.3 2011/03/05 23:52:29 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in b/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in
index 2ead17cc6b8..d7fc3e7a44e 100644
--- a/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in
+++ b/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: ttlpatch.example.db.in,v 1.3 2011/02/28 23:47:39 tbox Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in b/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in
index ace3db1b2fb..ccd4c12b675 100644
--- a/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: update-nsec3.example.db.in,v 1.2 2011/02/14 23:53:44 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns3/upper.example.db.in b/bin/tests/system/dnssec/ns3/upper.example.db.in
index fe198d07bb0..674ab82c366 100644
--- a/bin/tests/system/dnssec/ns3/upper.example.db.in
+++ b/bin/tests/system/dnssec/ns3/upper.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: upper.example.db.in,v 1.1.2.1 2012/01/17 08:31:00 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in
index 40e60511867..9f851b09c92 100644
--- a/bin/tests/system/dnssec/ns4/named1.conf.in
+++ b/bin/tests/system/dnssec/ns4/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 // NS4
diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in
index 2ad7f81596f..50025ac8cfc 100644
--- a/bin/tests/system/dnssec/ns4/named2.conf.in
+++ b/bin/tests/system/dnssec/ns4/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 // NS4
diff --git a/bin/tests/system/dnssec/ns4/named3.conf.in b/bin/tests/system/dnssec/ns4/named3.conf.in
index a4a6b4ddf46..b0ac3cce761 100644
--- a/bin/tests/system/dnssec/ns4/named3.conf.in
+++ b/bin/tests/system/dnssec/ns4/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 // NS4
diff --git a/bin/tests/system/dnssec/ns4/named4.conf.in b/bin/tests/system/dnssec/ns4/named4.conf.in
index d57f5cfbb9b..d73c36f8c09 100644
--- a/bin/tests/system/dnssec/ns4/named4.conf.in
+++ b/bin/tests/system/dnssec/ns4/named4.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS4
diff --git a/bin/tests/system/dnssec/ns5/named1.conf.in b/bin/tests/system/dnssec/ns5/named1.conf.in
index 1850bb4c446..2883d50bad8 100644
--- a/bin/tests/system/dnssec/ns5/named1.conf.in
+++ b/bin/tests/system/dnssec/ns5/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 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.
  */
 
 // NS5
diff --git a/bin/tests/system/dnssec/ns5/named2.conf.in b/bin/tests/system/dnssec/ns5/named2.conf.in
index a33cd411238..8aa4e6929ab 100644
--- a/bin/tests/system/dnssec/ns5/named2.conf.in
+++ b/bin/tests/system/dnssec/ns5/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 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.
  */
 
 // NS5
diff --git a/bin/tests/system/dnssec/ns5/sign.sh b/bin/tests/system/dnssec/ns5/sign.sh
index 874a1efa825..5c9493dcebd 100644
--- a/bin/tests/system/dnssec/ns5/sign.sh
+++ b/bin/tests/system/dnssec/ns5/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2015-2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad
index dee238a1634..8ad27d18753 100644
--- a/bin/tests/system/dnssec/ns5/trusted.conf.bad
+++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: trusted.conf.bad,v 1.9 2007/06/19 23:47:02 tbox Exp $ */
diff --git a/bin/tests/system/dnssec/ns6/named.conf.in b/bin/tests/system/dnssec/ns6/named.conf.in
index e808a9bd70d..c3f2930ee2b 100644
--- a/bin/tests/system/dnssec/ns6/named.conf.in
+++ b/bin/tests/system/dnssec/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 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.
  */
 
 // NS6
diff --git a/bin/tests/system/dnssec/ns6/optout-tld.db.in b/bin/tests/system/dnssec/ns6/optout-tld.db.in
index 1633d67bb9b..b86563cee79 100644
--- a/bin/tests/system/dnssec/ns6/optout-tld.db.in
+++ b/bin/tests/system/dnssec/ns6/optout-tld.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
diff --git a/bin/tests/system/dnssec/ns6/sign.sh b/bin/tests/system/dnssec/ns6/sign.sh
index fa4d7688335..d8175d4f5dc 100644
--- a/bin/tests/system/dnssec/ns6/sign.sh
+++ b/bin/tests/system/dnssec/ns6/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2013, 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.43 2011/11/04 05:36:28 each Exp $
 
diff --git a/bin/tests/system/dnssec/ns7/named.conf.in b/bin/tests/system/dnssec/ns7/named.conf.in
index 5764982e7ce..2dc2a9cc901 100644
--- a/bin/tests/system/dnssec/ns7/named.conf.in
+++ b/bin/tests/system/dnssec/ns7/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2008, 2010, 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.
  */
 
 // NS3
diff --git a/bin/tests/system/dnssec/ns7/named.nosoa b/bin/tests/system/dnssec/ns7/named.nosoa
index af5edcb0b2b..ed37c0bfd7d 100644
--- a/bin/tests/system/dnssec/ns7/named.nosoa
+++ b/bin/tests/system/dnssec/ns7/named.nosoa
@@ -1,9 +1,12 @@
-Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2010, 2016, 2018  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.
+
 $Id: named.nosoa,v 1.3 2010/06/26 23:46:49 tbox Exp $
 
 Add -T nosoa.
diff --git a/bin/tests/system/dnssec/ns7/nosoa.secure.example.db b/bin/tests/system/dnssec/ns7/nosoa.secure.example.db
index 12fa7b0eae2..6fcd498461d 100644
--- a/bin/tests/system/dnssec/ns7/nosoa.secure.example.db
+++ b/bin/tests/system/dnssec/ns7/nosoa.secure.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: nosoa.secure.example.db,v 1.2 2010/06/25 23:50:13 marka Exp $
 
diff --git a/bin/tests/system/dnssec/ns7/sign.sh b/bin/tests/system/dnssec/ns7/sign.sh
index 64675c255c1..4b08fa164a4 100644
--- a/bin/tests/system/dnssec/ns7/sign.sh
+++ b/bin/tests/system/dnssec/ns7/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.43 2011/11/04 05:36:28 each Exp $
 
diff --git a/bin/tests/system/dnssec/ns7/split-rrsig.db.in b/bin/tests/system/dnssec/ns7/split-rrsig.db.in
index 5850a46404d..14300c3b08c 100644
--- a/bin/tests/system/dnssec/ns7/split-rrsig.db.in
+++ b/bin/tests/system/dnssec/ns7/split-rrsig.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 split-rrsig.		3660	IN SOA	. . (
 					1          ; serial
diff --git a/bin/tests/system/dnssec/ntadiff.pl b/bin/tests/system/dnssec/ntadiff.pl
index 337d833d053..e49ae14655a 100755
--- a/bin/tests/system/dnssec/ntadiff.pl
+++ b/bin/tests/system/dnssec/ntadiff.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2015, 2016  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.
 
 use strict;
 use Time::Piece;
diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
index fbf71d7179d..9c1d276ecb2 100644
--- a/bin/tests/system/dnssec/prereq.sh
+++ b/bin/tests/system/dnssec/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002, 2004, 2006, 2007, 2009, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 965b82714f3..f0b5696f64f 100644
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/signer/example.db.in b/bin/tests/system/dnssec/signer/example.db.in
index 85c027d736c..e7589c1f16a 100644
--- a/bin/tests/system/dnssec/signer/example.db.in
+++ b/bin/tests/system/dnssec/signer/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
diff --git a/bin/tests/system/dnssec/signer/remove.db.in b/bin/tests/system/dnssec/signer/remove.db.in
index 8249e370157..7adb0c6106c 100644
--- a/bin/tests/system/dnssec/signer/remove.db.in
+++ b/bin/tests/system/dnssec/signer/remove.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 ; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
diff --git a/bin/tests/system/dnssec/signer/remove2.db.in b/bin/tests/system/dnssec/signer/remove2.db.in
index e4a05342759..fde5091fd68 100644
--- a/bin/tests/system/dnssec/signer/remove2.db.in
+++ b/bin/tests/system/dnssec/signer/remove2.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 ; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index e9a38b8e4cd..099bf5bae26 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002, 2004-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf b/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf
index 5c082db6621..4f90895dc24 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf b/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf
index 709aeb5f5db..14cfa3e897f 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf b/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf
index 58cf24b8d9a..aac8dd929f6 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf b/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf
index 2394e45b219..9bca0c11d66 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf b/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf
index 74da12975ff..d04a1b07a3e 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf b/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf
index 141744104c4..35f8cf7b628 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf b/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf
index 8d12b8800f4..a82c42cf238 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf b/bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf
index 9a5f1858f48..264dce89673 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf b/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf
index 830cc55d5bc..a250f50ec8e 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf b/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf
index 6f2ff582650..ea6852a1519 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf b/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf
index bbdb55a6f17..e602bfc20c3 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf b/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf
index f00c41b3eab..acd1d7ea62f 100644
--- a/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf
+++ b/bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/bad-size-version.conf b/bin/tests/system/dnstap/bad-size-version.conf
index 8706fdd6095..41d32ef1544 100644
--- a/bin/tests/system/dnstap/bad-size-version.conf
+++ b/bin/tests/system/dnstap/bad-size-version.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/clean.sh b/bin/tests/system/dnstap/clean.sh
index edafbe87bdd..fe934024302 100644
--- a/bin/tests/system/dnstap/clean.sh
+++ b/bin/tests/system/dnstap/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */named.conf
 rm -f */named.memstats
diff --git a/bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf b/bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf
index d71b8ce394b..abaaa73c4a6 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf b/bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf
index c8aa0268269..dbc9364e6b1 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf b/bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf
index fec4b5e19ca..1c3b5ef5cef 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf b/bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf
index cbb9945e170..e18ec38f748 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf b/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf
index 31a9535c0e7..05ad706dfbf 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf b/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf
index 5c20e188d79..ef735a67d7e 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf b/bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf
index 299bd8e1d94..9f93bb68484 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf b/bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf
index 934e622e9af..fe6462b022f 100644
--- a/bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf
+++ b/bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-size-unlimited.conf b/bin/tests/system/dnstap/good-size-unlimited.conf
index f520716dc8a..c37a0b8ffc1 100644
--- a/bin/tests/system/dnstap/good-size-unlimited.conf
+++ b/bin/tests/system/dnstap/good-size-unlimited.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/good-size-version.conf b/bin/tests/system/dnstap/good-size-version.conf
index 46022b73169..b3e127bb0d8 100644
--- a/bin/tests/system/dnstap/good-size-version.conf
+++ b/bin/tests/system/dnstap/good-size-version.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/ns1/named.conf.in b/bin/tests/system/dnstap/ns1/named.conf.in
index f9d5b818457..0e54757c27e 100644
--- a/bin/tests/system/dnstap/ns1/named.conf.in
+++ b/bin/tests/system/dnstap/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/ns1/root.db b/bin/tests/system/dnstap/ns1/root.db
index 39d1f03193e..dab5cea7f77 100644
--- a/bin/tests/system/dnstap/ns1/root.db
+++ b/bin/tests/system/dnstap/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/dnstap/ns2/example.db b/bin/tests/system/dnstap/ns2/example.db
index 8cb4da36116..4073dc2682c 100644
--- a/bin/tests/system/dnstap/ns2/example.db
+++ b/bin/tests/system/dnstap/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/dnstap/ns2/named.conf.in b/bin/tests/system/dnstap/ns2/named.conf.in
index e7090945c5f..d1043e25ee8 100644
--- a/bin/tests/system/dnstap/ns2/named.conf.in
+++ b/bin/tests/system/dnstap/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/ns3/named.conf.in b/bin/tests/system/dnstap/ns3/named.conf.in
index 15d3a23aadb..18b7c3e647c 100644
--- a/bin/tests/system/dnstap/ns3/named.conf.in
+++ b/bin/tests/system/dnstap/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/ns4/named.conf.in b/bin/tests/system/dnstap/ns4/named.conf.in
index e9ed3b13262..3aa9dd62c48 100644
--- a/bin/tests/system/dnstap/ns4/named.conf.in
+++ b/bin/tests/system/dnstap/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dnstap/setup.sh b/bin/tests/system/dnstap/setup.sh
index 7d0bc272e02..3a14fe9e3ac 100644
--- a/bin/tests/system/dnstap/setup.sh
+++ b/bin/tests/system/dnstap/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index ec59d4fa573..14f39b3c6af 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnstap/ydump.py b/bin/tests/system/dnstap/ydump.py
index 4b34b943ddd..50ad791c889 100644
--- a/bin/tests/system/dnstap/ydump.py
+++ b/bin/tests/system/dnstap/ydump.py
@@ -1,9 +1,12 @@
 ############################################################################
-# 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.
 ############################################################################
 
 try:
diff --git a/bin/tests/system/dscp/clean.sh b/bin/tests/system/dscp/clean.sh
index 18acb61e0ee..b29303a6a0b 100644
--- a/bin/tests/system/dscp/clean.sh
+++ b/bin/tests/system/dscp/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f */root.bk
 rm -f dig.out.10.53.0.?
diff --git a/bin/tests/system/dscp/ns1/named.conf.in b/bin/tests/system/dscp/ns1/named.conf.in
index 90286f97eea..a6e8b410654 100644
--- a/bin/tests/system/dscp/ns1/named.conf.in
+++ b/bin/tests/system/dscp/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dscp/ns1/root.db b/bin/tests/system/dscp/ns1/root.db
index a15f06d1135..3bd582940e1 100644
--- a/bin/tests/system/dscp/ns1/root.db
+++ b/bin/tests/system/dscp/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 3600
 .	SOA	ns1.nil-servers. marka.isc.org. 1 3600 1200 3600000 1200
diff --git a/bin/tests/system/dscp/ns2/named.conf.in b/bin/tests/system/dscp/ns2/named.conf.in
index 14a24b9e66d..6419a019ab3 100644
--- a/bin/tests/system/dscp/ns2/named.conf.in
+++ b/bin/tests/system/dscp/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dscp/ns3/hint.db b/bin/tests/system/dscp/ns3/hint.db
index a4e28d09be8..5fe03e71a2e 100644
--- a/bin/tests/system/dscp/ns3/hint.db
+++ b/bin/tests/system/dscp/ns3/hint.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 3600
 . NS ns1.nil-servers.
diff --git a/bin/tests/system/dscp/ns3/named.conf.in b/bin/tests/system/dscp/ns3/named.conf.in
index d21fa2c896a..71d72cd5c2a 100644
--- a/bin/tests/system/dscp/ns3/named.conf.in
+++ b/bin/tests/system/dscp/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dscp/ns4/named.conf.in b/bin/tests/system/dscp/ns4/named.conf.in
index 6fb070bc24d..70dd5e5ee8b 100644
--- a/bin/tests/system/dscp/ns4/named.conf.in
+++ b/bin/tests/system/dscp/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dscp/ns4/root.db b/bin/tests/system/dscp/ns4/root.db
index dc1f04d40f1..d1627dbd4ef 100644
--- a/bin/tests/system/dscp/ns4/root.db
+++ b/bin/tests/system/dscp/ns4/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 3600
 .	SOA	ns4.nil-servers. marka.isc.org. 1 3600 1200 3600000 1200
diff --git a/bin/tests/system/dscp/ns5/named.conf.in b/bin/tests/system/dscp/ns5/named.conf.in
index 384d73a9144..e2726c3d467 100644
--- a/bin/tests/system/dscp/ns5/named.conf.in
+++ b/bin/tests/system/dscp/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dscp/ns6/hint.db b/bin/tests/system/dscp/ns6/hint.db
index c98bf5c90c8..8c54e3a3dc9 100644
--- a/bin/tests/system/dscp/ns6/hint.db
+++ b/bin/tests/system/dscp/ns6/hint.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 3600
 . NS ns4.nil-servers.
diff --git a/bin/tests/system/dscp/ns6/named.conf.in b/bin/tests/system/dscp/ns6/named.conf.in
index 5b5d6c6a185..eedbab1315a 100644
--- a/bin/tests/system/dscp/ns6/named.conf.in
+++ b/bin/tests/system/dscp/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dscp/ns7/named.conf.in b/bin/tests/system/dscp/ns7/named.conf.in
index 174bc83b7b9..e7c9528df10 100644
--- a/bin/tests/system/dscp/ns7/named.conf.in
+++ b/bin/tests/system/dscp/ns7/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/dscp/setup.sh b/bin/tests/system/dscp/setup.sh
index 765c969dc2f..fa6de38c00d 100644
--- a/bin/tests/system/dscp/setup.sh
+++ b/bin/tests/system/dscp/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dscp/tests.sh b/bin/tests/system/dscp/tests.sh
index 03072fa7167..e8a20f5b508 100644
--- a/bin/tests/system/dscp/tests.sh
+++ b/bin/tests/system/dscp/tests.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dsdigest/clean.sh b/bin/tests/system/dsdigest/clean.sh
index 92f861020ce..bb40bcb82c5 100644
--- a/bin/tests/system/dsdigest/clean.sh
+++ b/bin/tests/system/dsdigest/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 rm -f supported
 rm -f */K* */dsset-* */*.signed */trusted.conf
diff --git a/bin/tests/system/dsdigest/ns1/named.conf.in b/bin/tests/system/dsdigest/ns1/named.conf.in
index aed8dc93861..215800cab08 100644
--- a/bin/tests/system/dsdigest/ns1/named.conf.in
+++ b/bin/tests/system/dsdigest/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/dsdigest/ns1/root.db.in b/bin/tests/system/dsdigest/ns1/root.db.in
index 2a6f65f701c..dffb20a4808 100644
--- a/bin/tests/system/dsdigest/ns1/root.db.in
+++ b/bin/tests/system/dsdigest/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/dsdigest/ns1/sign.sh b/bin/tests/system/dsdigest/ns1/sign.sh
index 3a768b1f9f5..0d4589043f8 100644
--- a/bin/tests/system/dsdigest/ns1/sign.sh
+++ b/bin/tests/system/dsdigest/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dsdigest/ns2/bad.db.in b/bin/tests/system/dsdigest/ns2/bad.db.in
index caa7708a9e0..a618ec3a0f5 100644
--- a/bin/tests/system/dsdigest/ns2/bad.db.in
+++ b/bin/tests/system/dsdigest/ns2/bad.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/dsdigest/ns2/good.db.in b/bin/tests/system/dsdigest/ns2/good.db.in
index caa7708a9e0..a618ec3a0f5 100644
--- a/bin/tests/system/dsdigest/ns2/good.db.in
+++ b/bin/tests/system/dsdigest/ns2/good.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/dsdigest/ns2/named.conf.in b/bin/tests/system/dsdigest/ns2/named.conf.in
index 5b369ef7962..73a41ba8d77 100644
--- a/bin/tests/system/dsdigest/ns2/named.conf.in
+++ b/bin/tests/system/dsdigest/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/dsdigest/ns2/sign.sh b/bin/tests/system/dsdigest/ns2/sign.sh
index 2b26b9ef1cf..bf967b595e0 100644
--- a/bin/tests/system/dsdigest/ns2/sign.sh
+++ b/bin/tests/system/dsdigest/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016  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.
 
 # $Id$
 
diff --git a/bin/tests/system/dsdigest/ns3/named.conf.in b/bin/tests/system/dsdigest/ns3/named.conf.in
index 3949bc1822f..1bc621561b8 100644
--- a/bin/tests/system/dsdigest/ns3/named.conf.in
+++ b/bin/tests/system/dsdigest/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS3
diff --git a/bin/tests/system/dsdigest/ns4/named.conf.in b/bin/tests/system/dsdigest/ns4/named.conf.in
index d68d4045d25..b5a49597d84 100644
--- a/bin/tests/system/dsdigest/ns4/named.conf.in
+++ b/bin/tests/system/dsdigest/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS3
diff --git a/bin/tests/system/dsdigest/prereq.sh b/bin/tests/system/dsdigest/prereq.sh
index e74e41dd69d..1febbd52201 100644
--- a/bin/tests/system/dsdigest/prereq.sh
+++ b/bin/tests/system/dsdigest/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh
index 47cfbf02793..4c11328ec51 100644
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dsdigest/tests.sh b/bin/tests/system/dsdigest/tests.sh
index ed469395654..8f9eb58138f 100644
--- a/bin/tests/system/dsdigest/tests.sh
+++ b/bin/tests/system/dsdigest/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dyndb/Makefile.in b/bin/tests/system/dyndb/Makefile.in
index 2e739ab650a..e975337d6cf 100644
--- a/bin/tests/system/dyndb/Makefile.in
+++ b/bin/tests/system/dyndb/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2015, 2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/dyndb/clean.sh b/bin/tests/system/dyndb/clean.sh
index 97b821fa68e..63449472040 100644
--- a/bin/tests/system/dyndb/clean.sh
+++ b/bin/tests/system/dyndb/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 #
 # Clean up after dyndb tests.
diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in
index c2b8fa9ff6a..c23e6643029 100644
--- a/bin/tests/system/dyndb/driver/Makefile.in
+++ b/bin/tests/system/dyndb/driver/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2015-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/dyndb/ns1/named.conf.in b/bin/tests/system/dyndb/ns1/named.conf.in
index 937595c2124..dde4a4de1cd 100644
--- a/bin/tests/system/dyndb/ns1/named.conf.in
+++ b/bin/tests/system/dyndb/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 controls { };
diff --git a/bin/tests/system/dyndb/prereq.sh b/bin/tests/system/dyndb/prereq.sh
index 30d9f6fa857..76af4655f86 100644
--- a/bin/tests/system/dyndb/prereq.sh
+++ b/bin/tests/system/dyndb/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dyndb/setup.sh b/bin/tests/system/dyndb/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/dyndb/setup.sh
+++ b/bin/tests/system/dyndb/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh
index ef288703ae7..6eecb37c770 100644
--- a/bin/tests/system/dyndb/tests.sh
+++ b/bin/tests/system/dyndb/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ecdsa/clean.sh b/bin/tests/system/ecdsa/clean.sh
index 3918659219b..3779676eea4 100644
--- a/bin/tests/system/ecdsa/clean.sh
+++ b/bin/tests/system/ecdsa/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016  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.
 
 rm -f */K* */dsset-* */*.signed */trusted.conf
 rm -f ns1/root.db
diff --git a/bin/tests/system/ecdsa/ns1/named.conf b/bin/tests/system/ecdsa/ns1/named.conf
index 9374ce43ef9..f7cd7738d64 100644
--- a/bin/tests/system/ecdsa/ns1/named.conf
+++ b/bin/tests/system/ecdsa/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/ecdsa/ns1/root.db.in b/bin/tests/system/ecdsa/ns1/root.db.in
index 9678b260c7d..d098a62106d 100644
--- a/bin/tests/system/ecdsa/ns1/root.db.in
+++ b/bin/tests/system/ecdsa/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/ecdsa/ns1/sign.sh b/bin/tests/system/ecdsa/ns1/sign.sh
index 808a04ec186..39eb3366309 100644
--- a/bin/tests/system/ecdsa/ns1/sign.sh
+++ b/bin/tests/system/ecdsa/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ecdsa/ns2/named.conf b/bin/tests/system/ecdsa/ns2/named.conf
index f7d1f216f38..5e9cc8373ef 100644
--- a/bin/tests/system/ecdsa/ns2/named.conf
+++ b/bin/tests/system/ecdsa/ns2/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/ecdsa/prereq.sh b/bin/tests/system/ecdsa/prereq.sh
index 2420ac39c20..f01828f74d0 100644
--- a/bin/tests/system/ecdsa/prereq.sh
+++ b/bin/tests/system/ecdsa/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh
index 740b7245431..c48b526bdef 100644
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ecdsa/tests.sh b/bin/tests/system/ecdsa/tests.sh
index ac662fa35d7..a72d18384fe 100644
--- a/bin/tests/system/ecdsa/tests.sh
+++ b/bin/tests/system/ecdsa/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2013, 2015, 2016  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.
 
 # $Id$
 
diff --git a/bin/tests/system/eddsa/clean.sh b/bin/tests/system/eddsa/clean.sh
index 1c0eac79c1e..0bcd0ac23eb 100644
--- a/bin/tests/system/eddsa/clean.sh
+++ b/bin/tests/system/eddsa/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  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.
 
 rm -f */K* */dsset-* */*.signed */trusted.conf
 rm -f ns1/root.db
diff --git a/bin/tests/system/eddsa/ns1/named.conf b/bin/tests/system/eddsa/ns1/named.conf
index 80c4ea3941f..f7cd7738d64 100644
--- a/bin/tests/system/eddsa/ns1/named.conf
+++ b/bin/tests/system/eddsa/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/eddsa/ns1/root.db.in b/bin/tests/system/eddsa/ns1/root.db.in
index 994113cec2c..d098a62106d 100644
--- a/bin/tests/system/eddsa/ns1/root.db.in
+++ b/bin/tests/system/eddsa/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/eddsa/ns1/sign.sh b/bin/tests/system/eddsa/ns1/sign.sh
index 9d48efc4c3d..15814be7eff 100644
--- a/bin/tests/system/eddsa/ns1/sign.sh
+++ b/bin/tests/system/eddsa/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/eddsa/ns2/example.com.db b/bin/tests/system/eddsa/ns2/example.com.db
index e9d53038bc8..a022a84b94d 100644
--- a/bin/tests/system/eddsa/ns2/example.com.db
+++ b/bin/tests/system/eddsa/ns2/example.com.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/eddsa/ns2/named.conf b/bin/tests/system/eddsa/ns2/named.conf
index b4e911efe9d..5e9cc8373ef 100644
--- a/bin/tests/system/eddsa/ns2/named.conf
+++ b/bin/tests/system/eddsa/ns2/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/eddsa/ns2/sign.sh b/bin/tests/system/eddsa/ns2/sign.sh
index 19e861a07c8..76f5e5dba6d 100644
--- a/bin/tests/system/eddsa/ns2/sign.sh
+++ b/bin/tests/system/eddsa/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/eddsa/prereq.sh b/bin/tests/system/eddsa/prereq.sh
index c67a067e717..648f97dcf93 100644
--- a/bin/tests/system/eddsa/prereq.sh
+++ b/bin/tests/system/eddsa/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh
index 74e3e7a1daf..c48b526bdef 100644
--- a/bin/tests/system/eddsa/setup.sh
+++ b/bin/tests/system/eddsa/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/eddsa/tests.sh b/bin/tests/system/eddsa/tests.sh
index fefbff3aa3c..6404956ca4e 100644
--- a/bin/tests/system/eddsa/tests.sh
+++ b/bin/tests/system/eddsa/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  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.
 
 # $Id$
 
diff --git a/bin/tests/system/ednscompliance/clean.sh b/bin/tests/system/ednscompliance/clean.sh
index 10d07154f95..037fccf825d 100644
--- a/bin/tests/system/ednscompliance/clean.sh
+++ b/bin/tests/system/ednscompliance/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f dig.out*
 rm -f ns*/named.lock
diff --git a/bin/tests/system/ednscompliance/ns1/named.conf.in b/bin/tests/system/ednscompliance/ns1/named.conf.in
index 39c62dab1bc..b24ceaa28dd 100644
--- a/bin/tests/system/ednscompliance/ns1/named.conf.in
+++ b/bin/tests/system/ednscompliance/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/ednscompliance/ns1/root.db b/bin/tests/system/ednscompliance/ns1/root.db
index e6447eb3919..93306dbf67b 100644
--- a/bin/tests/system/ednscompliance/ns1/root.db
+++ b/bin/tests/system/ednscompliance/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300
 . 			IN SOA	marka.isc.org. a.root.servers.nil. (
diff --git a/bin/tests/system/ednscompliance/setup.sh b/bin/tests/system/ednscompliance/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/ednscompliance/setup.sh
+++ b/bin/tests/system/ednscompliance/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ednscompliance/tests.sh b/bin/tests/system/ednscompliance/tests.sh
index 2184e1201b7..acede9d63d6 100644
--- a/bin/tests/system/ednscompliance/tests.sh
+++ b/bin/tests/system/ednscompliance/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/emptyzones/clean.sh b/bin/tests/system/emptyzones/clean.sh
index 2b6bd47091a..7826e73b27b 100644
--- a/bin/tests/system/emptyzones/clean.sh
+++ b/bin/tests/system/emptyzones/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2014-2016  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.
 
 rm -f ns1/named.conf
 rm -f ns*/named.lock
diff --git a/bin/tests/system/emptyzones/ns1/empty.db b/bin/tests/system/emptyzones/ns1/empty.db
index 2358b165052..fdd5ef91439 100644
--- a/bin/tests/system/emptyzones/ns1/empty.db
+++ b/bin/tests/system/emptyzones/ns1/empty.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @ 0 SOA . . 0 0 0 0 0
 @ 0 NS .
diff --git a/bin/tests/system/emptyzones/ns1/named1.conf.in b/bin/tests/system/emptyzones/ns1/named1.conf.in
index 701b0b29935..fc09cefac46 100644
--- a/bin/tests/system/emptyzones/ns1/named1.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/emptyzones/ns1/named2.conf.in b/bin/tests/system/emptyzones/ns1/named2.conf.in
index 9c609191e53..ad4d681ff87 100644
--- a/bin/tests/system/emptyzones/ns1/named2.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/emptyzones/ns1/rfc1918.zones b/bin/tests/system/emptyzones/ns1/rfc1918.zones
index 7a7e416eaf5..465c14f1977 100644
--- a/bin/tests/system/emptyzones/ns1/rfc1918.zones
+++ b/bin/tests/system/emptyzones/ns1/rfc1918.zones
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 zone "10.IN-ADDR.ARPA" { type master; file "empty.db"; };
diff --git a/bin/tests/system/emptyzones/ns1/root.hint b/bin/tests/system/emptyzones/ns1/root.hint
index 9269ee3a415..6671358152a 100644
--- a/bin/tests/system/emptyzones/ns1/root.hint
+++ b/bin/tests/system/emptyzones/ns1/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/emptyzones/setup.sh b/bin/tests/system/emptyzones/setup.sh
index 2ee09258d21..e842d2c158a 100644
--- a/bin/tests/system/emptyzones/setup.sh
+++ b/bin/tests/system/emptyzones/setup.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/emptyzones/tests.sh b/bin/tests/system/emptyzones/tests.sh
index 11d455d1813..5872479211d 100644
--- a/bin/tests/system/emptyzones/tests.sh
+++ b/bin/tests/system/emptyzones/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index 6ef94b21652..ed2a5b2fbe7 100644
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 #include <config.h>
diff --git a/bin/tests/system/fetchlimit/ans4/ans.pl b/bin/tests/system/fetchlimit/ans4/ans.pl
index d553061f588..4b14a9276ef 100644
--- a/bin/tests/system/fetchlimit/ans4/ans.pl
+++ b/bin/tests/system/fetchlimit/ans4/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# 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.
 
 #
 # Don't respond if the "norespond" file exists; otherwise respond to
diff --git a/bin/tests/system/fetchlimit/clean.sh b/bin/tests/system/fetchlimit/clean.sh
index 7fc546ab35a..9296105dfeb 100644
--- a/bin/tests/system/fetchlimit/clean.sh
+++ b/bin/tests/system/fetchlimit/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */named.conf */named.memstats */ans.run */named.recursing */named.run
 rm -f dig.out*
diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.in b/bin/tests/system/fetchlimit/ns1/named.conf.in
index 85f2793b1d8..eabfe0cd00e 100644
--- a/bin/tests/system/fetchlimit/ns1/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/fetchlimit/ns1/root.db b/bin/tests/system/fetchlimit/ns1/root.db
index d8a1c139f3d..d2aec1107ab 100644
--- a/bin/tests/system/fetchlimit/ns1/root.db
+++ b/bin/tests/system/fetchlimit/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/fetchlimit/ns2/example.db b/bin/tests/system/fetchlimit/ns2/example.db
index 4964a6dbfc0..40929b3b238 100644
--- a/bin/tests/system/fetchlimit/ns2/example.db
+++ b/bin/tests/system/fetchlimit/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.in b/bin/tests/system/fetchlimit/ns2/named.conf.in
index 0f3bd7d398f..1892756ccb7 100644
--- a/bin/tests/system/fetchlimit/ns2/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
index 92ea1b6478e..b470f4633db 100644
--- a/bin/tests/system/fetchlimit/ns3/named1.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 controls { /* empty */ };
diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in
index 0528964f8a2..001a95815ff 100644
--- a/bin/tests/system/fetchlimit/ns3/named2.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in
index ab2f20d4b88..0244a9a62fc 100644
--- a/bin/tests/system/fetchlimit/ns3/named3.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/fetchlimit/ns3/root.hint b/bin/tests/system/fetchlimit/ns3/root.hint
index 65feb88b5a1..22ab8724420 100644
--- a/bin/tests/system/fetchlimit/ns3/root.hint
+++ b/bin/tests/system/fetchlimit/ns3/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/fetchlimit/setup.sh b/bin/tests/system/fetchlimit/setup.sh
index e65f276b9df..2c83ad11c27 100644
--- a/bin/tests/system/fetchlimit/setup.sh
+++ b/bin/tests/system/fetchlimit/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh
index 16cd667b781..86afc47fc40 100644
--- a/bin/tests/system/fetchlimit/tests.sh
+++ b/bin/tests/system/fetchlimit/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/filter-aaaa/clean.sh b/bin/tests/system/filter-aaaa/clean.sh
index 7d7d3b5a9e6..73732758f81 100644
--- a/bin/tests/system/filter-aaaa/clean.sh
+++ b/bin/tests/system/filter-aaaa/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 rm -f ns1/K*
 rm -f ns1/*.signed
diff --git a/bin/tests/system/filter-aaaa/conf/bad1.conf b/bin/tests/system/filter-aaaa/conf/bad1.conf
index 41c34e6ff43..cf588e51db5 100644
--- a/bin/tests/system/filter-aaaa/conf/bad1.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad1.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/bad2.conf b/bin/tests/system/filter-aaaa/conf/bad2.conf
index 5fc52c92918..98c1f82495e 100644
--- a/bin/tests/system/filter-aaaa/conf/bad2.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad2.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/bad3.conf b/bin/tests/system/filter-aaaa/conf/bad3.conf
index 72b24212ead..1d0b88367df 100644
--- a/bin/tests/system/filter-aaaa/conf/bad3.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad3.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/bad4.conf b/bin/tests/system/filter-aaaa/conf/bad4.conf
index 1baaaced53e..abaa2fcafad 100644
--- a/bin/tests/system/filter-aaaa/conf/bad4.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad4.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad4.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/bad5.conf b/bin/tests/system/filter-aaaa/conf/bad5.conf
index c32c7d6e1d2..88c99ebb348 100644
--- a/bin/tests/system/filter-aaaa/conf/bad5.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad5.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad5.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/bad6.conf b/bin/tests/system/filter-aaaa/conf/bad6.conf
index 905b76330c6..89bef8e5e5e 100644
--- a/bin/tests/system/filter-aaaa/conf/bad6.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad6.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: bad6.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good1.conf b/bin/tests/system/filter-aaaa/conf/good1.conf
index 2f6057684b5..191b1c0976c 100644
--- a/bin/tests/system/filter-aaaa/conf/good1.conf
+++ b/bin/tests/system/filter-aaaa/conf/good1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good1.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good2.conf b/bin/tests/system/filter-aaaa/conf/good2.conf
index 1701436cecb..156699962a5 100644
--- a/bin/tests/system/filter-aaaa/conf/good2.conf
+++ b/bin/tests/system/filter-aaaa/conf/good2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good2.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good3.conf b/bin/tests/system/filter-aaaa/conf/good3.conf
index e65ed8e631f..bdc0f5810bb 100644
--- a/bin/tests/system/filter-aaaa/conf/good3.conf
+++ b/bin/tests/system/filter-aaaa/conf/good3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good3.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good4.conf b/bin/tests/system/filter-aaaa/conf/good4.conf
index 330a0fc4256..6b7a6cafa54 100644
--- a/bin/tests/system/filter-aaaa/conf/good4.conf
+++ b/bin/tests/system/filter-aaaa/conf/good4.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good4.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good5.conf b/bin/tests/system/filter-aaaa/conf/good5.conf
index 531258ca2e7..fef37790105 100644
--- a/bin/tests/system/filter-aaaa/conf/good5.conf
+++ b/bin/tests/system/filter-aaaa/conf/good5.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good5.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good6.conf b/bin/tests/system/filter-aaaa/conf/good6.conf
index 396e168d481..817e4d98a88 100644
--- a/bin/tests/system/filter-aaaa/conf/good6.conf
+++ b/bin/tests/system/filter-aaaa/conf/good6.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good6.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good7.conf b/bin/tests/system/filter-aaaa/conf/good7.conf
index dbd540f5f33..ca36a9c90a0 100644
--- a/bin/tests/system/filter-aaaa/conf/good7.conf
+++ b/bin/tests/system/filter-aaaa/conf/good7.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good7.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/conf/good8.conf b/bin/tests/system/filter-aaaa/conf/good8.conf
index 1a48b25c957..43029e944d1 100644
--- a/bin/tests/system/filter-aaaa/conf/good8.conf
+++ b/bin/tests/system/filter-aaaa/conf/good8.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: good8.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
index a96558aeda6..bd898554a03 100644
--- a/bin/tests/system/filter-aaaa/ns1/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
index 6af4f2aab9c..9f86d759b00 100644
--- a/bin/tests/system/filter-aaaa/ns1/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns1/root.db b/bin/tests/system/filter-aaaa/ns1/root.db
index 4739efdf6ba..6a4f832910c 100644
--- a/bin/tests/system/filter-aaaa/ns1/root.db
+++ b/bin/tests/system/filter-aaaa/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2012, 2016, 2017  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.
 
 $TTL	120
 @		SOA	ns.utld hostmaster.ns.utld ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh
index ae65a651e21..9d8b59f50a5 100755
--- a/bin/tests/system/filter-aaaa/ns1/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/filter-aaaa/ns1/signed.db.in b/bin/tests/system/filter-aaaa/ns1/signed.db.in
index 081cd9ff2a6..31dda5712e7 100644
--- a/bin/tests/system/filter-aaaa/ns1/signed.db.in
+++ b/bin/tests/system/filter-aaaa/ns1/signed.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2012, 2016, 2017  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.
 
 $TTL	120
 @		SOA	ns.signed.  hostmaster.ns.signed. ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/filter-aaaa/ns1/unsigned.db b/bin/tests/system/filter-aaaa/ns1/unsigned.db
index a3c9aab49cc..8b422584f4d 100644
--- a/bin/tests/system/filter-aaaa/ns1/unsigned.db
+++ b/bin/tests/system/filter-aaaa/ns1/unsigned.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2012, 2016, 2017  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.
 
 $TTL	120
 @		SOA	ns.unsigned.  hostmaster.ns.unsigned. ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/filter-aaaa/ns2/hints b/bin/tests/system/filter-aaaa/ns2/hints
index 8370182b455..6e5eefc1ec6 100644
--- a/bin/tests/system/filter-aaaa/ns2/hints
+++ b/bin/tests/system/filter-aaaa/ns2/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: hints,v 1.2 2010/06/22 03:58:37 marka Exp $
 
diff --git a/bin/tests/system/filter-aaaa/ns2/named1.conf.in b/bin/tests/system/filter-aaaa/ns2/named1.conf.in
index f6131402a40..e188e4f11d8 100644
--- a/bin/tests/system/filter-aaaa/ns2/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns2/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns2/named2.conf.in b/bin/tests/system/filter-aaaa/ns2/named2.conf.in
index 46a9de11d93..e3216f89b2e 100644
--- a/bin/tests/system/filter-aaaa/ns2/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns2/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns3/hints b/bin/tests/system/filter-aaaa/ns3/hints
index 62c1bcdf514..9fc115821e4 100644
--- a/bin/tests/system/filter-aaaa/ns3/hints
+++ b/bin/tests/system/filter-aaaa/ns3/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: hints,v 1.2 2010/06/22 03:58:38 marka Exp $
 
diff --git a/bin/tests/system/filter-aaaa/ns3/named1.conf.in b/bin/tests/system/filter-aaaa/ns3/named1.conf.in
index 4222adb6314..bc8193d82e1 100644
--- a/bin/tests/system/filter-aaaa/ns3/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns3/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns3/named2.conf.in b/bin/tests/system/filter-aaaa/ns3/named2.conf.in
index 194ff3412e2..051fdc04ab9 100644
--- a/bin/tests/system/filter-aaaa/ns3/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns3/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns4/named1.conf.in b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
index 70dfc52e451..eb5054d82c6 100644
--- a/bin/tests/system/filter-aaaa/ns4/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns4/named2.conf.in b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
index a95f4a77bea..83baa449fbb 100644
--- a/bin/tests/system/filter-aaaa/ns4/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/filter-aaaa/ns4/root.db b/bin/tests/system/filter-aaaa/ns4/root.db
index 0fb4c895b7a..7618cbc9ece 100644
--- a/bin/tests/system/filter-aaaa/ns4/root.db
+++ b/bin/tests/system/filter-aaaa/ns4/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2012, 2016, 2017  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.
 
 ; $Id: root.db,v 1.4 2012/01/31 23:47:32 tbox Exp $
 @		SOA	ns.utld hostmaster.ns.utld ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter-aaaa/ns4/sign.sh
index ae65a651e21..9d8b59f50a5 100755
--- a/bin/tests/system/filter-aaaa/ns4/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns4/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/filter-aaaa/ns4/signed.db.in b/bin/tests/system/filter-aaaa/ns4/signed.db.in
index 9b45637d9f5..623b2b95b24 100644
--- a/bin/tests/system/filter-aaaa/ns4/signed.db.in
+++ b/bin/tests/system/filter-aaaa/ns4/signed.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2012, 2016, 2017  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.
 
 $TTL	120
 @		SOA	ns.signed.  hostmaster.ns.signed. ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/filter-aaaa/ns4/unsigned.db b/bin/tests/system/filter-aaaa/ns4/unsigned.db
index 7f2302aefe2..8f155bb965f 100644
--- a/bin/tests/system/filter-aaaa/ns4/unsigned.db
+++ b/bin/tests/system/filter-aaaa/ns4/unsigned.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2012, 2016, 2017  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.
 
 $TTL	120
 @		SOA	ns.unsigned.  hostmaster.ns.unsigned. ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh
index 5610a4b88b0..c6c36ecdf5b 100644
--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh
index 15c706bb94e..25ff46c1333 100644
--- a/bin/tests/system/filter-aaaa/tests.sh
+++ b/bin/tests/system/filter-aaaa/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/formerr/clean.sh b/bin/tests/system/formerr/clean.sh
index 7d1b79751da..0bb0e3d2692 100644
--- a/bin/tests/system/formerr/clean.sh
+++ b/bin/tests/system/formerr/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f nametoolong.out 
 rm -f twoquestions.out 
diff --git a/bin/tests/system/formerr/formerr.pl b/bin/tests/system/formerr/formerr.pl
index 049cf3aa279..cf0cde4b51d 100644
--- a/bin/tests/system/formerr/formerr.pl
+++ b/bin/tests/system/formerr/formerr.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2013, 2014, 2016  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.
 
 # $Id: packet.pl,v 1.2 2011/04/15 01:02:08 each Exp $
 
diff --git a/bin/tests/system/formerr/ns1/named.conf.in b/bin/tests/system/formerr/ns1/named.conf.in
index eac82c835db..b24ceaa28dd 100644
--- a/bin/tests/system/formerr/ns1/named.conf.in
+++ b/bin/tests/system/formerr/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/formerr/ns1/root.db b/bin/tests/system/formerr/ns1/root.db
index ff934a890ad..07bf4379622 100644
--- a/bin/tests/system/formerr/ns1/root.db
+++ b/bin/tests/system/formerr/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id: root.db,v 1.2 2010/09/15 12:07:56 marka Exp $
 
diff --git a/bin/tests/system/formerr/setup.sh b/bin/tests/system/formerr/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/formerr/setup.sh
+++ b/bin/tests/system/formerr/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/formerr/tests.sh b/bin/tests/system/formerr/tests.sh
index 8ef198c7bb1..c88b18022f1 100644
--- a/bin/tests/system/formerr/tests.sh
+++ b/bin/tests/system/formerr/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh
index 50fd793d26a..3052d2773a2 100644
--- a/bin/tests/system/forward/clean.sh
+++ b/bin/tests/system/forward/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 #
 # Clean up after forward tests.
diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in
index 28c793bc749..7ce81dde055 100644
--- a/bin/tests/system/forward/ns1/named.conf.in
+++ b/bin/tests/system/forward/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/forward/ns1/root.db b/bin/tests/system/forward/ns1/root.db
index 892bbbabef9..b92df7ead5d 100644
--- a/bin/tests/system/forward/ns1/root.db
+++ b/bin/tests/system/forward/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in
index b60563c032b..ff104d466f7 100644
--- a/bin/tests/system/forward/ns2/named.conf.in
+++ b/bin/tests/system/forward/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/forward/ns2/root.db b/bin/tests/system/forward/ns2/root.db
index 892bbbabef9..b92df7ead5d 100644
--- a/bin/tests/system/forward/ns2/root.db
+++ b/bin/tests/system/forward/ns2/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/forward/ns3/named.conf.in b/bin/tests/system/forward/ns3/named.conf.in
index 92f1ef48c04..80a4f7e684c 100644
--- a/bin/tests/system/forward/ns3/named.conf.in
+++ b/bin/tests/system/forward/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/forward/ns3/root.db b/bin/tests/system/forward/ns3/root.db
index 892bbbabef9..b92df7ead5d 100644
--- a/bin/tests/system/forward/ns3/root.db
+++ b/bin/tests/system/forward/ns3/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/forward/ns4/named.conf.in b/bin/tests/system/forward/ns4/named.conf.in
index 26cfce64f80..480530b0f27 100644
--- a/bin/tests/system/forward/ns4/named.conf.in
+++ b/bin/tests/system/forward/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/forward/ns4/root.db b/bin/tests/system/forward/ns4/root.db
index 892bbbabef9..b92df7ead5d 100644
--- a/bin/tests/system/forward/ns4/root.db
+++ b/bin/tests/system/forward/ns4/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/forward/ns5/named.conf.in b/bin/tests/system/forward/ns5/named.conf.in
index 4bf6fa1e455..0e65985d526 100644
--- a/bin/tests/system/forward/ns5/named.conf.in
+++ b/bin/tests/system/forward/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/forward/ns5/root.db b/bin/tests/system/forward/ns5/root.db
index 1f5a6f2ba8d..ef7e3b597eb 100644
--- a/bin/tests/system/forward/ns5/root.db
+++ b/bin/tests/system/forward/ns5/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: root.db,v 1.3 2011/10/13 22:48:23 tbox Exp $
 
diff --git a/bin/tests/system/forward/rfc1918-inherited.conf b/bin/tests/system/forward/rfc1918-inherited.conf
index 66e87cb087d..3c310d04915 100644
--- a/bin/tests/system/forward/rfc1918-inherited.conf
+++ b/bin/tests/system/forward/rfc1918-inherited.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 zone 10.in-addr.arpa {
diff --git a/bin/tests/system/forward/rfc1918-notinherited.conf b/bin/tests/system/forward/rfc1918-notinherited.conf
index 82501bb68c1..d3febc1c2d6 100644
--- a/bin/tests/system/forward/rfc1918-notinherited.conf
+++ b/bin/tests/system/forward/rfc1918-notinherited.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 zone 10.in-addr.arpa {
diff --git a/bin/tests/system/forward/setup.sh b/bin/tests/system/forward/setup.sh
index b9d74dbe5fd..c63aeb10d2a 100644
--- a/bin/tests/system/forward/setup.sh
+++ b/bin/tests/system/forward/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index 96fbd675528..b58fd37be31 100644
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/forward/ula-inherited.conf b/bin/tests/system/forward/ula-inherited.conf
index a22c71b70ff..27fc8edc44d 100644
--- a/bin/tests/system/forward/ula-inherited.conf
+++ b/bin/tests/system/forward/ula-inherited.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 zone d.f.ip6.arpa {
diff --git a/bin/tests/system/forward/ula-notinherited.conf b/bin/tests/system/forward/ula-notinherited.conf
index ece85244a60..e235d203a52 100644
--- a/bin/tests/system/forward/ula-notinherited.conf
+++ b/bin/tests/system/forward/ula-notinherited.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 zone d.f.ip6.arpa {
diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh
index 18a92c5b21c..264d4ae674f 100644
--- a/bin/tests/system/genzone.sh
+++ b/bin/tests/system/genzone.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2004, 2007, 2009, 2011-2017  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.
 
 #
 # Set up a test zone
diff --git a/bin/tests/system/geoip/clean.sh b/bin/tests/system/geoip/clean.sh
index 4cec9c2b170..d6fe94b852c 100644
--- a/bin/tests/system/geoip/clean.sh
+++ b/bin/tests/system/geoip/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016  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.
 
 rm -f ns2/named.conf
 rm -f ns2/example*.db
diff --git a/bin/tests/system/geoip/data/README b/bin/tests/system/geoip/data/README
index d5775a36a2a..1b35c9ab713 100644
--- a/bin/tests/system/geoip/data/README
+++ b/bin/tests/system/geoip/data/README
@@ -1,9 +1,12 @@
-Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2013, 2014, 2016, 2018  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.
+
 The data data files in this directory are sample GeoIP databases,
 generated from the corresponding CSV files.  Thanks to MaxMind, Inc.
 for assistance with producing these files.
diff --git a/bin/tests/system/geoip/ns2/example.db.in b/bin/tests/system/geoip/ns2/example.db.in
index 57a6c3d43b8..836359dc561 100644
--- a/bin/tests/system/geoip/ns2/example.db.in
+++ b/bin/tests/system/geoip/ns2/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/geoip/ns2/named1.conf.in b/bin/tests/system/geoip/ns2/named1.conf.in
index fe22e58a42d..a42531196da 100644
--- a/bin/tests/system/geoip/ns2/named1.conf.in
+++ b/bin/tests/system/geoip/ns2/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named10.conf.in b/bin/tests/system/geoip/ns2/named10.conf.in
index c0d74852243..1372d410f0a 100644
--- a/bin/tests/system/geoip/ns2/named10.conf.in
+++ b/bin/tests/system/geoip/ns2/named10.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named11.conf.in b/bin/tests/system/geoip/ns2/named11.conf.in
index b9bc23889f8..c7a0ad2d58d 100644
--- a/bin/tests/system/geoip/ns2/named11.conf.in
+++ b/bin/tests/system/geoip/ns2/named11.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named12.conf.in b/bin/tests/system/geoip/ns2/named12.conf.in
index 723ae217f9f..68abc85f164 100644
--- a/bin/tests/system/geoip/ns2/named12.conf.in
+++ b/bin/tests/system/geoip/ns2/named12.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named13.conf.in b/bin/tests/system/geoip/ns2/named13.conf.in
index 3dd92d3a0a8..05a331406de 100644
--- a/bin/tests/system/geoip/ns2/named13.conf.in
+++ b/bin/tests/system/geoip/ns2/named13.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named14.conf.in b/bin/tests/system/geoip/ns2/named14.conf.in
index 0d7776b4f9e..6d9d9667b9d 100644
--- a/bin/tests/system/geoip/ns2/named14.conf.in
+++ b/bin/tests/system/geoip/ns2/named14.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named15.conf.in b/bin/tests/system/geoip/ns2/named15.conf.in
index cd041e9c9d2..01ee377cba0 100644
--- a/bin/tests/system/geoip/ns2/named15.conf.in
+++ b/bin/tests/system/geoip/ns2/named15.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named2.conf.in b/bin/tests/system/geoip/ns2/named2.conf.in
index e497e14d7d5..541f904b38f 100644
--- a/bin/tests/system/geoip/ns2/named2.conf.in
+++ b/bin/tests/system/geoip/ns2/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named3.conf.in b/bin/tests/system/geoip/ns2/named3.conf.in
index 6e2da2a299d..a8cf6a3a8e0 100644
--- a/bin/tests/system/geoip/ns2/named3.conf.in
+++ b/bin/tests/system/geoip/ns2/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named4.conf.in b/bin/tests/system/geoip/ns2/named4.conf.in
index 64b30fbfb38..81e3e65d4a3 100644
--- a/bin/tests/system/geoip/ns2/named4.conf.in
+++ b/bin/tests/system/geoip/ns2/named4.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named5.conf.in b/bin/tests/system/geoip/ns2/named5.conf.in
index 6a670a6d426..0c4ce5084ba 100644
--- a/bin/tests/system/geoip/ns2/named5.conf.in
+++ b/bin/tests/system/geoip/ns2/named5.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named6.conf.in b/bin/tests/system/geoip/ns2/named6.conf.in
index 1696bde98c4..195133bf9ff 100644
--- a/bin/tests/system/geoip/ns2/named6.conf.in
+++ b/bin/tests/system/geoip/ns2/named6.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named7.conf.in b/bin/tests/system/geoip/ns2/named7.conf.in
index f70ecc62730..4fa4626da25 100644
--- a/bin/tests/system/geoip/ns2/named7.conf.in
+++ b/bin/tests/system/geoip/ns2/named7.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named8.conf.in b/bin/tests/system/geoip/ns2/named8.conf.in
index c9fc07318f9..2840c8fbc54 100644
--- a/bin/tests/system/geoip/ns2/named8.conf.in
+++ b/bin/tests/system/geoip/ns2/named8.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/ns2/named9.conf.in b/bin/tests/system/geoip/ns2/named9.conf.in
index 9c76a51a6bd..720f7accb99 100644
--- a/bin/tests/system/geoip/ns2/named9.conf.in
+++ b/bin/tests/system/geoip/ns2/named9.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/options.conf b/bin/tests/system/geoip/options.conf
index 1e7c44d1cf3..95df0af1647 100644
--- a/bin/tests/system/geoip/options.conf
+++ b/bin/tests/system/geoip/options.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 // NS2
diff --git a/bin/tests/system/geoip/prereq.sh b/bin/tests/system/geoip/prereq.sh
index d89b2e586de..9bd44297b22 100644
--- a/bin/tests/system/geoip/prereq.sh
+++ b/bin/tests/system/geoip/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/geoip/setup.sh b/bin/tests/system/geoip/setup.sh
index 3d0be451496..c85dd905193 100644
--- a/bin/tests/system/geoip/setup.sh
+++ b/bin/tests/system/geoip/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/geoip/tests.sh b/bin/tests/system/geoip/tests.sh
index 3e2d5c7f2c4..cb1473af79a 100644
--- a/bin/tests/system/geoip/tests.sh
+++ b/bin/tests/system/geoip/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index 0f80c5c6083..25e408dc12b 100644
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 #
 # Clean up after glue tests.
diff --git a/bin/tests/system/glue/ns1/cache.in b/bin/tests/system/glue/ns1/cache.in
index 31f22da9f8d..bec46d20f8a 100644
--- a/bin/tests/system/glue/ns1/cache.in
+++ b/bin/tests/system/glue/ns1/cache.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: cache.in,v 1.4 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db
index e44f2e5c65c..e3be420f701 100644
--- a/bin/tests/system/glue/ns1/mil.db
+++ b/bin/tests/system/glue/ns1/mil.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: mil.db,v 1.8 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/glue/ns1/named.conf.in b/bin/tests/system/glue/ns1/named.conf.in
index d2850c100fc..20cc8870af2 100644
--- a/bin/tests/system/glue/ns1/named.conf.in
+++ b/bin/tests/system/glue/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 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.
  */
 
 options {
diff --git a/bin/tests/system/glue/ns1/net.db b/bin/tests/system/glue/ns1/net.db
index 6c71d57769f..e9d460c3bd1 100644
--- a/bin/tests/system/glue/ns1/net.db
+++ b/bin/tests/system/glue/ns1/net.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: net.db,v 1.8 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/glue/ns1/root-servers.nil.db b/bin/tests/system/glue/ns1/root-servers.nil.db
index 1bc47dcc306..1543498cde9 100644
--- a/bin/tests/system/glue/ns1/root-servers.nil.db
+++ b/bin/tests/system/glue/ns1/root-servers.nil.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root-servers.nil.db,v 1.7 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db
index 553401ae985..c531a506110 100644
--- a/bin/tests/system/glue/ns1/root.db
+++ b/bin/tests/system/glue/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  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.
 
 ; $Id: root.db,v 1.7 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 65be1979ffa..062e453fd65 100644
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index 9a511f1e22b..570872922a5 100644
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2003, 2004, 2007, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/gost/clean.sh b/bin/tests/system/gost/clean.sh
index 93db3a61d07..3779676eea4 100644
--- a/bin/tests/system/gost/clean.sh
+++ b/bin/tests/system/gost/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 rm -f */K* */dsset-* */*.signed */trusted.conf
 rm -f ns1/root.db
diff --git a/bin/tests/system/gost/ns1/named.conf b/bin/tests/system/gost/ns1/named.conf
index a0352691f64..c078d522cb4 100644
--- a/bin/tests/system/gost/ns1/named.conf
+++ b/bin/tests/system/gost/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: named.conf,v 1.2 2010/12/23 04:08:00 marka Exp $ */
diff --git a/bin/tests/system/gost/ns1/root.db.in b/bin/tests/system/gost/ns1/root.db.in
index 260ddacc502..5b01c6da609 100644
--- a/bin/tests/system/gost/ns1/root.db.in
+++ b/bin/tests/system/gost/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.db.in,v 1.2 2010/12/23 04:08:00 marka Exp $
 
diff --git a/bin/tests/system/gost/ns1/sign.sh b/bin/tests/system/gost/ns1/sign.sh
index 959c6c9bf5f..bdd78d53416 100644
--- a/bin/tests/system/gost/ns1/sign.sh
+++ b/bin/tests/system/gost/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/gost/ns2/named.conf b/bin/tests/system/gost/ns2/named.conf
index 07bebef826e..4178bdac783 100644
--- a/bin/tests/system/gost/ns2/named.conf
+++ b/bin/tests/system/gost/ns2/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: named.conf,v 1.2 2010/12/23 04:08:00 marka Exp $ */
diff --git a/bin/tests/system/gost/prereq.sh b/bin/tests/system/gost/prereq.sh
index 7184492ca96..f5295b71852 100644
--- a/bin/tests/system/gost/prereq.sh
+++ b/bin/tests/system/gost/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/gost/setup.sh b/bin/tests/system/gost/setup.sh
index 08d0dbf36f1..c48b526bdef 100644
--- a/bin/tests/system/gost/setup.sh
+++ b/bin/tests/system/gost/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/gost/tests.sh b/bin/tests/system/gost/tests.sh
index db00fd48119..d013c770e4f 100644
--- a/bin/tests/system/gost/tests.sh
+++ b/bin/tests/system/gost/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2013, 2016  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.
 
 # $Id: tests.sh,v 1.2 2010/12/23 04:08:00 marka Exp $
 
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 0ca3fce2835..52d195dbb56 100644
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2004, 2007-2010, 2012, 2013, 2016  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.
 
 # $Id: ifconfig.sh,v 1.59 2010/06/11 23:46:49 tbox Exp $
 
diff --git a/bin/tests/system/inline/checkdsa.sh.in b/bin/tests/system/inline/checkdsa.sh.in
index 4c9d843ed1c..5b6ea2ebd32 100644
--- a/bin/tests/system/inline/checkdsa.sh.in
+++ b/bin/tests/system/inline/checkdsa.sh.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2013, 2014, 2016  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.
 
 if [ "@CHECK_DSA@" -eq 0 ]; then
 	exit 1
diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh
index 184191cc82e..8e4199a60a4 100644
--- a/bin/tests/system/inline/clean.sh
+++ b/bin/tests/system/inline/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2011-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.
 
 rm -f */named.conf
 rm -f */named.memstats
diff --git a/bin/tests/system/inline/ns1/named.conf.in b/bin/tests/system/inline/ns1/named.conf.in
index d097229ac24..215800cab08 100644
--- a/bin/tests/system/inline/ns1/named.conf.in
+++ b/bin/tests/system/inline/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/inline/ns1/root.db.in b/bin/tests/system/inline/ns1/root.db.in
index ac0a5ff51ba..af2d0dff7d7 100644
--- a/bin/tests/system/inline/ns1/root.db.in
+++ b/bin/tests/system/inline/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-2013, 2016, 2017  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.
 
 ; $Id: root.db.in,v 1.8 2012/02/23 06:53:15 marka Exp $
 
diff --git a/bin/tests/system/inline/ns1/sign.sh b/bin/tests/system/inline/ns1/sign.sh
index b4c0c41890b..8e59d1f3887 100644
--- a/bin/tests/system/inline/ns1/sign.sh
+++ b/bin/tests/system/inline/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011, 2012, 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.5 2012/02/23 07:09:28 tbox Exp $
 
diff --git a/bin/tests/system/inline/ns2/bits.db.in b/bin/tests/system/inline/ns2/bits.db.in
index d49b21ce1a1..95f56837583 100644
--- a/bin/tests/system/inline/ns2/bits.db.in
+++ b/bin/tests/system/inline/ns2/bits.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: bits.db.in,v 1.2 2011/08/30 23:46:52 tbox Exp $
 
diff --git a/bin/tests/system/inline/ns2/named.conf.in b/bin/tests/system/inline/ns2/named.conf.in
index daf0152bb67..5f4585b5329 100644
--- a/bin/tests/system/inline/ns2/named.conf.in
+++ b/bin/tests/system/inline/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 // NS2
diff --git a/bin/tests/system/inline/ns2/nsec3-loop.db b/bin/tests/system/inline/ns2/nsec3-loop.db
index 4929c21e817..ba0db9d3e9e 100644
--- a/bin/tests/system/inline/ns2/nsec3-loop.db
+++ b/bin/tests/system/inline/ns2/nsec3-loop.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; NOTE: This zone's data has been crafted in order to reproduce a very specific
 ; scenario (see ns7/named.conf for more details).  Please do not modify this
diff --git a/bin/tests/system/inline/ns3/master.db.in b/bin/tests/system/inline/ns3/master.db.in
index 03ed5c95f59..b708279ad28 100644
--- a/bin/tests/system/inline/ns3/master.db.in
+++ b/bin/tests/system/inline/ns3/master.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id: master.db.in,v 1.4 2012/01/16 23:46:46 tbox Exp $
 
diff --git a/bin/tests/system/inline/ns3/master2.db.in b/bin/tests/system/inline/ns3/master2.db.in
index 34533cb3438..0dd6752f7c6 100644
--- a/bin/tests/system/inline/ns3/master2.db.in
+++ b/bin/tests/system/inline/ns3/master2.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id: master2.db.in,v 1.4 2012/01/16 23:46:46 tbox Exp $
 
diff --git a/bin/tests/system/inline/ns3/master3.db.in b/bin/tests/system/inline/ns3/master3.db.in
index aeac5cbb2b1..75ae400d9b3 100644
--- a/bin/tests/system/inline/ns3/master3.db.in
+++ b/bin/tests/system/inline/ns3/master3.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: master3.db.in,v 1.3 2012/01/31 23:47:32 tbox Exp $
 
diff --git a/bin/tests/system/inline/ns3/master4.db.in b/bin/tests/system/inline/ns3/master4.db.in
index 241e9c14ee0..fb9f58a4eec 100644
--- a/bin/tests/system/inline/ns3/master4.db.in
+++ b/bin/tests/system/inline/ns3/master4.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: master3.db.in,v 1.3 2012/01/31 23:47:32 tbox Exp $
 
diff --git a/bin/tests/system/inline/ns3/named.conf.in b/bin/tests/system/inline/ns3/named.conf.in
index ca79fd1c394..ce3da9e8709 100644
--- a/bin/tests/system/inline/ns3/named.conf.in
+++ b/bin/tests/system/inline/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 // NS3
diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh
index 0981712ec25..c3a35442405 100755
--- a/bin/tests/system/inline/ns3/sign.sh
+++ b/bin/tests/system/inline/ns3/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011-2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/inline/ns4/named.conf.in b/bin/tests/system/inline/ns4/named.conf.in
index 296ccd8c719..c20c74e6cb5 100644
--- a/bin/tests/system/inline/ns4/named.conf.in
+++ b/bin/tests/system/inline/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS4
diff --git a/bin/tests/system/inline/ns4/noixfr.db.in b/bin/tests/system/inline/ns4/noixfr.db.in
index 7d1983932fc..6b37a4b39e8 100644
--- a/bin/tests/system/inline/ns4/noixfr.db.in
+++ b/bin/tests/system/inline/ns4/noixfr.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: noixfr.db.in,v 1.2 2011/08/30 23:46:52 tbox Exp $
 
diff --git a/bin/tests/system/inline/ns5/named.conf.post b/bin/tests/system/inline/ns5/named.conf.post
index d59679fa29b..2a241e57c2f 100644
--- a/bin/tests/system/inline/ns5/named.conf.post
+++ b/bin/tests/system/inline/ns5/named.conf.post
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 // NS5
diff --git a/bin/tests/system/inline/ns5/named.conf.pre b/bin/tests/system/inline/ns5/named.conf.pre
index d7f4515ecb7..dd92ebe32fd 100644
--- a/bin/tests/system/inline/ns5/named.conf.pre
+++ b/bin/tests/system/inline/ns5/named.conf.pre
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS5
diff --git a/bin/tests/system/inline/ns6/named.conf.in b/bin/tests/system/inline/ns6/named.conf.in
index e5c1684e921..dc8b5ecd98c 100644
--- a/bin/tests/system/inline/ns6/named.conf.in
+++ b/bin/tests/system/inline/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS6
diff --git a/bin/tests/system/inline/ns7/named.conf.in b/bin/tests/system/inline/ns7/named.conf.in
index 61ab4f20706..084796681fe 100644
--- a/bin/tests/system/inline/ns7/named.conf.in
+++ b/bin/tests/system/inline/ns7/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*
diff --git a/bin/tests/system/inline/ns7/sign.sh b/bin/tests/system/inline/ns7/sign.sh
index 07a1f29a776..9fd5553edbe 100755
--- a/bin/tests/system/inline/ns7/sign.sh
+++ b/bin/tests/system/inline/ns7/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/inline/prereq.sh b/bin/tests/system/inline/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/inline/prereq.sh
+++ b/bin/tests/system/inline/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh
index 4ae7bf80e42..99e696a93dd 100644
--- a/bin/tests/system/inline/setup.sh
+++ b/bin/tests/system/inline/setup.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index 18342d66a0f..8d6fc546c42 100755
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/integrity/clean.sh b/bin/tests/system/integrity/clean.sh
index ac4cb6a0e48..d9c14533b98 100644
--- a/bin/tests/system/integrity/clean.sh
+++ b/bin/tests/system/integrity/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f dig.out.test*
 rm -f */named.memstats
diff --git a/bin/tests/system/integrity/ns1/mx-cname.db b/bin/tests/system/integrity/ns1/mx-cname.db
index d575084f0b4..550f9851dc1 100644
--- a/bin/tests/system/integrity/ns1/mx-cname.db
+++ b/bin/tests/system/integrity/ns1/mx-cname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL	3600
 @	SOA	ns1 hostmaster 0 0 0 0 0
diff --git a/bin/tests/system/integrity/ns1/named.conf.in b/bin/tests/system/integrity/ns1/named.conf.in
index 426b3fd7541..bc043326eef 100644
--- a/bin/tests/system/integrity/ns1/named.conf.in
+++ b/bin/tests/system/integrity/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/integrity/ns1/srv-cname.db b/bin/tests/system/integrity/ns1/srv-cname.db
index 0628678f4cd..d0dca6c09f3 100644
--- a/bin/tests/system/integrity/ns1/srv-cname.db
+++ b/bin/tests/system/integrity/ns1/srv-cname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL	3600
 @	SOA	ns1 hostmaster 0 0 0 0 0
diff --git a/bin/tests/system/integrity/setup.sh b/bin/tests/system/integrity/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/integrity/setup.sh
+++ b/bin/tests/system/integrity/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/integrity/tests.sh b/bin/tests/system/integrity/tests.sh
index 95c57ed3d94..8d494d92dc4 100644
--- a/bin/tests/system/integrity/tests.sh
+++ b/bin/tests/system/integrity/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh
index 4b157e5c562..a935a955a71 100644
--- a/bin/tests/system/ixfr/clean.sh
+++ b/bin/tests/system/ixfr/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 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.
 
 rm -f ns1/myftp.db
 rm -f ns3/*.jnl ns3/mytest.db ns3/subtest.db
diff --git a/bin/tests/system/ixfr/ns3/mytest0.db b/bin/tests/system/ixfr/ns3/mytest0.db
index b10846edd4a..78a25e0fa5b 100644
--- a/bin/tests/system/ixfr/ns3/mytest0.db
+++ b/bin/tests/system/ixfr/ns3/mytest0.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: mytest0.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
 
diff --git a/bin/tests/system/ixfr/ns3/mytest1.db b/bin/tests/system/ixfr/ns3/mytest1.db
index 26ccd77c060..7b6d32c28e9 100644
--- a/bin/tests/system/ixfr/ns3/mytest1.db
+++ b/bin/tests/system/ixfr/ns3/mytest1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: mytest1.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
 
diff --git a/bin/tests/system/ixfr/ns3/mytest2.db b/bin/tests/system/ixfr/ns3/mytest2.db
index f40c031119c..b82267856a6 100644
--- a/bin/tests/system/ixfr/ns3/mytest2.db
+++ b/bin/tests/system/ixfr/ns3/mytest2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: mytest2.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
 
diff --git a/bin/tests/system/ixfr/ns3/named.conf.in b/bin/tests/system/ixfr/ns3/named.conf.in
index 687d27dc4e5..4ffb872b8fb 100644
--- a/bin/tests/system/ixfr/ns3/named.conf.in
+++ b/bin/tests/system/ixfr/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/ixfr/ns3/subtest0.db b/bin/tests/system/ixfr/ns3/subtest0.db
index 90b1371db46..97debfc487c 100644
--- a/bin/tests/system/ixfr/ns3/subtest0.db
+++ b/bin/tests/system/ixfr/ns3/subtest0.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: subtest0.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
 
diff --git a/bin/tests/system/ixfr/ns3/subtest1.db b/bin/tests/system/ixfr/ns3/subtest1.db
index e93724f5d97..d36b21b58e5 100644
--- a/bin/tests/system/ixfr/ns3/subtest1.db
+++ b/bin/tests/system/ixfr/ns3/subtest1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: subtest1.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
 
diff --git a/bin/tests/system/ixfr/ns4/named.conf.in b/bin/tests/system/ixfr/ns4/named.conf.in
index 57773e83b03..d3490b18e41 100644
--- a/bin/tests/system/ixfr/ns4/named.conf.in
+++ b/bin/tests/system/ixfr/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh
index f60aa793062..affe54bfcfc 100644
--- a/bin/tests/system/ixfr/prereq.sh
+++ b/bin/tests/system/ixfr/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2012, 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.
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index bf9bc8d2327..21df2e6bcd6 100644
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index c210a5c5ec2..c3ebfdc31dd 100644
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 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.
 
 
 # WARNING: The test labelled "testing request-ixfr option in view vs zone"
diff --git a/bin/tests/system/keepalive/clean.sh b/bin/tests/system/keepalive/clean.sh
index c3fd7057cc2..53b12b031b8 100644
--- a/bin/tests/system/keepalive/clean.sh
+++ b/bin/tests/system/keepalive/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f dig.out.*
 rm -f output
diff --git a/bin/tests/system/keepalive/ns1/named.conf.in b/bin/tests/system/keepalive/ns1/named.conf.in
index d8202027874..828bc40b7b4 100644
--- a/bin/tests/system/keepalive/ns1/named.conf.in
+++ b/bin/tests/system/keepalive/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/keepalive/ns1/root.db b/bin/tests/system/keepalive/ns1/root.db
index 69faf3dd31d..dab5cea7f77 100644
--- a/bin/tests/system/keepalive/ns1/root.db
+++ b/bin/tests/system/keepalive/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/keepalive/ns2/example.db b/bin/tests/system/keepalive/ns2/example.db
index 5d4ece22606..1edd62e6e18 100644
--- a/bin/tests/system/keepalive/ns2/example.db
+++ b/bin/tests/system/keepalive/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	SOA	ns2 hostmaster.isc.org. 1 600 600 1200 600
 @ 	NS	ns2
diff --git a/bin/tests/system/keepalive/ns2/named.conf.in b/bin/tests/system/keepalive/ns2/named.conf.in
index eac21a15f08..4406a45e47e 100644
--- a/bin/tests/system/keepalive/ns2/named.conf.in
+++ b/bin/tests/system/keepalive/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/keepalive/ns3/named.conf.in b/bin/tests/system/keepalive/ns3/named.conf.in
index 1ed1fd02a95..c018e11178e 100644
--- a/bin/tests/system/keepalive/ns3/named.conf.in
+++ b/bin/tests/system/keepalive/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/keepalive/setup.sh b/bin/tests/system/keepalive/setup.sh
index 15d49fa5ab4..dc74cd786ff 100644
--- a/bin/tests/system/keepalive/setup.sh
+++ b/bin/tests/system/keepalive/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/keepalive/tests.sh b/bin/tests/system/keepalive/tests.sh
index 82299cef30b..7983aa1a94d 100644
--- a/bin/tests/system/keepalive/tests.sh
+++ b/bin/tests/system/keepalive/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/keymgr/01-ksk-inactive/README b/bin/tests/system/keymgr/01-ksk-inactive/README
index 4d211f24fc7..e5f05faac90 100644
--- a/bin/tests/system/keymgr/01-ksk-inactive/README
+++ b/bin/tests/system/keymgr/01-ksk-inactive/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 df845c6d640..bed65b87e6e 100644
--- a/bin/tests/system/keymgr/02-zsk-inactive/README
+++ b/bin/tests/system/keymgr/02-zsk-inactive/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 21f8568aa2a..3cded5788b8 100644
--- a/bin/tests/system/keymgr/03-ksk-unpublished/README
+++ b/bin/tests/system/keymgr/03-ksk-unpublished/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 5c788d4f13c..98ad332843b 100644
--- a/bin/tests/system/keymgr/04-zsk-unpublished/README
+++ b/bin/tests/system/keymgr/04-zsk-unpublished/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 743bd7f3bf4..3c176900297 100644
--- a/bin/tests/system/keymgr/05-ksk-unpub-active/README
+++ b/bin/tests/system/keymgr/05-ksk-unpub-active/README
@@ -1,9 +1,12 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
 and its successor activated.
diff --git a/bin/tests/system/keymgr/06-zsk-unpub-active/README b/bin/tests/system/keymgr/06-zsk-unpub-active/README
index 743bd7f3bf4..3c176900297 100644
--- a/bin/tests/system/keymgr/06-zsk-unpub-active/README
+++ b/bin/tests/system/keymgr/06-zsk-unpub-active/README
@@ -1,9 +1,12 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
 and its successor activated.
diff --git a/bin/tests/system/keymgr/07-ksk-ttl/README b/bin/tests/system/keymgr/07-ksk-ttl/README
index c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/07-ksk-ttl/README
+++ b/bin/tests/system/keymgr/07-ksk-ttl/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/08-zsk-ttl/README
+++ b/bin/tests/system/keymgr/08-zsk-ttl/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 b9e895e2a81..699f97f666f 100644
--- a/bin/tests/system/keymgr/09-no-keys/README
+++ b/bin/tests/system/keymgr/09-no-keys/README
@@ -1,7 +1,10 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 a46ca19a12d..563748af9d8 100644
--- a/bin/tests/system/keymgr/10-change-roll/README
+++ b/bin/tests/system/keymgr/10-change-roll/README
@@ -1,9 +1,12 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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
 one year.
diff --git a/bin/tests/system/keymgr/11-many-simul/README b/bin/tests/system/keymgr/11-many-simul/README
index c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/11-many-simul/README
+++ b/bin/tests/system/keymgr/11-many-simul/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/12-many-active/README
+++ b/bin/tests/system/keymgr/12-many-active/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/13-noroll/README
+++ b/bin/tests/system/keymgr/13-noroll/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/14-wrongalg/README
+++ b/bin/tests/system/keymgr/14-wrongalg/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/15-unspec/README
+++ b/bin/tests/system/keymgr/15-unspec/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/16-wrongalg-unspec/README
+++ b/bin/tests/system/keymgr/16-wrongalg-unspec/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 c71d2dffd18..5ffc1cbbd9c 100644
--- a/bin/tests/system/keymgr/17-noforce/README
+++ b/bin/tests/system/keymgr/17-noforce/README
@@ -1,8 +1,11 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 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 4709280e2ee..2f13fec9ee1 100644
--- a/bin/tests/system/keymgr/18-nonstd-prepub/README
+++ b/bin/tests/system/keymgr/18-nonstd-prepub/README
@@ -1,9 +1,12 @@
-Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016, 2018  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 directory has a key set which is valid, but will expire within
 the rollover period. The prepublication interval in policy.conf is a
 nonstandard value.
diff --git a/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf b/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf
index cfe3aa92f13..91817ff41b6 100644
--- a/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf
+++ b/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 policy default {
diff --git a/bin/tests/system/keymgr/clean.sh b/bin/tests/system/keymgr/clean.sh
index 9eb7b7abcf9..dc9f0a0c843 100644
--- a/bin/tests/system/keymgr/clean.sh
+++ b/bin/tests/system/keymgr/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  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.
 
 rm -f */K*.key
 rm -f */K*.private
diff --git a/bin/tests/system/keymgr/policy.conf b/bin/tests/system/keymgr/policy.conf
index 921d6f8594c..4da487a61d6 100644
--- a/bin/tests/system/keymgr/policy.conf
+++ b/bin/tests/system/keymgr/policy.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 policy default {
diff --git a/bin/tests/system/keymgr/policy.sample b/bin/tests/system/keymgr/policy.sample
index c759dfa10f0..4594091fa80 100644
--- a/bin/tests/system/keymgr/policy.sample
+++ b/bin/tests/system/keymgr/policy.sample
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 # a comment which should be skipped
diff --git a/bin/tests/system/keymgr/prereq.sh b/bin/tests/system/keymgr/prereq.sh
index 8c9ecd69ab1..a0d4e9ce14a 100644
--- a/bin/tests/system/keymgr/prereq.sh
+++ b/bin/tests/system/keymgr/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/keymgr/setup.sh b/bin/tests/system/keymgr/setup.sh
index 45b17f55a68..9720016db50 100644
--- a/bin/tests/system/keymgr/setup.sh
+++ b/bin/tests/system/keymgr/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/keymgr/testpolicy.py b/bin/tests/system/keymgr/testpolicy.py
index 2dff6838600..e9125cf3477 100644
--- a/bin/tests/system/keymgr/testpolicy.py
+++ b/bin/tests/system/keymgr/testpolicy.py
@@ -1,9 +1,12 @@
 ############################################################################
-# Copyright (C) 2016  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.
 ############################################################################
 
 import sys
diff --git a/bin/tests/system/keymgr/tests.sh b/bin/tests/system/keymgr/tests.sh
index 16e3c4bbfd2..88b43d90fb4 100644
--- a/bin/tests/system/keymgr/tests.sh
+++ b/bin/tests/system/keymgr/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/legacy/build.sh b/bin/tests/system/legacy/build.sh
index c6f328f8b7c..6c9d7df9bd9 100644
--- a/bin/tests/system/legacy/build.sh
+++ b/bin/tests/system/legacy/build.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/legacy/clean.sh b/bin/tests/system/legacy/clean.sh
index aaac0db1e7a..50237dc5a3a 100644
--- a/bin/tests/system/legacy/clean.sh
+++ b/bin/tests/system/legacy/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f dig.out.*
 rm -f ns?/named.conf
diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in
index 5c85935ab14..c5833a41c68 100644
--- a/bin/tests/system/legacy/ns1/named1.conf.in
+++ b/bin/tests/system/legacy/ns1/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns1/named2.conf.in b/bin/tests/system/legacy/ns1/named2.conf.in
index 266a479124d..e3edb027a19 100644
--- a/bin/tests/system/legacy/ns1/named2.conf.in
+++ b/bin/tests/system/legacy/ns1/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns1/root.db b/bin/tests/system/legacy/ns1/root.db
index efa3a14ac4e..78ae65b8a1b 100644
--- a/bin/tests/system/legacy/ns1/root.db
+++ b/bin/tests/system/legacy/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 60
 .			SOA	ns1.	marka.isc.org 1 0 0 0 0
diff --git a/bin/tests/system/legacy/ns2/dropedns.db b/bin/tests/system/legacy/ns2/dropedns.db
index 48f606eb383..3bf81cd1978 100644
--- a/bin/tests/system/legacy/ns2/dropedns.db
+++ b/bin/tests/system/legacy/ns2/dropedns.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	60	SOA	ns marka.isc.org. 1 0 0 0 0
 @	60	NS	ns
diff --git a/bin/tests/system/legacy/ns2/named.conf.in b/bin/tests/system/legacy/ns2/named.conf.in
index 47396f20809..552227d6c8c 100644
--- a/bin/tests/system/legacy/ns2/named.conf.in
+++ b/bin/tests/system/legacy/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns3/dropedns-notcp.db b/bin/tests/system/legacy/ns3/dropedns-notcp.db
index 8829f9043fd..40f5e1116e1 100644
--- a/bin/tests/system/legacy/ns3/dropedns-notcp.db
+++ b/bin/tests/system/legacy/ns3/dropedns-notcp.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	60	SOA	ns marka.isc.org. 1 0 0 0 0
 @	60	NS	ns
diff --git a/bin/tests/system/legacy/ns3/named.conf.in b/bin/tests/system/legacy/ns3/named.conf.in
index f05b9fa3022..8d10f9372d1 100644
--- a/bin/tests/system/legacy/ns3/named.conf.in
+++ b/bin/tests/system/legacy/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns4/named.conf.in b/bin/tests/system/legacy/ns4/named.conf.in
index 521d99f8632..91c1203245b 100644
--- a/bin/tests/system/legacy/ns4/named.conf.in
+++ b/bin/tests/system/legacy/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns4/plain.db b/bin/tests/system/legacy/ns4/plain.db
index 652616c2b2e..fd5be9f23bb 100644
--- a/bin/tests/system/legacy/ns4/plain.db
+++ b/bin/tests/system/legacy/ns4/plain.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	60	SOA	ns marka.isc.org. 1 0 0 0 0
 @	60	NS	ns
diff --git a/bin/tests/system/legacy/ns5/named.conf.in b/bin/tests/system/legacy/ns5/named.conf.in
index bf8ca15664b..2cb4af43b2f 100644
--- a/bin/tests/system/legacy/ns5/named.conf.in
+++ b/bin/tests/system/legacy/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns5/plain-notcp.db b/bin/tests/system/legacy/ns5/plain-notcp.db
index 07429005216..51c9e101a5d 100644
--- a/bin/tests/system/legacy/ns5/plain-notcp.db
+++ b/bin/tests/system/legacy/ns5/plain-notcp.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	60	SOA	ns marka.isc.org. 1 0 0 0 0
 @	60	NS	ns
diff --git a/bin/tests/system/legacy/ns6/edns512.db.in b/bin/tests/system/legacy/ns6/edns512.db.in
index 28e7ca633f5..6da723f1807 100644
--- a/bin/tests/system/legacy/ns6/edns512.db.in
+++ b/bin/tests/system/legacy/ns6/edns512.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	60	SOA	ns marka.isc.org. 1 0 0 0 0
 @	60	NS	ns
diff --git a/bin/tests/system/legacy/ns6/named.conf.in b/bin/tests/system/legacy/ns6/named.conf.in
index 37368125fbf..8080003780b 100644
--- a/bin/tests/system/legacy/ns6/named.conf.in
+++ b/bin/tests/system/legacy/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns6/sign.sh b/bin/tests/system/legacy/ns6/sign.sh
index 57625d45c96..a6d1fc29967 100755
--- a/bin/tests/system/legacy/ns6/sign.sh
+++ b/bin/tests/system/legacy/ns6/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/legacy/ns7/edns512-notcp.db.in b/bin/tests/system/legacy/ns7/edns512-notcp.db.in
index cf43360197a..007eefca619 100644
--- a/bin/tests/system/legacy/ns7/edns512-notcp.db.in
+++ b/bin/tests/system/legacy/ns7/edns512-notcp.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	60	SOA	ns marka.isc.org. 1 0 0 0 0
 @	60	NS	ns
diff --git a/bin/tests/system/legacy/ns7/named.conf.in b/bin/tests/system/legacy/ns7/named.conf.in
index df2696ead43..d48a190c625 100644
--- a/bin/tests/system/legacy/ns7/named.conf.in
+++ b/bin/tests/system/legacy/ns7/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/legacy/ns7/sign.sh b/bin/tests/system/legacy/ns7/sign.sh
index bc283da4269..27dd46c4684 100755
--- a/bin/tests/system/legacy/ns7/sign.sh
+++ b/bin/tests/system/legacy/ns7/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/legacy/setup.sh b/bin/tests/system/legacy/setup.sh
index 9f545ac2c0e..b41da9eb861 100644
--- a/bin/tests/system/legacy/setup.sh
+++ b/bin/tests/system/legacy/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index e5e0ef7f3cd..c4356f2456f 100755
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh
index a6ab97e2ef4..73f4bc3a8d7 100644
--- a/bin/tests/system/limits/clean.sh
+++ b/bin/tests/system/limits/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 #
 # Clean up after limits tests.
diff --git a/bin/tests/system/limits/ns1/example.db b/bin/tests/system/limits/ns1/example.db
index 02b492c689d..5b332d99b28 100644
--- a/bin/tests/system/limits/ns1/example.db
+++ b/bin/tests/system/limits/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example.db,v 1.10 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/limits/ns1/named.conf.in b/bin/tests/system/limits/ns1/named.conf.in
index fda9c559cd8..2395de25d3c 100644
--- a/bin/tests/system/limits/ns1/named.conf.in
+++ b/bin/tests/system/limits/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/limits/ns1/root.db b/bin/tests/system/limits/ns1/root.db
index de15fadb436..65134b148b2 100644
--- a/bin/tests/system/limits/ns1/root.db
+++ b/bin/tests/system/limits/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.9 2007/06/19 23:47:03 tbox Exp $
 
diff --git a/bin/tests/system/limits/setup.sh b/bin/tests/system/limits/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/limits/setup.sh
+++ b/bin/tests/system/limits/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh
index 7be75eaa3b4..0247bf5e228 100644
--- a/bin/tests/system/limits/tests.sh
+++ b/bin/tests/system/limits/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index 32d4abb479e..cdeef433d06 100644
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014-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.
 
 #
 # Clean up after log file tests
diff --git a/bin/tests/system/logfileconfig/ns1/controls.conf.in b/bin/tests/system/logfileconfig/ns1/controls.conf.in
index fe7e97ea1a3..74084d96afc 100644
--- a/bin/tests/system/logfileconfig/ns1/controls.conf.in
+++ b/bin/tests/system/logfileconfig/ns1/controls.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 controls {
diff --git a/bin/tests/system/logfileconfig/ns1/named.dirconf b/bin/tests/system/logfileconfig/ns1/named.dirconf
index 023bd588da2..dcc02d323e8 100644
--- a/bin/tests/system/logfileconfig/ns1/named.dirconf
+++ b/bin/tests/system/logfileconfig/ns1/named.dirconf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601 b/bin/tests/system/logfileconfig/ns1/named.iso8601
index d089184696f..0444b476c32 100644
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
index 37a6ecf9041..44e91984bc6 100644
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.pipeconf b/bin/tests/system/logfileconfig/ns1/named.pipeconf
index 417694ef1a7..cc8fe36bb82 100644
--- a/bin/tests/system/logfileconfig/ns1/named.pipeconf
+++ b/bin/tests/system/logfileconfig/ns1/named.pipeconf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.plain b/bin/tests/system/logfileconfig/ns1/named.plain
index 0b3a2335326..0ef783254ab 100644
--- a/bin/tests/system/logfileconfig/ns1/named.plain
+++ b/bin/tests/system/logfileconfig/ns1/named.plain
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.plainconf b/bin/tests/system/logfileconfig/ns1/named.plainconf
index 56ff0d4d775..75e0c793ed6 100644
--- a/bin/tests/system/logfileconfig/ns1/named.plainconf
+++ b/bin/tests/system/logfileconfig/ns1/named.plainconf
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.symconf b/bin/tests/system/logfileconfig/ns1/named.symconf
index 5ffb5a7d1fe..34a0e1214c8 100644
--- a/bin/tests/system/logfileconfig/ns1/named.symconf
+++ b/bin/tests/system/logfileconfig/ns1/named.symconf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.tsconf b/bin/tests/system/logfileconfig/ns1/named.tsconf
index 09b943fcca8..a1d95c49253 100644
--- a/bin/tests/system/logfileconfig/ns1/named.tsconf
+++ b/bin/tests/system/logfileconfig/ns1/named.tsconf
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited b/bin/tests/system/logfileconfig/ns1/named.unlimited
index 7add1f53ca9..cca3982731a 100644
--- a/bin/tests/system/logfileconfig/ns1/named.unlimited
+++ b/bin/tests/system/logfileconfig/ns1/named.unlimited
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/named.versconf b/bin/tests/system/logfileconfig/ns1/named.versconf
index e07656a8b52..6e293c7c7fb 100644
--- a/bin/tests/system/logfileconfig/ns1/named.versconf
+++ b/bin/tests/system/logfileconfig/ns1/named.versconf
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/rndc.conf.in b/bin/tests/system/logfileconfig/ns1/rndc.conf.in
index 665438be27b..7e67a2405a0 100644
--- a/bin/tests/system/logfileconfig/ns1/rndc.conf.in
+++ b/bin/tests/system/logfileconfig/ns1/rndc.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/logfileconfig/ns1/root.db b/bin/tests/system/logfileconfig/ns1/root.db
index 7b2c85a56e7..6e64ba469b6 100644
--- a/bin/tests/system/logfileconfig/ns1/root.db
+++ b/bin/tests/system/logfileconfig/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: root.db,v 1.3 2011/03/05 23:52:30 tbox Exp $
 
diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh
index 7028e7564a8..d711288a9ab 100644
--- a/bin/tests/system/logfileconfig/setup.sh
+++ b/bin/tests/system/logfileconfig/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index 33734965e23..6d3c9fe1f0c 100644
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh
index a360fd071ee..894e75a0854 100644
--- a/bin/tests/system/masterfile/clean.sh
+++ b/bin/tests/system/masterfile/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2010, 2012, 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.
 
 rm -f dig.out.*
 rm -f */named.memstats
diff --git a/bin/tests/system/masterfile/ns1/include.db b/bin/tests/system/masterfile/ns1/include.db
index 3799079832b..70c552d8e6e 100644
--- a/bin/tests/system/masterfile/ns1/include.db
+++ b/bin/tests/system/masterfile/ns1/include.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2001, 2004, 2007, 2012, 2016  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.
 
 ; $Id: include.db,v 1.5 2007/06/19 23:47:04 tbox Exp $
 
diff --git a/bin/tests/system/masterfile/ns1/named.conf.in b/bin/tests/system/masterfile/ns1/named.conf.in
index 2e70433a682..13a813d14f3 100644
--- a/bin/tests/system/masterfile/ns1/named.conf.in
+++ b/bin/tests/system/masterfile/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/masterfile/ns1/sub.db b/bin/tests/system/masterfile/ns1/sub.db
index fa821e63ba9..cbf2c7d03b1 100644
--- a/bin/tests/system/masterfile/ns1/sub.db
+++ b/bin/tests/system/masterfile/ns1/sub.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2001, 2004, 2007, 2016  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.
 
 ; $Id: sub.db,v 1.5 2007/06/19 23:47:04 tbox Exp $
 
diff --git a/bin/tests/system/masterfile/ns1/ttl1.db b/bin/tests/system/masterfile/ns1/ttl1.db
index 850a90e4ca3..577f74df2a8 100644
--- a/bin/tests/system/masterfile/ns1/ttl1.db
+++ b/bin/tests/system/masterfile/ns1/ttl1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2001, 2004, 2007, 2016  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.
 
 ; $Id: ttl1.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
 
diff --git a/bin/tests/system/masterfile/ns1/ttl2.db b/bin/tests/system/masterfile/ns1/ttl2.db
index 9a4d0d4cc15..0072ab96dd2 100644
--- a/bin/tests/system/masterfile/ns1/ttl2.db
+++ b/bin/tests/system/masterfile/ns1/ttl2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2001, 2004, 2007, 2016  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.
 
 ; $Id: ttl2.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
 
diff --git a/bin/tests/system/masterfile/ns2/example.db b/bin/tests/system/masterfile/ns2/example.db
index f4c990aacf0..322ceeef9f6 100644
--- a/bin/tests/system/masterfile/ns2/example.db
+++ b/bin/tests/system/masterfile/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db,v 1.2 2010/09/15 03:32:34 marka Exp $
 
diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.in
index 7762780b577..96e7978c43e 100644
--- a/bin/tests/system/masterfile/ns2/named.conf.in
+++ b/bin/tests/system/masterfile/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/masterfile/setup.sh b/bin/tests/system/masterfile/setup.sh
index c72b22a8139..85855f32289 100644
--- a/bin/tests/system/masterfile/setup.sh
+++ b/bin/tests/system/masterfile/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh
index 11d2c23166c..f31e2491bc7 100644
--- a/bin/tests/system/masterfile/tests.sh
+++ b/bin/tests/system/masterfile/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/masterfile/zone/inheritownerafterinclude.db b/bin/tests/system/masterfile/zone/inheritownerafterinclude.db
index 08f94d0a8f9..ce7bffe0f79 100644
--- a/bin/tests/system/masterfile/zone/inheritownerafterinclude.db
+++ b/bin/tests/system/masterfile/zone/inheritownerafterinclude.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 @ 0	IN	SOA	. . 0 0 0 0 0
 $INCLUDE zone/nameservers.db
diff --git a/bin/tests/system/masterfile/zone/nameservers.db b/bin/tests/system/masterfile/zone/nameservers.db
index d06f407a51d..76a1e8974b3 100644
--- a/bin/tests/system/masterfile/zone/nameservers.db
+++ b/bin/tests/system/masterfile/zone/nameservers.db
@@ -1,7 +1,10 @@
-; Copyright (C) 2015, 2016  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.
 
 @	IN	NS	.
diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 9281c7932a1..d50ed954537 100755
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 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.
 
 rm -f named-compilezone
 rm -f ns1/example.db.raw*
diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh
index c1b06248502..60b81b0ce16 100755
--- a/bin/tests/system/masterformat/ns1/compile.sh
+++ b/bin/tests/system/masterformat/ns1/compile.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2005-2007, 2011-2014, 2016, 2017  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.
 
 # $Id$
 
diff --git a/bin/tests/system/masterformat/ns1/example.db b/bin/tests/system/masterformat/ns1/example.db
index 2ba902ceea6..6cfee12f74e 100644
--- a/bin/tests/system/masterformat/ns1/example.db
+++ b/bin/tests/system/masterformat/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2005, 2007, 2014, 2016  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.
 
 ; $Id: example.db,v 1.5 2007/06/19 23:47:04 tbox Exp $
 
diff --git a/bin/tests/system/masterformat/ns1/large.db.in b/bin/tests/system/masterformat/ns1/large.db.in
index 0286d627b12..7cc4c462ee6 100644
--- a/bin/tests/system/masterformat/ns1/large.db.in
+++ b/bin/tests/system/masterformat/ns1/large.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: large.db.in,v 1.3 2012/02/14 23:47:15 tbox Exp $
 
diff --git a/bin/tests/system/masterformat/ns1/named.conf.in b/bin/tests/system/masterformat/ns1/named.conf.in
index b2c88a59b5d..e986041d2b5 100644
--- a/bin/tests/system/masterformat/ns1/named.conf.in
+++ b/bin/tests/system/masterformat/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2011-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.
  */
 
 // NS1
diff --git a/bin/tests/system/masterformat/ns1/signed.db b/bin/tests/system/masterformat/ns1/signed.db
index 451475d0003..20fd00e8568 100644
--- a/bin/tests/system/masterformat/ns1/signed.db
+++ b/bin/tests/system/masterformat/ns1/signed.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 1D
 
diff --git a/bin/tests/system/masterformat/ns2/formerly-text.db.in b/bin/tests/system/masterformat/ns2/formerly-text.db.in
index eae142e8eb5..68c3c4a659a 100644
--- a/bin/tests/system/masterformat/ns2/formerly-text.db.in
+++ b/bin/tests/system/masterformat/ns2/formerly-text.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: formerly-text.db.in,v 1.3 2011/10/26 23:46:15 tbox Exp $
 
diff --git a/bin/tests/system/masterformat/ns2/named.conf.in b/bin/tests/system/masterformat/ns2/named.conf.in
index d108882bbc4..ae286032073 100644
--- a/bin/tests/system/masterformat/ns2/named.conf.in
+++ b/bin/tests/system/masterformat/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2011, 2012, 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.
  */
 
 // NS2
diff --git a/bin/tests/system/masterformat/ns3/named.conf.in b/bin/tests/system/masterformat/ns3/named.conf.in
index dc515e008dd..f41dc2e8371 100644
--- a/bin/tests/system/masterformat/ns3/named.conf.in
+++ b/bin/tests/system/masterformat/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 // NS3
diff --git a/bin/tests/system/masterformat/prereq.sh b/bin/tests/system/masterformat/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100755
--- a/bin/tests/system/masterformat/prereq.sh
+++ b/bin/tests/system/masterformat/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index df4902b6bad..2824647ff48 100755
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2005-2007, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index a65b4a9a302..3e17a516da9 100755
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/metadata/child.db b/bin/tests/system/metadata/child.db
index 21e17b5ef56..81f272672a4 100644
--- a/bin/tests/system/metadata/child.db
+++ b/bin/tests/system/metadata/child.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: child.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/metadata/clean.sh b/bin/tests/system/metadata/clean.sh
index eda1ad5d4ed..af83095be45 100644
--- a/bin/tests/system/metadata/clean.sh
+++ b/bin/tests/system/metadata/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2011, 2012, 2014, 2016, 2017  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.
 
 rm -f K* dsset-* *.signed *.new
 rm -f zsk.key ksk.key parent.ksk.key parent.zsk.key 
diff --git a/bin/tests/system/metadata/parent.db b/bin/tests/system/metadata/parent.db
index d37005d9264..eb1788805b1 100644
--- a/bin/tests/system/metadata/parent.db
+++ b/bin/tests/system/metadata/parent.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: parent.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
diff --git a/bin/tests/system/metadata/prereq.sh b/bin/tests/system/metadata/prereq.sh
index 94829b1a849..a0d4e9ce14a 100644
--- a/bin/tests/system/metadata/prereq.sh
+++ b/bin/tests/system/metadata/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index 922537f46b1..796bc23567b 100644
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2011, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh
index 1764436707e..349a8dc7edc 100644
--- a/bin/tests/system/metadata/tests.sh
+++ b/bin/tests/system/metadata/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/mkeys/README b/bin/tests/system/mkeys/README
index 40310a2d70e..ef8b5db9df8 100644
--- a/bin/tests/system/mkeys/README
+++ b/bin/tests/system/mkeys/README
@@ -1,9 +1,12 @@
-Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2015-2018  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 for testing managed-keys, in particular with problems
 with RFC 5011 Automated Updates of DNSSEC Trust Anchors.
 
diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh
index a272384080e..df237a7395f 100644
--- a/bin/tests/system/mkeys/clean.sh
+++ b/bin/tests/system/mkeys/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */K* */*.signed */trusted.conf */*.jnl */*.bk
 rm -f dsset-. ns1/dsset-.
diff --git a/bin/tests/system/mkeys/ns1/named1.conf.in b/bin/tests/system/mkeys/ns1/named1.conf.in
index f708d21a0b8..412556b5c8c 100644
--- a/bin/tests/system/mkeys/ns1/named1.conf.in
+++ b/bin/tests/system/mkeys/ns1/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/mkeys/ns1/named2.conf.in b/bin/tests/system/mkeys/ns1/named2.conf.in
index a38b8f988a5..5cb096b0849 100644
--- a/bin/tests/system/mkeys/ns1/named2.conf.in
+++ b/bin/tests/system/mkeys/ns1/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/mkeys/ns1/named3.conf.in b/bin/tests/system/mkeys/ns1/named3.conf.in
index d7d86fcce8a..a0f1dd36c93 100644
--- a/bin/tests/system/mkeys/ns1/named3.conf.in
+++ b/bin/tests/system/mkeys/ns1/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/mkeys/ns1/root.db b/bin/tests/system/mkeys/ns1/root.db
index 3450c6d2d1e..6ba922af09d 100644
--- a/bin/tests/system/mkeys/ns1/root.db
+++ b/bin/tests/system/mkeys/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015-2017  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.
 
 $TTL 20
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/mkeys/ns1/sign.sh b/bin/tests/system/mkeys/ns1/sign.sh
index 054422de55e..7edcd4b1b78 100644
--- a/bin/tests/system/mkeys/ns1/sign.sh
+++ b/bin/tests/system/mkeys/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2015-2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/mkeys/ns2/named.conf.in b/bin/tests/system/mkeys/ns2/named.conf.in
index c8b6c657951..9076243446b 100644
--- a/bin/tests/system/mkeys/ns2/named.conf.in
+++ b/bin/tests/system/mkeys/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/mkeys/ns3/named.conf.in b/bin/tests/system/mkeys/ns3/named.conf.in
index 42049fbb384..0227aba0249 100644
--- a/bin/tests/system/mkeys/ns3/named.conf.in
+++ b/bin/tests/system/mkeys/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS3
diff --git a/bin/tests/system/mkeys/ns4/named.conf.in b/bin/tests/system/mkeys/ns4/named.conf.in
index 246e4be077f..ab3844496a3 100644
--- a/bin/tests/system/mkeys/ns4/named.conf.in
+++ b/bin/tests/system/mkeys/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS4
diff --git a/bin/tests/system/mkeys/ns5/named.conf.in b/bin/tests/system/mkeys/ns5/named.conf.in
index a7b7675d218..f2eb35d787a 100644
--- a/bin/tests/system/mkeys/ns5/named.conf.in
+++ b/bin/tests/system/mkeys/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS5
diff --git a/bin/tests/system/mkeys/prereq.sh b/bin/tests/system/mkeys/prereq.sh
index 84b419bf60f..a0d4e9ce14a 100644
--- a/bin/tests/system/mkeys/prereq.sh
+++ b/bin/tests/system/mkeys/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index 9af917a8457..0ecfc394dba 100644
--- a/bin/tests/system/mkeys/setup.sh
+++ b/bin/tests/system/mkeys/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index 02ca7de9ada..2f7327ecd6f 100644
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/names/clean.sh b/bin/tests/system/names/clean.sh
index 9697ff6cd24..b7e34ebefd8 100644
--- a/bin/tests/system/names/clean.sh
+++ b/bin/tests/system/names/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f dig.*.test*
 rm -f ns*/named.lock
diff --git a/bin/tests/system/names/ns1/example.db b/bin/tests/system/names/ns1/example.db
index 4e4840b5e25..0ce948a73a5 100644
--- a/bin/tests/system/names/ns1/example.db
+++ b/bin/tests/system/names/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/names/ns1/named.conf.in b/bin/tests/system/names/ns1/named.conf.in
index b34875a8c64..f885cc9a97a 100644
--- a/bin/tests/system/names/ns1/named.conf.in
+++ b/bin/tests/system/names/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/names/setup.sh b/bin/tests/system/names/setup.sh
index 53066b9e7a2..a3c89c8b676 100644
--- a/bin/tests/system/names/setup.sh
+++ b/bin/tests/system/names/setup.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/names/tests.sh b/bin/tests/system/names/tests.sh
index 45303387757..23202268ccd 100644
--- a/bin/tests/system/names/tests.sh
+++ b/bin/tests/system/names/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index 0e8be7ecd3c..48e26bdef05 100644
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 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.
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/notify/ns1/named.conf.in b/bin/tests/system/notify/ns1/named.conf.in
index b098ff58af5..b4a2fa8c05f 100644
--- a/bin/tests/system/notify/ns1/named.conf.in
+++ b/bin/tests/system/notify/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/notify/ns1/root.db b/bin/tests/system/notify/ns1/root.db
index 556678af06f..1c2cf17760d 100644
--- a/bin/tests/system/notify/ns1/root.db
+++ b/bin/tests/system/notify/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.9 2007/06/19 23:47:04 tbox Exp $
 
diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db
index 6ed8bb1f1c9..c28483886c4 100644
--- a/bin/tests/system/notify/ns2/example1.db
+++ b/bin/tests/system/notify/ns2/example1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000-2002, 2004, 2007, 2009, 2016  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.
 
 ; $Id: example1.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
 
diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db
index 2674c61433e..e6a23b4bad1 100644
--- a/bin/tests/system/notify/ns2/example2.db
+++ b/bin/tests/system/notify/ns2/example2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000-2002, 2004, 2007, 2009, 2016  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.
 
 ; $Id: example2.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
 
diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db
index 3596eaac416..49f90919c8d 100644
--- a/bin/tests/system/notify/ns2/example3.db
+++ b/bin/tests/system/notify/ns2/example3.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000-2002, 2004, 2007, 2009, 2016  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.
 
 ; $Id: example3.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
 
diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db
index 035bf48c36a..0c770e785d1 100644
--- a/bin/tests/system/notify/ns2/example4.db
+++ b/bin/tests/system/notify/ns2/example4.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000-2002, 2004, 2007, 2009, 2016  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.
 
 ; $Id: example4.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
 
diff --git a/bin/tests/system/notify/ns2/generic.db b/bin/tests/system/notify/ns2/generic.db
index 12c84c66c41..fc688ab5e38 100644
--- a/bin/tests/system/notify/ns2/generic.db
+++ b/bin/tests/system/notify/ns2/generic.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/notify/ns2/named.conf.in b/bin/tests/system/notify/ns2/named.conf.in
index 4fe0fc76458..2e5bd287409 100644
--- a/bin/tests/system/notify/ns2/named.conf.in
+++ b/bin/tests/system/notify/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/notify/ns3/named.conf.in b/bin/tests/system/notify/ns3/named.conf.in
index 75d37e03603..0c3250748ba 100644
--- a/bin/tests/system/notify/ns3/named.conf.in
+++ b/bin/tests/system/notify/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/notify/ns4/named.conf.in b/bin/tests/system/notify/ns4/named.conf.in
index a96a59839ba..57e2a53d90b 100644
--- a/bin/tests/system/notify/ns4/named.conf.in
+++ b/bin/tests/system/notify/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/notify/ns5/named.conf.in b/bin/tests/system/notify/ns5/named.conf.in
index 28c7d8a331f..2976bfc1664 100644
--- a/bin/tests/system/notify/ns5/named.conf.in
+++ b/bin/tests/system/notify/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key "a" {
diff --git a/bin/tests/system/notify/ns5/x21.db b/bin/tests/system/notify/ns5/x21.db
index 46c64a5b97f..e3800436d5b 100644
--- a/bin/tests/system/notify/ns5/x21.db
+++ b/bin/tests/system/notify/ns5/x21.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh
index 4adfcd87748..3af216c64fa 100644
--- a/bin/tests/system/notify/setup.sh
+++ b/bin/tests/system/notify/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index 5287c594e46..f0fb8ce36c1 100644
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nslookup/clean.sh b/bin/tests/system/nslookup/clean.sh
index a1e694b92c1..46d78fa7b3c 100644
--- a/bin/tests/system/nslookup/clean.sh
+++ b/bin/tests/system/nslookup/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f ns1/example.db
 rm -f nslookup.out*
diff --git a/bin/tests/system/nslookup/ns1/example.net.db b/bin/tests/system/nslookup/ns1/example.net.db
index a62c8767443..e9c133b87be 100644
--- a/bin/tests/system/nslookup/ns1/example.net.db
+++ b/bin/tests/system/nslookup/ns1/example.net.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 3600
 
diff --git a/bin/tests/system/nslookup/ns1/named.conf.in b/bin/tests/system/nslookup/ns1/named.conf.in
index 05d49b40061..2be830f3405 100644
--- a/bin/tests/system/nslookup/ns1/named.conf.in
+++ b/bin/tests/system/nslookup/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/nslookup/setup.sh b/bin/tests/system/nslookup/setup.sh
index 862986dfb38..8134fb6ff3e 100644
--- a/bin/tests/system/nslookup/setup.sh
+++ b/bin/tests/system/nslookup/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh
index 3edd18d2534..863043454f5 100644
--- a/bin/tests/system/nslookup/tests.sh
+++ b/bin/tests/system/nslookup/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nsupdate/ans4/ans.pl b/bin/tests/system/nsupdate/ans4/ans.pl
index 4ee6d54f65a..6a4461b257f 100644
--- a/bin/tests/system/nsupdate/ans4/ans.pl
+++ b/bin/tests/system/nsupdate/ans4/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# 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.
 
 use IO::Socket;
 use IO::File;
diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index b860e416f40..74af65d96a2 100644
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2012, 2014-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.
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/nsupdate/ns1/example1.db b/bin/tests/system/nsupdate/ns1/example1.db
index bd7d1d723dc..aadb20d1410 100644
--- a/bin/tests/system/nsupdate/ns1/example1.db
+++ b/bin/tests/system/nsupdate/ns1/example1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000-2002, 2004, 2007, 2009, 2016  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.
 
 ; $Id: example1.db,v 1.10 2009/01/21 23:47:27 tbox Exp $
 
diff --git a/bin/tests/system/nsupdate/ns1/many.test.db.in b/bin/tests/system/nsupdate/ns1/many.test.db.in
index d3df7ff9732..2a0ef307ead 100644
--- a/bin/tests/system/nsupdate/ns1/many.test.db.in
+++ b/bin/tests/system/nsupdate/ns1/many.test.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016, 2017  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.
 
 $TTL 300	; 5 minutes
 @		IN SOA	ns1.example.nil. hostmaster.example.nil. (
diff --git a/bin/tests/system/nsupdate/ns1/max-ttl.db b/bin/tests/system/nsupdate/ns1/max-ttl.db
index 3f993e4116c..fd1862751b6 100644
--- a/bin/tests/system/nsupdate/ns1/max-ttl.db
+++ b/bin/tests/system/nsupdate/ns1/max-ttl.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id: max-ttl.db,v 1.10 2009/01/21 23:47:27 tbox Exp $
 
diff --git a/bin/tests/system/nsupdate/ns1/maxjournal.db.in b/bin/tests/system/nsupdate/ns1/maxjournal.db.in
index 5f86c5db3b3..12a67d3f022 100644
--- a/bin/tests/system/nsupdate/ns1/maxjournal.db.in
+++ b/bin/tests/system/nsupdate/ns1/maxjournal.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300	; 5 minutes
 @		IN SOA	ns1.example.nil. hostmaster.example.nil. (
diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
index 02b9233acaa..fbd24a1ba35 100644
--- a/bin/tests/system/nsupdate/ns1/named.conf.in
+++ b/bin/tests/system/nsupdate/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2011-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.
  */
 
 options {
diff --git a/bin/tests/system/nsupdate/ns1/sample.db.in b/bin/tests/system/nsupdate/ns1/sample.db.in
index 9e850447599..49212a1242b 100644
--- a/bin/tests/system/nsupdate/ns1/sample.db.in
+++ b/bin/tests/system/nsupdate/ns1/sample.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 @ 0 SOA ns1 . 0 0 0 0 0
 @ 0 NS ns1
diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
index 91d0e48f8e5..f0cfa91b0bb 100644
--- a/bin/tests/system/nsupdate/ns2/named.conf.in
+++ b/bin/tests/system/nsupdate/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/nsupdate/ns2/sample.db.in b/bin/tests/system/nsupdate/ns2/sample.db.in
index cd2e4f42120..0c8a1c0504e 100644
--- a/bin/tests/system/nsupdate/ns2/sample.db.in
+++ b/bin/tests/system/nsupdate/ns2/sample.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 @ 0 SOA ns2 . 0 0 0 0 0
 @ 0 NS ns2
diff --git a/bin/tests/system/nsupdate/ns3/delegation.test.db.in b/bin/tests/system/nsupdate/ns3/delegation.test.db.in
index 5192f698b54..a75bcd242ca 100644
--- a/bin/tests/system/nsupdate/ns3/delegation.test.db.in
+++ b/bin/tests/system/nsupdate/ns3/delegation.test.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 10
 delegation.test. IN SOA delegation.test. hostmaster.delegation.test. 1 3600 900 2419200 3600
diff --git a/bin/tests/system/nsupdate/ns3/dnskey.test.db.in b/bin/tests/system/nsupdate/ns3/dnskey.test.db.in
index 67693cb94db..4bb5391de86 100644
--- a/bin/tests/system/nsupdate/ns3/dnskey.test.db.in
+++ b/bin/tests/system/nsupdate/ns3/dnskey.test.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: dnskey.test.db.in,v 1.2 2011/02/03 06:03:15 marka Exp $
 
diff --git a/bin/tests/system/nsupdate/ns3/example.db.in b/bin/tests/system/nsupdate/ns3/example.db.in
index 1bd0d16297e..9cbbddc7a3d 100644
--- a/bin/tests/system/nsupdate/ns3/example.db.in
+++ b/bin/tests/system/nsupdate/ns3/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.3 2010/12/07 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/nsupdate/ns3/named.conf.in b/bin/tests/system/nsupdate/ns3/named.conf.in
index 71ea7e8a67d..e5b414f67c6 100644
--- a/bin/tests/system/nsupdate/ns3/named.conf.in
+++ b/bin/tests/system/nsupdate/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2011, 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.
  */
 
 // NS3
diff --git a/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in b/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
index 3af47ad15b6..7d5db295d19 100644
--- a/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
+++ b/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: nsec3param.test.db.in,v 1.3 2010/12/07 23:47:02 tbox Exp $
 
diff --git a/bin/tests/system/nsupdate/ns3/sign.sh b/bin/tests/system/nsupdate/ns3/sign.sh
index 58bddef8915..253e4e73d3a 100644
--- a/bin/tests/system/nsupdate/ns3/sign.sh
+++ b/bin/tests/system/nsupdate/ns3/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010-2012, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nsupdate/ns3/too-big.test.db.in b/bin/tests/system/nsupdate/ns3/too-big.test.db.in
index 7ff1e4a514a..f271d27103b 100644
--- a/bin/tests/system/nsupdate/ns3/too-big.test.db.in
+++ b/bin/tests/system/nsupdate/ns3/too-big.test.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 10
 too-big.test. IN SOA too-big.test. hostmaster.too-big.test. 1 3600 900 2419200 3600
diff --git a/bin/tests/system/nsupdate/ns5/local.db.in b/bin/tests/system/nsupdate/ns5/local.db.in
index 707d1be598a..08f16b8f23b 100644
--- a/bin/tests/system/nsupdate/ns5/local.db.in
+++ b/bin/tests/system/nsupdate/ns5/local.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/nsupdate/ns5/named.conf.in b/bin/tests/system/nsupdate/ns5/named.conf.in
index 60dcd52c96c..2ffacb1e65f 100644
--- a/bin/tests/system/nsupdate/ns5/named.conf.in
+++ b/bin/tests/system/nsupdate/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/nsupdate/prereq.sh b/bin/tests/system/nsupdate/prereq.sh
index 0a7fcbe379e..9c1d276ecb2 100644
--- a/bin/tests/system/nsupdate/prereq.sh
+++ b/bin/tests/system/nsupdate/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 130e77fe797..e4b41a9b2ca 100644
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index e0033589c06..263f57e3ad1 100755
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nsupdate/update_test.pl b/bin/tests/system/nsupdate/update_test.pl
index ba9ee93e694..b9f083f65c1 100644
--- a/bin/tests/system/nsupdate/update_test.pl
+++ b/bin/tests/system/nsupdate/update_test.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 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.
 
 #
 # Dynamic update test suite.
diff --git a/bin/tests/system/nzd2nzf/clean.sh b/bin/tests/system/nzd2nzf/clean.sh
index a338e686cfb..8b58ed33d3c 100644
--- a/bin/tests/system/nzd2nzf/clean.sh
+++ b/bin/tests/system/nzd2nzf/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */named.conf
 rm -f */named.run
diff --git a/bin/tests/system/nzd2nzf/ns1/added.db b/bin/tests/system/nzd2nzf/ns1/added.db
index a792468bd5d..9b54d19204d 100644
--- a/bin/tests/system/nzd2nzf/ns1/added.db
+++ b/bin/tests/system/nzd2nzf/ns1/added.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 ;$ORIGIN added.example.
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf.in b/bin/tests/system/nzd2nzf/ns1/named.conf.in
index fcfbf5b195c..2a0fb7e9c77 100644
--- a/bin/tests/system/nzd2nzf/ns1/named.conf.in
+++ b/bin/tests/system/nzd2nzf/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/nzd2nzf/prereq.sh b/bin/tests/system/nzd2nzf/prereq.sh
index 03e484c08bb..85e03606f02 100644
--- a/bin/tests/system/nzd2nzf/prereq.sh
+++ b/bin/tests/system/nzd2nzf/prereq.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nzd2nzf/setup.sh b/bin/tests/system/nzd2nzf/setup.sh
index d864a59d532..b3e0450b4af 100644
--- a/bin/tests/system/nzd2nzf/setup.sh
+++ b/bin/tests/system/nzd2nzf/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh
index 07580bf3182..139ffef20bb 100644
--- a/bin/tests/system/nzd2nzf/tests.sh
+++ b/bin/tests/system/nzd2nzf/tests.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/org.isc.bind.system b/bin/tests/system/org.isc.bind.system
index ed377ed45d8..9a3f235f97c 100644
--- a/bin/tests/system/org.isc.bind.system
+++ b/bin/tests/system/org.isc.bind.system
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2013, 2016  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.
 
 # $Id: org.isc.bind.system,v 1.1 2010/08/25 04:51:51 marka Exp $
 
diff --git a/bin/tests/system/packet.pl b/bin/tests/system/packet.pl
index e0cda52060e..4032bd54500 100644
--- a/bin/tests/system/packet.pl
+++ b/bin/tests/system/packet.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2016  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.
 
 # $Id: packet.pl,v 1.2 2011/04/15 01:02:08 each Exp $
 
diff --git a/bin/tests/system/padding/clean.sh b/bin/tests/system/padding/clean.sh
index f9ca7a18285..f08874606d5 100644
--- a/bin/tests/system/padding/clean.sh
+++ b/bin/tests/system/padding/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f dig.out.*
 rm -f ns*/named.memstats
diff --git a/bin/tests/system/padding/ns1/named.conf.in b/bin/tests/system/padding/ns1/named.conf.in
index d8202027874..828bc40b7b4 100644
--- a/bin/tests/system/padding/ns1/named.conf.in
+++ b/bin/tests/system/padding/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/padding/ns1/root.db b/bin/tests/system/padding/ns1/root.db
index 69faf3dd31d..dab5cea7f77 100644
--- a/bin/tests/system/padding/ns1/root.db
+++ b/bin/tests/system/padding/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/padding/ns2/example.db b/bin/tests/system/padding/ns2/example.db
index 3cbe6739a35..656a1862852 100644
--- a/bin/tests/system/padding/ns2/example.db
+++ b/bin/tests/system/padding/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 @	SOA	ns2 hostmaster.isc.org. 1 600 600 1200 600
 @ 	NS	ns2
diff --git a/bin/tests/system/padding/ns2/named.conf.in b/bin/tests/system/padding/ns2/named.conf.in
index 8ea1d10f5a7..4263cafd84b 100644
--- a/bin/tests/system/padding/ns2/named.conf.in
+++ b/bin/tests/system/padding/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/padding/ns3/named.conf.in b/bin/tests/system/padding/ns3/named.conf.in
index 2f78539606a..9345966a25a 100644
--- a/bin/tests/system/padding/ns3/named.conf.in
+++ b/bin/tests/system/padding/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/padding/ns4/named.conf.in b/bin/tests/system/padding/ns4/named.conf.in
index 4c7f094d6a2..913622b37fc 100644
--- a/bin/tests/system/padding/ns4/named.conf.in
+++ b/bin/tests/system/padding/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/padding/setup.sh b/bin/tests/system/padding/setup.sh
index 051ddd1a64c..bbf45d2a23c 100644
--- a/bin/tests/system/padding/setup.sh
+++ b/bin/tests/system/padding/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/padding/tests.sh b/bin/tests/system/padding/tests.sh
index 3df9e5ac9f5..5ea90fb4017 100644
--- a/bin/tests/system/padding/tests.sh
+++ b/bin/tests/system/padding/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pending/clean.sh b/bin/tests/system/pending/clean.sh
index 7ea0eb14a43..f0041837831 100644
--- a/bin/tests/system/pending/clean.sh
+++ b/bin/tests/system/pending/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2012, 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.
 
 rm -rf */*.signed
 rm -rf */*.jnl
diff --git a/bin/tests/system/pending/ns1/named.conf.in b/bin/tests/system/pending/ns1/named.conf.in
index 87c661daf05..e36b0b1135d 100644
--- a/bin/tests/system/pending/ns1/named.conf.in
+++ b/bin/tests/system/pending/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 include "trusted.conf";
diff --git a/bin/tests/system/pending/ns1/root.db.in b/bin/tests/system/pending/ns1/root.db.in
index b82c8aeaf45..5176ea5b2b0 100644
--- a/bin/tests/system/pending/ns1/root.db.in
+++ b/bin/tests/system/pending/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2010, 2016  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.
 
 ; $Id: root.db.in,v 1.6 2010/01/07 23:48:53 tbox Exp $
 
diff --git a/bin/tests/system/pending/ns1/sign.sh b/bin/tests/system/pending/ns1/sign.sh
index a5d9a4901bd..324dc129329 100644
--- a/bin/tests/system/pending/ns1/sign.sh
+++ b/bin/tests/system/pending/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh 
 #
-# Copyright (C) 2009, 2010, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pending/ns2/example.com.db.in b/bin/tests/system/pending/ns2/example.com.db.in
index 44192f1ce92..15feee09b1f 100644
--- a/bin/tests/system/pending/ns2/example.com.db.in
+++ b/bin/tests/system/pending/ns2/example.com.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2010, 2016  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.
 
 ; $Id: example.com.db.in,v 1.4 2010/01/18 23:48:40 tbox Exp $
 
diff --git a/bin/tests/system/pending/ns2/example.db.in b/bin/tests/system/pending/ns2/example.db.in
index 570cada8b07..a5c8b840b1e 100644
--- a/bin/tests/system/pending/ns2/example.db.in
+++ b/bin/tests/system/pending/ns2/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.4 2010/01/07 23:48:53 tbox Exp $
 
diff --git a/bin/tests/system/pending/ns2/forgery.db b/bin/tests/system/pending/ns2/forgery.db
index e9607289411..8de7ab5a91a 100644
--- a/bin/tests/system/pending/ns2/forgery.db
+++ b/bin/tests/system/pending/ns2/forgery.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: forgery.db,v 1.3 2010/01/07 23:48:53 tbox Exp $
 
diff --git a/bin/tests/system/pending/ns2/named.conf.in b/bin/tests/system/pending/ns2/named.conf.in
index 44722999ab9..df2e1682726 100644
--- a/bin/tests/system/pending/ns2/named.conf.in
+++ b/bin/tests/system/pending/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 // NS2
diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh
index 82c01e5bcd0..608e7f8a39a 100644
--- a/bin/tests/system/pending/ns2/sign.sh
+++ b/bin/tests/system/pending/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2010, 2012, 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.7 2010/01/18 19:19:31 each Exp $
 
diff --git a/bin/tests/system/pending/ns3/hostile.db b/bin/tests/system/pending/ns3/hostile.db
index 0b14e77df8a..8f8aae332f6 100644
--- a/bin/tests/system/pending/ns3/hostile.db
+++ b/bin/tests/system/pending/ns3/hostile.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: hostile.db,v 1.2 2009/11/17 23:55:18 marka Exp $
 
diff --git a/bin/tests/system/pending/ns3/mail.example.db b/bin/tests/system/pending/ns3/mail.example.db
index bc9605a1951..41fc4c2de0b 100644
--- a/bin/tests/system/pending/ns3/mail.example.db
+++ b/bin/tests/system/pending/ns3/mail.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2009, 2016  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.
 
 ; $Id: mail.example.db,v 1.2 2009/11/17 23:55:18 marka Exp $
 
diff --git a/bin/tests/system/pending/ns3/named.conf.in b/bin/tests/system/pending/ns3/named.conf.in
index 3e1040b7304..97129c93dd2 100644
--- a/bin/tests/system/pending/ns3/named.conf.in
+++ b/bin/tests/system/pending/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 // NS2
diff --git a/bin/tests/system/pending/ns4/named.conf.in b/bin/tests/system/pending/ns4/named.conf.in
index 7f72c7a6915..78ffed7e4d3 100644
--- a/bin/tests/system/pending/ns4/named.conf.in
+++ b/bin/tests/system/pending/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 include "trusted.conf";
diff --git a/bin/tests/system/pending/prereq.sh b/bin/tests/system/pending/prereq.sh
index 94829b1a849..a0d4e9ce14a 100644
--- a/bin/tests/system/pending/prereq.sh
+++ b/bin/tests/system/pending/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index af225a04a99..209b9f5389e 100644
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh
index 7b81600c35d..e93475874b1 100644
--- a/bin/tests/system/pending/tests.sh
+++ b/bin/tests/system/pending/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in
index 1d76097bbc0..f140d525db5 100644
--- a/bin/tests/system/pipelined/Makefile.in
+++ b/bin/tests/system/pipelined/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014-2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/pipelined/clean.sh b/bin/tests/system/pipelined/clean.sh
index 569509a8bb5..f4c4b131b90 100644
--- a/bin/tests/system/pipelined/clean.sh
+++ b/bin/tests/system/pipelined/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */named.conf
 rm -f */named.memstats
diff --git a/bin/tests/system/pipelined/ns1/named.conf.in b/bin/tests/system/pipelined/ns1/named.conf.in
index f3436deb437..828bc40b7b4 100644
--- a/bin/tests/system/pipelined/ns1/named.conf.in
+++ b/bin/tests/system/pipelined/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/pipelined/ns1/root.db b/bin/tests/system/pipelined/ns1/root.db
index 40d53907014..2cddcd23439 100644
--- a/bin/tests/system/pipelined/ns1/root.db
+++ b/bin/tests/system/pipelined/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014-2016  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.
 
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/pipelined/ns2/examplea.db b/bin/tests/system/pipelined/ns2/examplea.db
index 27c5c1515f0..9f0427e1781 100644
--- a/bin/tests/system/pipelined/ns2/examplea.db
+++ b/bin/tests/system/pipelined/ns2/examplea.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014-2016  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.
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.in
index 9911fe04699..6df0c663a0a 100644
--- a/bin/tests/system/pipelined/ns2/named.conf.in
+++ b/bin/tests/system/pipelined/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/pipelined/ns3/exampleb.db b/bin/tests/system/pipelined/ns3/exampleb.db
index 06365a98c3e..98a61f0517a 100644
--- a/bin/tests/system/pipelined/ns3/exampleb.db
+++ b/bin/tests/system/pipelined/ns3/exampleb.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014-2016  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.
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.in
index 7bdcd8a8883..a17babd54c2 100644
--- a/bin/tests/system/pipelined/ns3/named.conf.in
+++ b/bin/tests/system/pipelined/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.in
index e39c61017f5..0b8a54b5aaf 100644
--- a/bin/tests/system/pipelined/ns4/named.conf.in
+++ b/bin/tests/system/pipelined/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index d5960d87474..a9a3362a928 100644
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2015, 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.
  */
 
 #include <config.h>
diff --git a/bin/tests/system/pipelined/setup.sh b/bin/tests/system/pipelined/setup.sh
index 5e63647678b..bbf45d2a23c 100644
--- a/bin/tests/system/pipelined/setup.sh
+++ b/bin/tests/system/pipelined/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh
index 5f069db67f1..1755c02647b 100644
--- a/bin/tests/system/pipelined/tests.sh
+++ b/bin/tests/system/pipelined/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pkcs11/clean.sh b/bin/tests/system/pkcs11/clean.sh
index 51371b1ae4b..f5be432d98e 100644
--- a/bin/tests/system/pkcs11/clean.sh
+++ b/bin/tests/system/pkcs11/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl
 rm -f dig.out* pin upd.log*
diff --git a/bin/tests/system/pkcs11/ns1/example.db.in b/bin/tests/system/pkcs11/ns1/example.db.in
index 213c7bc027a..c0df03bed74 100644
--- a/bin/tests/system/pkcs11/ns1/example.db.in
+++ b/bin/tests/system/pkcs11/ns1/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.3 2010/06/08 23:50:24 tbox Exp $
 
diff --git a/bin/tests/system/pkcs11/ns1/named.conf b/bin/tests/system/pkcs11/ns1/named.conf
index 66a8cd84e57..1e2c34b3de5 100644
--- a/bin/tests/system/pkcs11/ns1/named.conf
+++ b/bin/tests/system/pkcs11/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2013, 2014, 2016, 2017  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.
  */
 
 /* $Id: named.conf,v 1.3 2010/06/08 23:50:24 tbox Exp $ */
diff --git a/bin/tests/system/pkcs11/prereq.sh b/bin/tests/system/pkcs11/prereq.sh
index f86c592411e..0eb3b78af95 100644
--- a/bin/tests/system/pkcs11/prereq.sh
+++ b/bin/tests/system/pkcs11/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh
index 34219d3a56a..4fc5ec5b992 100644
--- a/bin/tests/system/pkcs11/setup.sh
+++ b/bin/tests/system/pkcs11/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pkcs11/tests.sh b/bin/tests/system/pkcs11/tests.sh
index fdf1663ef42..7ba5ae9f62a 100644
--- a/bin/tests/system/pkcs11/tests.sh
+++ b/bin/tests/system/pkcs11/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 # $Id: tests.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $
 
diff --git a/bin/tests/system/pkcs11ssl/clean.sh b/bin/tests/system/pkcs11ssl/clean.sh
index e2f3e4bcc87..4af1c397c68 100644
--- a/bin/tests/system/pkcs11ssl/clean.sh
+++ b/bin/tests/system/pkcs11ssl/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl
 rm -f dig.out pin
diff --git a/bin/tests/system/pkcs11ssl/ns1/example.db.in b/bin/tests/system/pkcs11ssl/ns1/example.db.in
index b9eeacb4a17..c0df03bed74 100644
--- a/bin/tests/system/pkcs11ssl/ns1/example.db.in
+++ b/bin/tests/system/pkcs11ssl/ns1/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id: example.db.in,v 1.3 2010/06/08 23:50:24 tbox Exp $
 
diff --git a/bin/tests/system/pkcs11ssl/ns1/named.conf b/bin/tests/system/pkcs11ssl/ns1/named.conf
index c74734e34b2..2490f4ad322 100644
--- a/bin/tests/system/pkcs11ssl/ns1/named.conf
+++ b/bin/tests/system/pkcs11ssl/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id: named.conf,v 1.3 2010/06/08 23:50:24 tbox Exp $ */
diff --git a/bin/tests/system/pkcs11ssl/prereq.sh b/bin/tests/system/pkcs11ssl/prereq.sh
index f1c0bcda42b..489bebbb64b 100644
--- a/bin/tests/system/pkcs11ssl/prereq.sh
+++ b/bin/tests/system/pkcs11ssl/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pkcs11ssl/setup.sh b/bin/tests/system/pkcs11ssl/setup.sh
index 3b227ae335b..d2fbe922c7e 100644
--- a/bin/tests/system/pkcs11ssl/setup.sh
+++ b/bin/tests/system/pkcs11ssl/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/pkcs11ssl/tests.sh b/bin/tests/system/pkcs11ssl/tests.sh
index 6e0856fd544..9e61729e7ef 100644
--- a/bin/tests/system/pkcs11ssl/tests.sh
+++ b/bin/tests/system/pkcs11ssl/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 # $Id: tests.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $
 
diff --git a/bin/tests/system/reclimit/README b/bin/tests/system/reclimit/README
index d8451541b56..63f12fa03d3 100644
--- a/bin/tests/system/reclimit/README
+++ b/bin/tests/system/reclimit/README
@@ -1,9 +1,12 @@
-Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2014, 2016-2018  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.
+
 system test for recursion limits
 
 ns1  -- root server
diff --git a/bin/tests/system/reclimit/ans2/ans.pl b/bin/tests/system/reclimit/ans2/ans.pl
index 0c419f27ef8..988445d6cfc 100644
--- a/bin/tests/system/reclimit/ans2/ans.pl
+++ b/bin/tests/system/reclimit/ans2/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014-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.
 
 use strict;
 use warnings;
diff --git a/bin/tests/system/reclimit/ans7/ans.pl b/bin/tests/system/reclimit/ans7/ans.pl
index 945146b4ed7..50504270ad8 100644
--- a/bin/tests/system/reclimit/ans7/ans.pl
+++ b/bin/tests/system/reclimit/ans7/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# 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.
 
 use strict;
 use warnings;
diff --git a/bin/tests/system/reclimit/clean.sh b/bin/tests/system/reclimit/clean.sh
index 5dfa82abf84..f856c8608d7 100644
--- a/bin/tests/system/reclimit/clean.sh
+++ b/bin/tests/system/reclimit/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f dig.out*
 rm -f ans?/ans.run
diff --git a/bin/tests/system/reclimit/ns1/named.conf.in b/bin/tests/system/reclimit/ns1/named.conf.in
index 3334bd1e7d9..f8868f5176d 100644
--- a/bin/tests/system/reclimit/ns1/named.conf.in
+++ b/bin/tests/system/reclimit/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/reclimit/ns1/root.db b/bin/tests/system/reclimit/ns1/root.db
index ca074bdd70b..6a04ed256e4 100644
--- a/bin/tests/system/reclimit/ns1/root.db
+++ b/bin/tests/system/reclimit/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016, 2017  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.
 
 . 60 IN SOA ns.nil. hostmaster.ns.nil. 1 0 0 0 0
 . 60 IN NS ns.nil.
diff --git a/bin/tests/system/reclimit/ns3/hints.db b/bin/tests/system/reclimit/ns3/hints.db
index 5e33230c552..f763729451d 100644
--- a/bin/tests/system/reclimit/ns3/hints.db
+++ b/bin/tests/system/reclimit/ns3/hints.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 . 60 IN NS ns.nil.
 ns.nil. 60 IN A 10.53.0.1
diff --git a/bin/tests/system/reclimit/ns3/named1.conf.in b/bin/tests/system/reclimit/ns3/named1.conf.in
index 4797eef0c06..f7f6c6a7651 100644
--- a/bin/tests/system/reclimit/ns3/named1.conf.in
+++ b/bin/tests/system/reclimit/ns3/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/reclimit/ns3/named2.conf.in b/bin/tests/system/reclimit/ns3/named2.conf.in
index 4e52dcfc427..f051cf531c0 100644
--- a/bin/tests/system/reclimit/ns3/named2.conf.in
+++ b/bin/tests/system/reclimit/ns3/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/reclimit/ns3/named3.conf.in b/bin/tests/system/reclimit/ns3/named3.conf.in
index 0266e352d89..6c235aff52c 100644
--- a/bin/tests/system/reclimit/ns3/named3.conf.in
+++ b/bin/tests/system/reclimit/ns3/named3.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/reclimit/ns3/named4.conf.in b/bin/tests/system/reclimit/ns3/named4.conf.in
index 85c80ff21c0..2d7d5c18b2c 100644
--- a/bin/tests/system/reclimit/ns3/named4.conf.in
+++ b/bin/tests/system/reclimit/ns3/named4.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/reclimit/prereq.sh b/bin/tests/system/reclimit/prereq.sh
index b6f06d2cad8..3c854d2da01 100644
--- a/bin/tests/system/reclimit/prereq.sh
+++ b/bin/tests/system/reclimit/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/reclimit/setup.sh b/bin/tests/system/reclimit/setup.sh
index 2133c34239c..a191bf838c4 100644
--- a/bin/tests/system/reclimit/setup.sh
+++ b/bin/tests/system/reclimit/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh
index 9c953c51d46..bafdc82b50b 100644
--- a/bin/tests/system/reclimit/tests.sh
+++ b/bin/tests/system/reclimit/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh
index ec717b42653..c13d918dadd 100644
--- a/bin/tests/system/redirect/clean.sh
+++ b/bin/tests/system/redirect/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */named.conf
 rm -f */named.memstats
diff --git a/bin/tests/system/redirect/conf/bad1.conf b/bin/tests/system/redirect/conf/bad1.conf
index 0005ba2dda7..fc73b31bac8 100644
--- a/bin/tests/system/redirect/conf/bad1.conf
+++ b/bin/tests/system/redirect/conf/bad1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: bad1.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
diff --git a/bin/tests/system/redirect/conf/bad2.conf b/bin/tests/system/redirect/conf/bad2.conf
index 8ded7a3d87c..52640ed5c60 100644
--- a/bin/tests/system/redirect/conf/bad2.conf
+++ b/bin/tests/system/redirect/conf/bad2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: bad2.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
diff --git a/bin/tests/system/redirect/conf/bad3.conf b/bin/tests/system/redirect/conf/bad3.conf
index 902091f6f84..638c15259db 100644
--- a/bin/tests/system/redirect/conf/bad3.conf
+++ b/bin/tests/system/redirect/conf/bad3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: bad3.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
diff --git a/bin/tests/system/redirect/conf/good1.conf b/bin/tests/system/redirect/conf/good1.conf
index bee9b65abb4..cf81c17ea17 100644
--- a/bin/tests/system/redirect/conf/good1.conf
+++ b/bin/tests/system/redirect/conf/good1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: good1.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
diff --git a/bin/tests/system/redirect/conf/good2.conf b/bin/tests/system/redirect/conf/good2.conf
index e941d27df81..92f6d3c91c5 100644
--- a/bin/tests/system/redirect/conf/good2.conf
+++ b/bin/tests/system/redirect/conf/good2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: good2.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
diff --git a/bin/tests/system/redirect/conf/good3.conf b/bin/tests/system/redirect/conf/good3.conf
index 15ab71c4533..613563e61bc 100644
--- a/bin/tests/system/redirect/conf/good3.conf
+++ b/bin/tests/system/redirect/conf/good3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: good3.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
diff --git a/bin/tests/system/redirect/conf/good4.conf b/bin/tests/system/redirect/conf/good4.conf
index fea7f7195d7..72b37e799a9 100644
--- a/bin/tests/system/redirect/conf/good4.conf
+++ b/bin/tests/system/redirect/conf/good4.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2016  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.
  */
 
 /* $Id: good4.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
diff --git a/bin/tests/system/redirect/ns1/example.db b/bin/tests/system/redirect/ns1/example.db
index 604ab9ef73c..fa204cdfb30 100644
--- a/bin/tests/system/redirect/ns1/example.db
+++ b/bin/tests/system/redirect/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns1/named.conf.in b/bin/tests/system/redirect/ns1/named.conf.in
index 39ad49a3248..47b385a8fca 100644
--- a/bin/tests/system/redirect/ns1/named.conf.in
+++ b/bin/tests/system/redirect/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/redirect/ns1/redirect.db b/bin/tests/system/redirect/ns1/redirect.db
index 77c9daff9c8..6d61cf1af77 100644
--- a/bin/tests/system/redirect/ns1/redirect.db
+++ b/bin/tests/system/redirect/ns1/redirect.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: redirect.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns1/root.db b/bin/tests/system/redirect/ns1/root.db
index be5d3dfb77e..1622c9d5ce5 100644
--- a/bin/tests/system/redirect/ns1/root.db
+++ b/bin/tests/system/redirect/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: root.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns1/sign.sh b/bin/tests/system/redirect/ns1/sign.sh
index aceceaa5557..df44acbe845 100644
--- a/bin/tests/system/redirect/ns1/sign.sh
+++ b/bin/tests/system/redirect/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011, 2012, 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns2/example.db.in b/bin/tests/system/redirect/ns2/example.db.in
index 1e39b62aa18..bb8b66d9b99 100644
--- a/bin/tests/system/redirect/ns2/example.db.in
+++ b/bin/tests/system/redirect/ns2/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 300	; 5 minutes
 @ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0
diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in
index e10a91d186e..3e897900af8 100644
--- a/bin/tests/system/redirect/ns2/named.conf.in
+++ b/bin/tests/system/redirect/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 // NS2
diff --git a/bin/tests/system/redirect/ns2/redirect.db.in b/bin/tests/system/redirect/ns2/redirect.db.in
index d196ec290f8..c6a78c7f65b 100644
--- a/bin/tests/system/redirect/ns2/redirect.db.in
+++ b/bin/tests/system/redirect/ns2/redirect.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011.2013, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/redirect/ns3/example.db b/bin/tests/system/redirect/ns3/example.db
index 45a7f6528f8..c1ce24d4bb8 100644
--- a/bin/tests/system/redirect/ns3/example.db
+++ b/bin/tests/system/redirect/ns3/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 ; $Id: example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns3/named.conf.in b/bin/tests/system/redirect/ns3/named.conf.in
index 0273d9af43c..04a651b065c 100644
--- a/bin/tests/system/redirect/ns3/named.conf.in
+++ b/bin/tests/system/redirect/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
diff --git a/bin/tests/system/redirect/ns3/redirect.db b/bin/tests/system/redirect/ns3/redirect.db
index c764cb8d7e2..b5b9325f447 100644
--- a/bin/tests/system/redirect/ns3/redirect.db
+++ b/bin/tests/system/redirect/ns3/redirect.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 ; $Id: redirect.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns3/root.db b/bin/tests/system/redirect/ns3/root.db
index 17214e9f692..22ca3359458 100644
--- a/bin/tests/system/redirect/ns3/root.db
+++ b/bin/tests/system/redirect/ns3/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 ; $Id: root.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns3/sign.sh b/bin/tests/system/redirect/ns3/sign.sh
index 8d155f4b5dc..df44acbe845 100644
--- a/bin/tests/system/redirect/ns3/sign.sh
+++ b/bin/tests/system/redirect/ns3/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2015-2017  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.
 
 # $Id: sign.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/redirect/ns4/example.db.in b/bin/tests/system/redirect/ns4/example.db.in
index 9877f9cd41e..4d3a0824e37 100644
--- a/bin/tests/system/redirect/ns4/example.db.in
+++ b/bin/tests/system/redirect/ns4/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300	; 5 minutes
 @ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0
diff --git a/bin/tests/system/redirect/ns4/named.conf.in b/bin/tests/system/redirect/ns4/named.conf.in
index 078a535b1ba..70f0df07f6c 100644
--- a/bin/tests/system/redirect/ns4/named.conf.in
+++ b/bin/tests/system/redirect/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/redirect/ns4/root.hint b/bin/tests/system/redirect/ns4/root.hint
index 48b6bac0846..64e055161e7 100644
--- a/bin/tests/system/redirect/ns4/root.hint
+++ b/bin/tests/system/redirect/ns4/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 ; $Id: root.hint,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/redirect/prereq.sh b/bin/tests/system/redirect/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/redirect/prereq.sh
+++ b/bin/tests/system/redirect/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index b6af860b8ce..120a98f3d77 100644
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh
index e21750595a0..0e2adf77b83 100644
--- a/bin/tests/system/redirect/tests.sh
+++ b/bin/tests/system/redirect/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl
index 1c3c347bf94..a242a998ec7 100644
--- a/bin/tests/system/resolver/ans2/ans.pl
+++ b/bin/tests/system/resolver/ans2/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2010, 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.
 
 #
 # Ad hoc name server
diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl
index 11c010f457b..46d767378da 100644
--- a/bin/tests/system/resolver/ans3/ans.pl
+++ b/bin/tests/system/resolver/ans3/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 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.
 
 #
 # Ad hoc name server
diff --git a/bin/tests/system/resolver/ans8/ans.pl b/bin/tests/system/resolver/ans8/ans.pl
index 09d8a242743..a1a092a1ef3 100644
--- a/bin/tests/system/resolver/ans8/ans.pl
+++ b/bin/tests/system/resolver/ans8/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# 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.
 
 use IO::File;
 use IO::Socket;
diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index b40e2bc6f8a..4dfde1f3e72 100644
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 #
 # Clean up after resolver tests.
diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in
index 56b0e83d862..af83a70c02e 100644
--- a/bin/tests/system/resolver/ns1/named.conf.in
+++ b/bin/tests/system/resolver/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2009, 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.
  */
 
 options {
diff --git a/bin/tests/system/resolver/ns1/root.hint b/bin/tests/system/resolver/ns1/root.hint
index 2da077c51ce..6671358152a 100644
--- a/bin/tests/system/resolver/ns1/root.hint
+++ b/bin/tests/system/resolver/ns1/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns4/broken.db b/bin/tests/system/resolver/ns4/broken.db
index 48945266021..c7d295dec0f 100644
--- a/bin/tests/system/resolver/ns4/broken.db
+++ b/bin/tests/system/resolver/ns4/broken.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: tld1.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
 
diff --git a/bin/tests/system/resolver/ns4/child.server.db b/bin/tests/system/resolver/ns4/child.server.db
index b12470bf955..9a0154e113f 100644
--- a/bin/tests/system/resolver/ns4/child.server.db
+++ b/bin/tests/system/resolver/ns4/child.server.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: child.server.db,v 1.3 2011/03/13 23:47:35 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns4/moves.db b/bin/tests/system/resolver/ns4/moves.db
index d1173d78d97..b45cf54d2a6 100644
--- a/bin/tests/system/resolver/ns4/moves.db
+++ b/bin/tests/system/resolver/ns4/moves.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: moves.db,v 1.3 2011/03/13 23:47:35 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns4/named.conf.in b/bin/tests/system/resolver/ns4/named.conf.in
index cfba424ed0e..c679dc31515 100644
--- a/bin/tests/system/resolver/ns4/named.conf.in
+++ b/bin/tests/system/resolver/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010-2013, 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.
  */
 
 // NS4
diff --git a/bin/tests/system/resolver/ns4/named.noaa b/bin/tests/system/resolver/ns4/named.noaa
index 0229c09d93f..d8166d64279 100644
--- a/bin/tests/system/resolver/ns4/named.noaa
+++ b/bin/tests/system/resolver/ns4/named.noaa
@@ -1,9 +1,12 @@
-Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2010, 2016, 2018  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.
+
 $Id: named.noaa,v 1.2 2010/09/15 12:07:56 marka Exp $
 
 Add -T noaa.
diff --git a/bin/tests/system/resolver/ns4/root.db b/bin/tests/system/resolver/ns4/root.db
index 10fe4f25ddf..340a1235eae 100644
--- a/bin/tests/system/resolver/ns4/root.db
+++ b/bin/tests/system/resolver/ns4/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2014-2017  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.
 
 ; $Id: root.db,v 1.2 2010/09/15 12:07:56 marka Exp $
 
diff --git a/bin/tests/system/resolver/ns4/tld1.db b/bin/tests/system/resolver/ns4/tld1.db
index 8201cd69250..4cc99138079 100644
--- a/bin/tests/system/resolver/ns4/tld1.db
+++ b/bin/tests/system/resolver/ns4/tld1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2014, 2016, 2017  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.
 
 ; $Id: tld1.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
 
diff --git a/bin/tests/system/resolver/ns4/tld2.db b/bin/tests/system/resolver/ns4/tld2.db
index 1c894bc03b2..aa817e0c575 100644
--- a/bin/tests/system/resolver/ns4/tld2.db
+++ b/bin/tests/system/resolver/ns4/tld2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2014, 2016, 2017  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.
 
 ; $Id: tld2.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
 
diff --git a/bin/tests/system/resolver/ns5/child.server.db b/bin/tests/system/resolver/ns5/child.server.db
index 3c162f11da4..e9a07f2a342 100644
--- a/bin/tests/system/resolver/ns5/child.server.db
+++ b/bin/tests/system/resolver/ns5/child.server.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: child.server.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns5/moves.db b/bin/tests/system/resolver/ns5/moves.db
index add53bcf1c7..5439cbadf17 100644
--- a/bin/tests/system/resolver/ns5/moves.db
+++ b/bin/tests/system/resolver/ns5/moves.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: moves.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in
index 894e1d0b9be..07205c9938c 100644
--- a/bin/tests/system/resolver/ns5/named.conf.in
+++ b/bin/tests/system/resolver/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2011, 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.
  */
 
 // NS5
diff --git a/bin/tests/system/resolver/ns5/root.hint b/bin/tests/system/resolver/ns5/root.hint
index 18928d4005d..58ad7852a54 100644
--- a/bin/tests/system/resolver/ns5/root.hint
+++ b/bin/tests/system/resolver/ns5/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.hint,v 1.2 2010/09/15 12:07:56 marka Exp $
 
diff --git a/bin/tests/system/resolver/ns6/broken.db b/bin/tests/system/resolver/ns6/broken.db
index d1dda160e5c..c67eb453ea4 100644
--- a/bin/tests/system/resolver/ns6/broken.db
+++ b/bin/tests/system/resolver/ns6/broken.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: to-be-removed.tld.db.in,v 1.3 2012/02/09 23:47:18 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns6/delegation-only.db b/bin/tests/system/resolver/ns6/delegation-only.db
index c2c1d38cf93..29e9adbf7a7 100644
--- a/bin/tests/system/resolver/ns6/delegation-only.db
+++ b/bin/tests/system/resolver/ns6/delegation-only.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 120
 @	IN	SOA	ns	marka.isc.org. 1 0 0 0 120
diff --git a/bin/tests/system/resolver/ns6/ds.example.net.db.in b/bin/tests/system/resolver/ns6/ds.example.net.db.in
index 902bb49976f..3e3cb3c2b9a 100644
--- a/bin/tests/system/resolver/ns6/ds.example.net.db.in
+++ b/bin/tests/system/resolver/ns6/ds.example.net.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 ; $Id: example.net.db.in,v 1.3 2010/11/17 23:47:08 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns6/example.net.db.in b/bin/tests/system/resolver/ns6/example.net.db.in
index e956573a704..1010a373dd6 100644
--- a/bin/tests/system/resolver/ns6/example.net.db.in
+++ b/bin/tests/system/resolver/ns6/example.net.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2014, 2016  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.
 
 ; $Id: example.net.db.in,v 1.3 2010/11/17 23:47:08 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns6/fetch.tld.db b/bin/tests/system/resolver/ns6/fetch.tld.db
index 7e053f89cda..683157b0e0c 100644
--- a/bin/tests/system/resolver/ns6/fetch.tld.db
+++ b/bin/tests/system/resolver/ns6/fetch.tld.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; $Id: moves.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns6/keygen.sh b/bin/tests/system/resolver/ns6/keygen.sh
index 2903e88db7a..5a564636c6d 100644
--- a/bin/tests/system/resolver/ns6/keygen.sh
+++ b/bin/tests/system/resolver/ns6/keygen.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 # $Id: keygen.sh,v 1.2 2010/11/16 06:46:44 marka Exp $
 
diff --git a/bin/tests/system/resolver/ns6/moves.db b/bin/tests/system/resolver/ns6/moves.db
index 1d3a2729f79..42339d4db23 100644
--- a/bin/tests/system/resolver/ns6/moves.db
+++ b/bin/tests/system/resolver/ns6/moves.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: moves.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns6/named.conf.in b/bin/tests/system/resolver/ns6/named.conf.in
index 326ef789e21..1fcfa0cd52a 100644
--- a/bin/tests/system/resolver/ns6/named.conf.in
+++ b/bin/tests/system/resolver/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2012-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.
  */
 
 // NS6
diff --git a/bin/tests/system/resolver/ns6/no-edns-version.tld.db b/bin/tests/system/resolver/ns6/no-edns-version.tld.db
index b9bc1ae2d63..736c2e5590c 100644
--- a/bin/tests/system/resolver/ns6/no-edns-version.tld.db
+++ b/bin/tests/system/resolver/ns6/no-edns-version.tld.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	SOA	. . 0 0 0 0 0
 @	NS	ns
diff --git a/bin/tests/system/resolver/ns6/root.db b/bin/tests/system/resolver/ns6/root.db
index a1e99f0bc7b..a8910fa25c2 100644
--- a/bin/tests/system/resolver/ns6/root.db
+++ b/bin/tests/system/resolver/ns6/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2011, 2014, 2016  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.
 
 ; $Id: root.db,v 1.4 2011/03/13 23:47:36 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
index fdfdc261437..d7d782169ef 100644
--- a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
+++ b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: to-be-removed.tld.db.in,v 1.3 2012/02/09 23:47:18 tbox Exp $
 
diff --git a/bin/tests/system/resolver/ns7/all-cnames.db b/bin/tests/system/resolver/ns7/all-cnames.db
index 05c90411d47..3adcd1d7411 100644
--- a/bin/tests/system/resolver/ns7/all-cnames.db
+++ b/bin/tests/system/resolver/ns7/all-cnames.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
diff --git a/bin/tests/system/resolver/ns7/edns-version.tld.db b/bin/tests/system/resolver/ns7/edns-version.tld.db
index 6aa4e543b48..f94d84adb6f 100644
--- a/bin/tests/system/resolver/ns7/edns-version.tld.db
+++ b/bin/tests/system/resolver/ns7/edns-version.tld.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 @	SOA	. . 0 0 0 0 0
 @	NS	ns
diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in
index 5bea0526192..6828ad2672e 100644
--- a/bin/tests/system/resolver/ns7/named1.conf.in
+++ b/bin/tests/system/resolver/ns7/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2011, 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.
  */
 
 // NS7
diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in
index 3e8c9be1c34..ad8988f3448 100644
--- a/bin/tests/system/resolver/ns7/named2.conf.in
+++ b/bin/tests/system/resolver/ns7/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS7
diff --git a/bin/tests/system/resolver/ns7/root.hint b/bin/tests/system/resolver/ns7/root.hint
index 591569d636c..0aeca5ea546 100644
--- a/bin/tests/system/resolver/ns7/root.hint
+++ b/bin/tests/system/resolver/ns7/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.hint,v 1.2 2010/11/16 06:46:44 marka Exp $
 
diff --git a/bin/tests/system/resolver/ns7/server.db.in b/bin/tests/system/resolver/ns7/server.db.in
index c561298cea2..2b631bb6a4d 100644
--- a/bin/tests/system/resolver/ns7/server.db.in
+++ b/bin/tests/system/resolver/ns7/server.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: server.db.in,v 1.3 2011/03/13 23:47:36 tbox Exp $
 
diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh
index aad46df8308..264ab4c9821 100644
--- a/bin/tests/system/resolver/prereq.sh
+++ b/bin/tests/system/resolver/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index 6a516806d2f..665606ccc14 100644
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 79021b4b3a8..73066a881eb 100755
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rndc/Makefile.in b/bin/tests/system/rndc/Makefile.in
index c221c51f0fe..999c1e6e9ff 100644
--- a/bin/tests/system/rndc/Makefile.in
+++ b/bin/tests/system/rndc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh
index 11cd0cd6a9b..df8aa77210f 100644
--- a/bin/tests/system/rndc/clean.sh
+++ b/bin/tests/system/rndc/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-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.
 
 rm -f dig.out.*.test*
 rm -f ns*/named.lock
diff --git a/bin/tests/system/rndc/gencheck.c b/bin/tests/system/rndc/gencheck.c
index 0aa5194d944..9021b50108d 100644
--- a/bin/tests/system/rndc/gencheck.c
+++ b/bin/tests/system/rndc/gencheck.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 #include <config.h>
diff --git a/bin/tests/system/rndc/ns2/incl.db b/bin/tests/system/rndc/ns2/incl.db
index 7690dd7387d..f40cac4b6ef 100644
--- a/bin/tests/system/rndc/ns2/incl.db
+++ b/bin/tests/system/rndc/ns2/incl.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; Used for testing $INCLUDE
 $INCLUDE "static.db"
diff --git a/bin/tests/system/rndc/ns2/named.conf.in b/bin/tests/system/rndc/ns2/named.conf.in
index f8f3563d4d4..e4dfe3fddba 100644
--- a/bin/tests/system/rndc/ns2/named.conf.in
+++ b/bin/tests/system/rndc/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 options {
diff --git a/bin/tests/system/rndc/ns2/secondkey.conf b/bin/tests/system/rndc/ns2/secondkey.conf
index 44bcf59921f..55c3f54b8aa 100644
--- a/bin/tests/system/rndc/ns2/secondkey.conf
+++ b/bin/tests/system/rndc/ns2/secondkey.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 2016  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.
  */
 
 /* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */
diff --git a/bin/tests/system/rndc/ns3/named.conf.in b/bin/tests/system/rndc/ns3/named.conf.in
index b9c72c1e21a..e8dbfc4aeb9 100644
--- a/bin/tests/system/rndc/ns3/named.conf.in
+++ b/bin/tests/system/rndc/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 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.
  */
 
 options {
diff --git a/bin/tests/system/rndc/ns4/named.conf.in b/bin/tests/system/rndc/ns4/named.conf.in
index 3c90489e4cf..2466e695591 100644
--- a/bin/tests/system/rndc/ns4/named.conf.in
+++ b/bin/tests/system/rndc/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rndc/ns5/named.conf.in b/bin/tests/system/rndc/ns5/named.conf.in
index 3b6a11be392..889623eac5a 100644
--- a/bin/tests/system/rndc/ns5/named.conf.in
+++ b/bin/tests/system/rndc/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rndc/ns6/named.conf.in b/bin/tests/system/rndc/ns6/named.conf.in
index 3ac1e79e01c..5a577309930 100644
--- a/bin/tests/system/rndc/ns6/named.conf.in
+++ b/bin/tests/system/rndc/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index b19de6edef5..e74432f2152 100644
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 08ca6e6c71b..3f9577ca4f6 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in
index 42b9ebf4b6b..9ec63448cda 100644
--- a/bin/tests/system/rpz/Makefile.in
+++ b/bin/tests/system/rpz/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/rpz/ckdnsrps.sh b/bin/tests/system/rpz/ckdnsrps.sh
index fa239ee47b3..5e60743a924 100644
--- a/bin/tests/system/rpz/ckdnsrps.sh
+++ b/bin/tests/system/rpz/ckdnsrps.sh
@@ -1,10 +1,13 @@
 #! /bin/sh
 #
-# Copyright (C) 2017  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.
 
 set -e
 
diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh
index 0c5715a8a16..c4e1872aa02 100644
--- a/bin/tests/system/rpz/clean.sh
+++ b/bin/tests/system/rpz/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2011-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.
 
 # Clean up after rpz tests.
 
diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c
index 373c19fe9b1..40f8b8a48d7 100644
--- a/bin/tests/system/rpz/dnsrps.c
+++ b/bin/tests/system/rpz/dnsrps.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*
diff --git a/bin/tests/system/rpz/dnsrpzd.conf.in b/bin/tests/system/rpz/dnsrpzd.conf.in
index 0a4a9fd2619..7b0afbfc216 100644
--- a/bin/tests/system/rpz/dnsrpzd.conf.in
+++ b/bin/tests/system/rpz/dnsrpzd.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 # dnsrpzd configuration.
diff --git a/bin/tests/system/rpz/ns1/named.conf.in b/bin/tests/system/rpz/ns1/named.conf.in
index 51252b4a68e..405a73aeeb6 100644
--- a/bin/tests/system/rpz/ns1/named.conf.in
+++ b/bin/tests/system/rpz/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/rpz/ns1/root.db b/bin/tests/system/rpz/ns1/root.db
index 115aeacd1c7..d241627a4ac 100644
--- a/bin/tests/system/rpz/ns1/root.db
+++ b/bin/tests/system/rpz/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns2/base-tld2s.db b/bin/tests/system/rpz/ns2/base-tld2s.db
index 90985955d4f..877b848f998 100644
--- a/bin/tests/system/rpz/ns2/base-tld2s.db
+++ b/bin/tests/system/rpz/ns2/base-tld2s.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns2/bl.tld2.db.in b/bin/tests/system/rpz/ns2/bl.tld2.db.in
index d1026d845a8..84edda8a80a 100644
--- a/bin/tests/system/rpz/ns2/bl.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/bl.tld2.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns2/blv2.tld2.db.in b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
index 820c3ea6d05..c127f0ec953 100644
--- a/bin/tests/system/rpz/ns2/blv2.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns2/blv3.tld2.db.in b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
index ee82cf22156..d5637e59d24 100644
--- a/bin/tests/system/rpz/ns2/blv3.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns2/hints b/bin/tests/system/rpz/ns2/hints
index 0349bc590e9..3b6b6077635 100644
--- a/bin/tests/system/rpz/ns2/hints
+++ b/bin/tests/system/rpz/ns2/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns2/named.conf.in b/bin/tests/system/rpz/ns2/named.conf.in
index 0ff701276d7..f4f4550ddb7 100644
--- a/bin/tests/system/rpz/ns2/named.conf.in
+++ b/bin/tests/system/rpz/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 options {
diff --git a/bin/tests/system/rpz/ns2/tld2.db b/bin/tests/system/rpz/ns2/tld2.db
index 1d5953e1900..886f56a62a1 100644
--- a/bin/tests/system/rpz/ns2/tld2.db
+++ b/bin/tests/system/rpz/ns2/tld2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns3/base.db b/bin/tests/system/rpz/ns3/base.db
index 02a93c4252f..c71a080aee7 100644
--- a/bin/tests/system/rpz/ns3/base.db
+++ b/bin/tests/system/rpz/ns3/base.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-2013, 2016, 2017  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.
 
 ; RPZ test
 ;   This basic file is copied to several zone files before being used.
diff --git a/bin/tests/system/rpz/ns3/hints b/bin/tests/system/rpz/ns3/hints
index 0349bc590e9..3b6b6077635 100644
--- a/bin/tests/system/rpz/ns3/hints
+++ b/bin/tests/system/rpz/ns3/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in
index 1283275264d..091cceaa531 100644
--- a/bin/tests/system/rpz/ns3/named.conf.in
+++ b/bin/tests/system/rpz/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 
diff --git a/bin/tests/system/rpz/ns4/hints b/bin/tests/system/rpz/ns4/hints
index 0349bc590e9..3b6b6077635 100644
--- a/bin/tests/system/rpz/ns4/hints
+++ b/bin/tests/system/rpz/ns4/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns4/named.conf.in b/bin/tests/system/rpz/ns4/named.conf.in
index 04f1d16eb0b..03d0ca0abda 100644
--- a/bin/tests/system/rpz/ns4/named.conf.in
+++ b/bin/tests/system/rpz/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 options {
diff --git a/bin/tests/system/rpz/ns4/tld4.db b/bin/tests/system/rpz/ns4/tld4.db
index 29f87710fbd..bf4824a8e4f 100644
--- a/bin/tests/system/rpz/ns4/tld4.db
+++ b/bin/tests/system/rpz/ns4/tld4.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns5/empty.db.in b/bin/tests/system/rpz/ns5/empty.db.in
index 37bb79408ee..7edcc17705f 100644
--- a/bin/tests/system/rpz/ns5/empty.db.in
+++ b/bin/tests/system/rpz/ns5/empty.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL	120
 @	SOA	.  hostmaster.ns.example.tld5. ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/rpz/ns5/hints b/bin/tests/system/rpz/ns5/hints
index 623a336177b..3b6b6077635 100644
--- a/bin/tests/system/rpz/ns5/hints
+++ b/bin/tests/system/rpz/ns5/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns5/named.conf.in b/bin/tests/system/rpz/ns5/named.conf.in
index 7c0034f7093..025cff5ff9b 100644
--- a/bin/tests/system/rpz/ns5/named.conf.in
+++ b/bin/tests/system/rpz/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012-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.
  */
 
 
diff --git a/bin/tests/system/rpz/ns5/tld5.db b/bin/tests/system/rpz/ns5/tld5.db
index 3671b1b82f7..82c1a2ebe8b 100644
--- a/bin/tests/system/rpz/ns5/tld5.db
+++ b/bin/tests/system/rpz/ns5/tld5.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016, 2017  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.
 
 
 
diff --git a/bin/tests/system/rpz/ns6/hints b/bin/tests/system/rpz/ns6/hints
index d853eee492f..3b6b6077635 100644
--- a/bin/tests/system/rpz/ns6/hints
+++ b/bin/tests/system/rpz/ns6/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns6/named.conf.in b/bin/tests/system/rpz/ns6/named.conf.in
index f4f49369720..ccd177f1b2f 100644
--- a/bin/tests/system/rpz/ns6/named.conf.in
+++ b/bin/tests/system/rpz/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rpz/ns7/hints b/bin/tests/system/rpz/ns7/hints
index d853eee492f..3b6b6077635 100644
--- a/bin/tests/system/rpz/ns7/hints
+++ b/bin/tests/system/rpz/ns7/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rpz/ns7/named.conf.in b/bin/tests/system/rpz/ns7/named.conf.in
index 83acfe35b8f..8c5c15d10e2 100644
--- a/bin/tests/system/rpz/ns7/named.conf.in
+++ b/bin/tests/system/rpz/ns7/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rpz/prereq.sh b/bin/tests/system/rpz/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/rpz/prereq.sh
+++ b/bin/tests/system/rpz/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rpz/qperf.sh b/bin/tests/system/rpz/qperf.sh
index 8feaf59db2c..1614ff21196 100644
--- a/bin/tests/system/rpz/qperf.sh
+++ b/bin/tests/system/rpz/qperf.sh
@@ -1,10 +1,13 @@
 #! /bin/sh
 #
-# Copyright (C) 2012, 2013, 2016  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.
 
 # $Id$
 
diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 3aa4d125544..355a4aa83dc 100644
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -1,10 +1,13 @@
 #! /bin/sh
 #
-# Copyright (C) 2011-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.
 
 # touch dnsrps-off to not test with DNSRPS
 
diff --git a/bin/tests/system/rpz/test1 b/bin/tests/system/rpz/test1
index 462d69bba53..f6292530daa 100644
--- a/bin/tests/system/rpz/test1
+++ b/bin/tests/system/rpz/test1
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-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.
 
 
 
diff --git a/bin/tests/system/rpz/test2 b/bin/tests/system/rpz/test2
index b92b22630db..29f302c039b 100644
--- a/bin/tests/system/rpz/test2
+++ b/bin/tests/system/rpz/test2
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-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.
 
 
 
diff --git a/bin/tests/system/rpz/test3 b/bin/tests/system/rpz/test3
index 5108a2c86c2..225b74fc5f5 100644
--- a/bin/tests/system/rpz/test3
+++ b/bin/tests/system/rpz/test3
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 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.
 
 
 
diff --git a/bin/tests/system/rpz/test4 b/bin/tests/system/rpz/test4
index 922afa98ee9..0c909fca41c 100644
--- a/bin/tests/system/rpz/test4
+++ b/bin/tests/system/rpz/test4
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 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.
 
 
 
diff --git a/bin/tests/system/rpz/test4a b/bin/tests/system/rpz/test4a
index 6c9c28f693d..fdc388e7d7a 100644
--- a/bin/tests/system/rpz/test4a
+++ b/bin/tests/system/rpz/test4a
@@ -1,8 +1,11 @@
-; 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.
 
 
 
diff --git a/bin/tests/system/rpz/test5 b/bin/tests/system/rpz/test5
index df60cf4908c..1a3747c6376 100644
--- a/bin/tests/system/rpz/test5
+++ b/bin/tests/system/rpz/test5
@@ -1,8 +1,11 @@
-; Copyright (C) 2011-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.
 
 
 
diff --git a/bin/tests/system/rpz/test6 b/bin/tests/system/rpz/test6
index 72072c0e277..ec04681b4a5 100644
--- a/bin/tests/system/rpz/test6
+++ b/bin/tests/system/rpz/test6
@@ -1,8 +1,11 @@
-; 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.
 
 
 
diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 35b717cbb1d..c7d9de8d3a1 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-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.
 
 # test response policy zones (RPZ)
 
diff --git a/bin/tests/system/rpzrecurse/README b/bin/tests/system/rpzrecurse/README
index 79c30ac6c29..c495d4d0fb9 100644
--- a/bin/tests/system/rpzrecurse/README
+++ b/bin/tests/system/rpzrecurse/README
@@ -1,9 +1,12 @@
-Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2015, 2016, 2018  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.
+
 These tests check RPZ recursion behavior (including skipping
 recursion when appropriate).
 
diff --git a/bin/tests/system/rpzrecurse/ans5/ans.pl b/bin/tests/system/rpzrecurse/ans5/ans.pl
index a0d86525328..9723ff5f11e 100644
--- a/bin/tests/system/rpzrecurse/ans5/ans.pl
+++ b/bin/tests/system/rpzrecurse/ans5/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# 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.
 
 use IO::File;
 use IO::Socket;
diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index a2e73be34d4..85f1fe92c33 100644
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 # Clean up after rpz tests.
 
diff --git a/bin/tests/system/rpzrecurse/ns1/db.l0 b/bin/tests/system/rpzrecurse/ns1/db.l0
index 931b8474374..af0d9e8517f 100644
--- a/bin/tests/system/rpzrecurse/ns1/db.l0
+++ b/bin/tests/system/rpzrecurse/ns1/db.l0
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns1/db.l1.l0 b/bin/tests/system/rpzrecurse/ns1/db.l1.l0
index d53f00e695f..36ed1e576fa 100644
--- a/bin/tests/system/rpzrecurse/ns1/db.l1.l0
+++ b/bin/tests/system/rpzrecurse/ns1/db.l1.l0
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns1/example.db b/bin/tests/system/rpzrecurse/ns1/example.db
index 849b26352dd..fd3e8877e0f 100644
--- a/bin/tests/system/rpzrecurse/ns1/example.db
+++ b/bin/tests/system/rpzrecurse/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @ IN SOA root.example. example. 1 3600 3600 3600 3600
diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.in b/bin/tests/system/rpzrecurse/ns1/named.conf.in
index a71ab169ffe..e8105a2e1f9 100644
--- a/bin/tests/system/rpzrecurse/ns1/named.conf.in
+++ b/bin/tests/system/rpzrecurse/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rpzrecurse/ns1/root.db b/bin/tests/system/rpzrecurse/ns1/root.db
index 069840d3f9f..1b1de3fc008 100644
--- a/bin/tests/system/rpzrecurse/ns1/root.db
+++ b/bin/tests/system/rpzrecurse/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300
 @ 			IN SOA	muks.isc.org. a.root.servers.nil. (
diff --git a/bin/tests/system/rpzrecurse/ns1/test1.example.net.db b/bin/tests/system/rpzrecurse/ns1/test1.example.net.db
index 6332f4f7b99..4d07a4129ad 100644
--- a/bin/tests/system/rpzrecurse/ns1/test1.example.net.db
+++ b/bin/tests/system/rpzrecurse/ns1/test1.example.net.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @ IN SOA root.example. example. 1 3600 3600 3600 3600
diff --git a/bin/tests/system/rpzrecurse/ns1/test2.example.net.db b/bin/tests/system/rpzrecurse/ns1/test2.example.net.db
index 1cab607e40b..bfe46aa277c 100644
--- a/bin/tests/system/rpzrecurse/ns1/test2.example.net.db
+++ b/bin/tests/system/rpzrecurse/ns1/test2.example.net.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 3600
 @ IN SOA root.example. example. 1 3600 3600 3600 3600
diff --git a/bin/tests/system/rpzrecurse/ns2/db.clientip1 b/bin/tests/system/rpzrecurse/ns2/db.clientip1
index 7b67c6b17be..9b99e451303 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.clientip1
+++ b/bin/tests/system/rpzrecurse/ns2/db.clientip1
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.clientip2 b/bin/tests/system/rpzrecurse/ns2/db.clientip2
index cbd322fc259..49ab88124cc 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.clientip2
+++ b/bin/tests/system/rpzrecurse/ns2/db.clientip2
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.clientip21 b/bin/tests/system/rpzrecurse/ns2/db.clientip21
index b6814371270..770269cbd08 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.clientip21
+++ b/bin/tests/system/rpzrecurse/ns2/db.clientip21
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.log1 b/bin/tests/system/rpzrecurse/ns2/db.log1
index 74f8526eb00..f18cfe19c2e 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.log1
+++ b/bin/tests/system/rpzrecurse/ns2/db.log1
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.log2 b/bin/tests/system/rpzrecurse/ns2/db.log2
index 5968b3e6167..88722ff03ea 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.log2
+++ b/bin/tests/system/rpzrecurse/ns2/db.log2
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.log3 b/bin/tests/system/rpzrecurse/ns2/db.log3
index a8876b3ae6c..b432802f993 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.log3
+++ b/bin/tests/system/rpzrecurse/ns2/db.log3
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.wildcard1 b/bin/tests/system/rpzrecurse/ns2/db.wildcard1
index 789df2e82c2..8d6e8adc820 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.wildcard1
+++ b/bin/tests/system/rpzrecurse/ns2/db.wildcard1
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.wildcard2a b/bin/tests/system/rpzrecurse/ns2/db.wildcard2a
index 789df2e82c2..8d6e8adc820 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.wildcard2a
+++ b/bin/tests/system/rpzrecurse/ns2/db.wildcard2a
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.wildcard2b b/bin/tests/system/rpzrecurse/ns2/db.wildcard2b
index ee4486cdddd..c362314def6 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.wildcard2b
+++ b/bin/tests/system/rpzrecurse/ns2/db.wildcard2b
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/db.wildcard3 b/bin/tests/system/rpzrecurse/ns2/db.wildcard3
index 92f806ee424..b60bdd19065 100644
--- a/bin/tests/system/rpzrecurse/ns2/db.wildcard3
+++ b/bin/tests/system/rpzrecurse/ns2/db.wildcard3
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
index 46b33fcdc24..8120a547afc 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 # common configuration
diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf
index dcea7a9e18f..bfd0b692cb2 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 # common configuration
diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
index afb102fe9da..58a0dc9a643 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
+++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 controls { /* empty */ };
diff --git a/bin/tests/system/rpzrecurse/ns2/named.default.conf b/bin/tests/system/rpzrecurse/ns2/named.default.conf
index 00e34294ff3..f6904958942 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.default.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.default.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 # common configuration
diff --git a/bin/tests/system/rpzrecurse/ns2/named.log.conf b/bin/tests/system/rpzrecurse/ns2/named.log.conf
index d8d935198dc..731b97f6cfd 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.log.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.log.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 # common configuration
diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf
index 8b0d2bcb04a..91f06932586 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 # common configuration
diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf
index db9d28170fd..a4e2dd5222a 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 # common configuration
diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf
index 9eeea4295a6..e53aa4d88e5 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 # common configuration
diff --git a/bin/tests/system/rpzrecurse/ns2/root.hint b/bin/tests/system/rpzrecurse/ns2/root.hint
index 82b12c000a8..f627479ba33 100644
--- a/bin/tests/system/rpzrecurse/ns2/root.hint
+++ b/bin/tests/system/rpzrecurse/ns2/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 999999
 .			IN NS	ns.example.
diff --git a/bin/tests/system/rpzrecurse/ns3/example.db b/bin/tests/system/rpzrecurse/ns3/example.db
index ecdb46843bb..3fb4a243ca6 100644
--- a/bin/tests/system/rpzrecurse/ns3/example.db
+++ b/bin/tests/system/rpzrecurse/ns3/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 0
 @			SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.in b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
index 01001f4a72b..55b75b3eb23 100644
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.in b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
index 604c84e33e7..c554ec15d6f 100644
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/rpzrecurse/ns3/policy.db b/bin/tests/system/rpzrecurse/ns3/policy.db
index 7a24fed8cce..c2437d2835e 100644
--- a/bin/tests/system/rpzrecurse/ns3/policy.db
+++ b/bin/tests/system/rpzrecurse/ns3/policy.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 0
 @			SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/rpzrecurse/ns3/root.db b/bin/tests/system/rpzrecurse/ns3/root.db
index a02fc9ceaba..b12a1843955 100644
--- a/bin/tests/system/rpzrecurse/ns3/root.db
+++ b/bin/tests/system/rpzrecurse/ns3/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 0
 @			SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/rpzrecurse/ns4/child.example.db b/bin/tests/system/rpzrecurse/ns4/child.example.db
index ed23887552c..66cd956e156 100644
--- a/bin/tests/system/rpzrecurse/ns4/child.example.db
+++ b/bin/tests/system/rpzrecurse/ns4/child.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 0
 @			SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.in b/bin/tests/system/rpzrecurse/ns4/named.conf.in
index ca1f303f5f4..24e5115ae64 100644
--- a/bin/tests/system/rpzrecurse/ns4/named.conf.in
+++ b/bin/tests/system/rpzrecurse/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 controls { /* empty */ };
diff --git a/bin/tests/system/rpzrecurse/prereq.sh b/bin/tests/system/rpzrecurse/prereq.sh
index 5cb78129857..a0d4e9ce14a 100644
--- a/bin/tests/system/rpzrecurse/prereq.sh
+++ b/bin/tests/system/rpzrecurse/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index c37b07693d0..27d560277bb 100644
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 # touch dnsrps-off to not test with DNSRPS
 
diff --git a/bin/tests/system/rpzrecurse/testgen.pl b/bin/tests/system/rpzrecurse/testgen.pl
index c39a20eebb5..1422831fcda 100755
--- a/bin/tests/system/rpzrecurse/testgen.pl
+++ b/bin/tests/system/rpzrecurse/testgen.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2015-2017  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.
 
 use strict;
 use warnings;
diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index 7ee71f0bc51..b49f2fd93e8 100644
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 # touch dnsrps-off to not test with DNSRPS
 # touch dnsrps-only to not test with classic RPZ
diff --git a/bin/tests/system/rrchecker/clean.sh b/bin/tests/system/rrchecker/clean.sh
index 638f5ae72e3..11e7d2d2d80 100644
--- a/bin/tests/system/rrchecker/clean.sh
+++ b/bin/tests/system/rrchecker/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2013, 2014, 2016, 2017  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.
 
 rm -f classlist.out privatelist.out typelist.out tempzone checkzone.out* checker.out
 rm -f ns*/named.lock
diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh
index f647072a52d..29440161b57 100644
--- a/bin/tests/system/rrchecker/tests.sh
+++ b/bin/tests/system/rrchecker/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rrl/broken.conf b/bin/tests/system/rrl/broken.conf
index fbaf9fd390a..0c0a121564a 100644
--- a/bin/tests/system/rrl/broken.conf
+++ b/bin/tests/system/rrl/broken.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 
diff --git a/bin/tests/system/rrl/clean.sh b/bin/tests/system/rrl/clean.sh
index cde5d460fc3..55a1c12b991 100644
--- a/bin/tests/system/rrl/clean.sh
+++ b/bin/tests/system/rrl/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2012-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.
 
 # Clean up after rrl tests.
 
diff --git a/bin/tests/system/rrl/ns1/named.conf.in b/bin/tests/system/rrl/ns1/named.conf.in
index 38da14b8c0e..4605e46e3a7 100644
--- a/bin/tests/system/rrl/ns1/named.conf.in
+++ b/bin/tests/system/rrl/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/rrl/ns1/root.db b/bin/tests/system/rrl/ns1/root.db
index b24cac55120..c628370d6d0 100644
--- a/bin/tests/system/rrl/ns1/root.db
+++ b/bin/tests/system/rrl/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 
 $TTL	120
diff --git a/bin/tests/system/rrl/ns2/hints b/bin/tests/system/rrl/ns2/hints
index bc02f562ddb..cb67a8b3eca 100644
--- a/bin/tests/system/rrl/ns2/hints
+++ b/bin/tests/system/rrl/ns2/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 
 
diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.in
index 0632a6c2931..6a506234f34 100644
--- a/bin/tests/system/rrl/ns2/named.conf.in
+++ b/bin/tests/system/rrl/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/rrl/ns2/tld2.db b/bin/tests/system/rrl/ns2/tld2.db
index e67e23d7712..4a4b97aa4d6 100644
--- a/bin/tests/system/rrl/ns2/tld2.db
+++ b/bin/tests/system/rrl/ns2/tld2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 
 
diff --git a/bin/tests/system/rrl/ns3/hints b/bin/tests/system/rrl/ns3/hints
index bc02f562ddb..cb67a8b3eca 100644
--- a/bin/tests/system/rrl/ns3/hints
+++ b/bin/tests/system/rrl/ns3/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 
 
diff --git a/bin/tests/system/rrl/ns3/named.conf.in b/bin/tests/system/rrl/ns3/named.conf.in
index 1fc7adde03e..5be45fac811 100644
--- a/bin/tests/system/rrl/ns3/named.conf.in
+++ b/bin/tests/system/rrl/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/rrl/ns3/tld3.db b/bin/tests/system/rrl/ns3/tld3.db
index dbcfda9510d..26e9f3301dd 100644
--- a/bin/tests/system/rrl/ns3/tld3.db
+++ b/bin/tests/system/rrl/ns3/tld3.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 
 
diff --git a/bin/tests/system/rrl/ns4/hints b/bin/tests/system/rrl/ns4/hints
index aa3924d9b55..cb67a8b3eca 100644
--- a/bin/tests/system/rrl/ns4/hints
+++ b/bin/tests/system/rrl/ns4/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 
 
diff --git a/bin/tests/system/rrl/ns4/named.conf.in b/bin/tests/system/rrl/ns4/named.conf.in
index 272f46b0d3f..07383c32412 100644
--- a/bin/tests/system/rrl/ns4/named.conf.in
+++ b/bin/tests/system/rrl/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rrl/ns4/tld4.db b/bin/tests/system/rrl/ns4/tld4.db
index 11d48a8317c..5b746a01ab3 100644
--- a/bin/tests/system/rrl/ns4/tld4.db
+++ b/bin/tests/system/rrl/ns4/tld4.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 
 
diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh
index 5070de109e1..4563f04145d 100644
--- a/bin/tests/system/rrl/setup.sh
+++ b/bin/tests/system/rrl/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index 26e7a758d29..4742751c00e 100644
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2012, 2013, 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.
 
 # test response rate limiting
 
diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh
index 3392589257c..2e19c523b76 100644
--- a/bin/tests/system/rrsetorder/clean.sh
+++ b/bin/tests/system/rrsetorder/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011, 2012, 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.
 
 rm -f dig.out.test*
 rm -f dig.out.cyclic dig.out.fixed dig.out.random dig.out.nomatch
diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.in b/bin/tests/system/rrsetorder/ns1/named.conf.in
index 906062e2728..e3430f7c874 100644
--- a/bin/tests/system/rrsetorder/ns1/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/rrsetorder/ns1/root.db b/bin/tests/system/rrsetorder/ns1/root.db
index c1a71e45679..86fae7147de 100644
--- a/bin/tests/system/rrsetorder/ns1/root.db
+++ b/bin/tests/system/rrsetorder/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2006, 2007, 2012, 2016, 2017  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.
 
 ; $Id: root.db,v 1.6 2012/01/04 23:46:49 tbox Exp $
 
diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.in b/bin/tests/system/rrsetorder/ns2/named.conf.in
index cbcfecd7389..ae7eb9592f9 100644
--- a/bin/tests/system/rrsetorder/ns2/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.in b/bin/tests/system/rrsetorder/ns3/named.conf.in
index 6bbe0bae47b..14153dfb0ee 100644
--- a/bin/tests/system/rrsetorder/ns3/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.in b/bin/tests/system/rrsetorder/ns4/named.conf.in
index b4fb7d78be4..09de24d741a 100644
--- a/bin/tests/system/rrsetorder/ns4/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/rrsetorder/setup.sh b/bin/tests/system/rrsetorder/setup.sh
index 7d0bc272e02..3a14fe9e3ac 100644
--- a/bin/tests/system/rrsetorder/setup.sh
+++ b/bin/tests/system/rrsetorder/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index c2fb74fad3a..c0d6b2054e2 100644
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011, 2012, 2014-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in
index 6fc12099c0f..817522e6a70 100644
--- a/bin/tests/system/rsabigexponent/Makefile.in
+++ b/bin/tests/system/rsabigexponent/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c
index ff40ff8b976..ba87fbeca2d 100644
--- a/bin/tests/system/rsabigexponent/bigkey.c
+++ b/bin/tests/system/rsabigexponent/bigkey.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/rsabigexponent/clean.sh b/bin/tests/system/rsabigexponent/clean.sh
index 9b8dca6a152..bba0f1177de 100644
--- a/bin/tests/system/rsabigexponent/clean.sh
+++ b/bin/tests/system/rsabigexponent/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 rm -f K* */K* */dsset-*. */*.signed */trusted.conf */tmp*
 rm -f ns*/dsset-example
diff --git a/bin/tests/system/rsabigexponent/conf/bad01.conf b/bin/tests/system/rsabigexponent/conf/bad01.conf
index 05029483727..6b106fa49ab 100644
--- a/bin/tests/system/rsabigexponent/conf/bad01.conf
+++ b/bin/tests/system/rsabigexponent/conf/bad01.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/rsabigexponent/conf/bad02.conf b/bin/tests/system/rsabigexponent/conf/bad02.conf
index 9cf399620f3..a94c941b12c 100644
--- a/bin/tests/system/rsabigexponent/conf/bad02.conf
+++ b/bin/tests/system/rsabigexponent/conf/bad02.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/rsabigexponent/conf/bad03.conf b/bin/tests/system/rsabigexponent/conf/bad03.conf
index 18a3c5a1e41..0996f4051df 100644
--- a/bin/tests/system/rsabigexponent/conf/bad03.conf
+++ b/bin/tests/system/rsabigexponent/conf/bad03.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/rsabigexponent/conf/good01.conf b/bin/tests/system/rsabigexponent/conf/good01.conf
index c2ee85635d6..ee57f58b754 100644
--- a/bin/tests/system/rsabigexponent/conf/good01.conf
+++ b/bin/tests/system/rsabigexponent/conf/good01.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/rsabigexponent/conf/good02.conf b/bin/tests/system/rsabigexponent/conf/good02.conf
index dcf16b312a0..9eecc76cb56 100644
--- a/bin/tests/system/rsabigexponent/conf/good02.conf
+++ b/bin/tests/system/rsabigexponent/conf/good02.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/rsabigexponent/conf/good03.conf b/bin/tests/system/rsabigexponent/conf/good03.conf
index bbdc2895429..3cecd03c7de 100644
--- a/bin/tests/system/rsabigexponent/conf/good03.conf
+++ b/bin/tests/system/rsabigexponent/conf/good03.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.in b/bin/tests/system/rsabigexponent/ns1/named.conf.in
index ba529b6ef31..a43c02bc485 100644
--- a/bin/tests/system/rsabigexponent/ns1/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/rsabigexponent/ns1/root.db.in b/bin/tests/system/rsabigexponent/ns1/root.db.in
index afa4cbf55e0..c259a55440e 100644
--- a/bin/tests/system/rsabigexponent/ns1/root.db.in
+++ b/bin/tests/system/rsabigexponent/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rsabigexponent/ns1/sign.sh b/bin/tests/system/rsabigexponent/ns1/sign.sh
index 5c61f5a1027..05615197647 100755
--- a/bin/tests/system/rsabigexponent/ns1/sign.sh
+++ b/bin/tests/system/rsabigexponent/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rsabigexponent/ns2/example.db.bad b/bin/tests/system/rsabigexponent/ns2/example.db.bad
index 2f04e29c06e..bbf8cc18dbb 100644
--- a/bin/tests/system/rsabigexponent/ns2/example.db.bad
+++ b/bin/tests/system/rsabigexponent/ns2/example.db.bad
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rsabigexponent/ns2/example.db.in b/bin/tests/system/rsabigexponent/ns2/example.db.in
index a03f429ec2b..37c7313d9fa 100644
--- a/bin/tests/system/rsabigexponent/ns2/example.db.in
+++ b/bin/tests/system/rsabigexponent/ns2/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.in b/bin/tests/system/rsabigexponent/ns2/named.conf.in
index 7e7ce51ec45..2e8eb7aa91f 100644
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/rsabigexponent/ns2/sign.sh b/bin/tests/system/rsabigexponent/ns2/sign.sh
index 9e446b898d6..12fbc451a90 100755
--- a/bin/tests/system/rsabigexponent/ns2/sign.sh
+++ b/bin/tests/system/rsabigexponent/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016  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.
 
 # $Id: sign.sh,v 1.3 2011/05/26 23:47:28 tbox Exp $
 
diff --git a/bin/tests/system/rsabigexponent/ns3/named.conf.in b/bin/tests/system/rsabigexponent/ns3/named.conf.in
index 5ce0908b08f..99d2a0d3fc3 100644
--- a/bin/tests/system/rsabigexponent/ns3/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS3
diff --git a/bin/tests/system/rsabigexponent/prereq.sh b/bin/tests/system/rsabigexponent/prereq.sh
index 78530afc871..695c074a442 100644
--- a/bin/tests/system/rsabigexponent/prereq.sh
+++ b/bin/tests/system/rsabigexponent/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index 850d030a5e1..6d4684130f1 100644
--- a/bin/tests/system/rsabigexponent/setup.sh
+++ b/bin/tests/system/rsabigexponent/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/rsabigexponent/tests.sh b/bin/tests/system/rsabigexponent/tests.sh
index 9f1a04c219e..b53052892e2 100644
--- a/bin/tests/system/rsabigexponent/tests.sh
+++ b/bin/tests/system/rsabigexponent/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index c458dee1ef9..60e6395da73 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2010, 2012, 2014-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.
 
 #
 # Run a system test.
diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index 89fc2ce60ac..5aa94124540 100644
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2010-2012, 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.
 
 # Run all the system tests.
 #
diff --git a/bin/tests/system/runsequential.sh b/bin/tests/system/runsequential.sh
index 39022abb970..5e352e9bc5a 100644
--- a/bin/tests/system/runsequential.sh
+++ b/bin/tests/system/runsequential.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 # Run system tests that must be run sequentially
 #
diff --git a/bin/tests/system/runtime/README b/bin/tests/system/runtime/README
index 35daa3a44d2..0fdf7aee64b 100644
--- a/bin/tests/system/runtime/README
+++ b/bin/tests/system/runtime/README
@@ -1,8 +1,11 @@
-Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2014, 2016, 2018  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.
+
 Tests of runtime checks, e.g., that named prevents duplicate processes
 from running.
diff --git a/bin/tests/system/runtime/clean.sh b/bin/tests/system/runtime/clean.sh
index e57e5615858..a2345248f9d 100644
--- a/bin/tests/system/runtime/clean.sh
+++ b/bin/tests/system/runtime/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-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.
 
 rm -f ns2/named.conf ns2/named-alt*.conf
 rm -f */named.memstats
diff --git a/bin/tests/system/runtime/ns2/named-alt1.conf.in b/bin/tests/system/runtime/ns2/named-alt1.conf.in
index 39c393840fb..aab555fc2da 100644
--- a/bin/tests/system/runtime/ns2/named-alt1.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/runtime/ns2/named-alt2.conf.in b/bin/tests/system/runtime/ns2/named-alt2.conf.in
index b2f5a7ad776..a5133836165 100644
--- a/bin/tests/system/runtime/ns2/named-alt2.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/runtime/ns2/named-alt3.conf.in b/bin/tests/system/runtime/ns2/named-alt3.conf.in
index 0cce827e53b..a1cf6145c16 100644
--- a/bin/tests/system/runtime/ns2/named-alt3.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt3.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/runtime/ns2/named-alt4.conf.in b/bin/tests/system/runtime/ns2/named-alt4.conf.in
index de04a3ccbc6..f36c1fd3df6 100644
--- a/bin/tests/system/runtime/ns2/named-alt4.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt4.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/runtime/ns2/named-alt5.conf.in b/bin/tests/system/runtime/ns2/named-alt5.conf.in
index a586aa21170..ede08ab7d31 100644
--- a/bin/tests/system/runtime/ns2/named-alt5.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt5.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/runtime/ns2/named-alt6.conf.in b/bin/tests/system/runtime/ns2/named-alt6.conf.in
index 94510c44bb0..543ca007eed 100644
--- a/bin/tests/system/runtime/ns2/named-alt6.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt6.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/runtime/ns2/named1.conf.in b/bin/tests/system/runtime/ns2/named1.conf.in
index fe19ec8f7cc..7eb7f6c615f 100644
--- a/bin/tests/system/runtime/ns2/named1.conf.in
+++ b/bin/tests/system/runtime/ns2/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/runtime/setup.sh b/bin/tests/system/runtime/setup.sh
index be1d3191acb..522a6e69d2b 100644
--- a/bin/tests/system/runtime/setup.sh
+++ b/bin/tests/system/runtime/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 9e73bbba7a1..9dc43acd1df 100644
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2014-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/send.pl b/bin/tests/system/send.pl
index 9ebd7f15bb7..758bf5fc1b4 100644
--- a/bin/tests/system/send.pl
+++ b/bin/tests/system/send.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2016  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.
 
 # $Id: send.pl,v 1.7 2011/03/05 23:52:29 tbox Exp $
 
diff --git a/bin/tests/system/serve-stale/ans2/ans.pl b/bin/tests/system/serve-stale/ans2/ans.pl
index 2a037b2db8f..36aeb3b4781 100644
--- a/bin/tests/system/serve-stale/ans2/ans.pl
+++ b/bin/tests/system/serve-stale/ans2/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# 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.
 
 use strict;
 use warnings;
diff --git a/bin/tests/system/serve-stale/clean.sh b/bin/tests/system/serve-stale/clean.sh
index 5a38df583c5..1e3d07eb8d0 100644
--- a/bin/tests/system/serve-stale/clean.sh
+++ b/bin/tests/system/serve-stale/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f dig.out.test*
 rm -f ns1/named.conf
diff --git a/bin/tests/system/serve-stale/ns1/named1.conf.in b/bin/tests/system/serve-stale/ns1/named1.conf.in
index 153a603864f..5e3fc8f6581 100644
--- a/bin/tests/system/serve-stale/ns1/named1.conf.in
+++ b/bin/tests/system/serve-stale/ns1/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/serve-stale/ns1/named2.conf.in b/bin/tests/system/serve-stale/ns1/named2.conf.in
index 479178151f3..3ab76d643ae 100644
--- a/bin/tests/system/serve-stale/ns1/named2.conf.in
+++ b/bin/tests/system/serve-stale/ns1/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/serve-stale/ns1/root.db b/bin/tests/system/serve-stale/ns1/root.db
index a865fe0c3a9..2e8ca62f67a 100644
--- a/bin/tests/system/serve-stale/ns1/root.db
+++ b/bin/tests/system/serve-stale/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 .		300	SOA	. . 0 0 0 0 0
 .		300	NS	ns.nil.
diff --git a/bin/tests/system/serve-stale/ns3/named.conf.in b/bin/tests/system/serve-stale/ns3/named.conf.in
index 34b5ad2d044..fb06af082e5 100644
--- a/bin/tests/system/serve-stale/ns3/named.conf.in
+++ b/bin/tests/system/serve-stale/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/serve-stale/prereq.sh b/bin/tests/system/serve-stale/prereq.sh
index 74666ae909b..9c60004aa27 100644
--- a/bin/tests/system/serve-stale/prereq.sh
+++ b/bin/tests/system/serve-stale/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  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.
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh
index 92ee3ce1ac3..9157bca2a53 100644
--- a/bin/tests/system/serve-stale/setup.sh
+++ b/bin/tests/system/serve-stale/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh
index 57b5a7c2d91..5d696aafb02 100755
--- a/bin/tests/system/serve-stale/tests.sh
+++ b/bin/tests/system/serve-stale/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/setup.sh b/bin/tests/system/setup.sh
index 2803b7e2474..ff8c1bd2aa4 100644
--- a/bin/tests/system/setup.sh
+++ b/bin/tests/system/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016  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.
 
 #
 # Run a system test.
diff --git a/bin/tests/system/sfcache/README b/bin/tests/system/sfcache/README
index 5c961228dcb..2fde21f0a8e 100644
--- a/bin/tests/system/sfcache/README
+++ b/bin/tests/system/sfcache/README
@@ -1,9 +1,12 @@
-Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2014, 2016, 2018  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.
+
 The test setup for the SERVFAIL ncache tests has a secure root.
 
 ns1 is the root server.
diff --git a/bin/tests/system/sfcache/clean.sh b/bin/tests/system/sfcache/clean.sh
index a14406f880d..e3e47ab857c 100644
--- a/bin/tests/system/sfcache/clean.sh
+++ b/bin/tests/system/sfcache/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-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.
 
 rm -f */K*.key */K*.private */*.signed */*.db */dsset-*
 rm -f */managed.conf */trusted.conf
diff --git a/bin/tests/system/sfcache/ns1/named.conf.in b/bin/tests/system/sfcache/ns1/named.conf.in
index 314091631df..a43c02bc485 100644
--- a/bin/tests/system/sfcache/ns1/named.conf.in
+++ b/bin/tests/system/sfcache/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/sfcache/ns1/root.db.in b/bin/tests/system/sfcache/ns1/root.db.in
index 234b91bc789..dab5cea7f77 100644
--- a/bin/tests/system/sfcache/ns1/root.db.in
+++ b/bin/tests/system/sfcache/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/sfcache/ns1/sign.sh b/bin/tests/system/sfcache/ns1/sign.sh
index 43f39f40dcb..270d2a8b1e6 100644
--- a/bin/tests/system/sfcache/ns1/sign.sh
+++ b/bin/tests/system/sfcache/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/sfcache/ns2/example.db.in b/bin/tests/system/sfcache/ns2/example.db.in
index 0baa1f787d8..594a549dec4 100644
--- a/bin/tests/system/sfcache/ns2/example.db.in
+++ b/bin/tests/system/sfcache/ns2/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/sfcache/ns2/named.conf.in b/bin/tests/system/sfcache/ns2/named.conf.in
index 0e94f026a66..693ee05f673 100644
--- a/bin/tests/system/sfcache/ns2/named.conf.in
+++ b/bin/tests/system/sfcache/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/sfcache/ns2/sign.sh b/bin/tests/system/sfcache/ns2/sign.sh
index dab01ce54fc..73e55e76ac2 100644
--- a/bin/tests/system/sfcache/ns2/sign.sh
+++ b/bin/tests/system/sfcache/ns2/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/sfcache/ns5/named.conf.in b/bin/tests/system/sfcache/ns5/named.conf.in
index 370c0ea864e..f5f0db76c88 100644
--- a/bin/tests/system/sfcache/ns5/named.conf.in
+++ b/bin/tests/system/sfcache/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS5
diff --git a/bin/tests/system/sfcache/ns5/trusted.conf.bad b/bin/tests/system/sfcache/ns5/trusted.conf.bad
index 310675d897f..ed30460bda4 100644
--- a/bin/tests/system/sfcache/ns5/trusted.conf.bad
+++ b/bin/tests/system/sfcache/ns5/trusted.conf.bad
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 trusted-keys {
diff --git a/bin/tests/system/sfcache/prereq.sh b/bin/tests/system/sfcache/prereq.sh
index 49232af8c27..9847200dfde 100644
--- a/bin/tests/system/sfcache/prereq.sh
+++ b/bin/tests/system/sfcache/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh
index 98babf0283b..1a2453d46cc 100644
--- a/bin/tests/system/sfcache/setup.sh
+++ b/bin/tests/system/sfcache/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/sfcache/tests.sh b/bin/tests/system/sfcache/tests.sh
index 5d65341fd4e..c4386c6e93b 100644
--- a/bin/tests/system/sfcache/tests.sh
+++ b/bin/tests/system/sfcache/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/smartsign/child.db b/bin/tests/system/smartsign/child.db
index 8dcfa609a80..e597488eb65 100644
--- a/bin/tests/system/smartsign/child.db
+++ b/bin/tests/system/smartsign/child.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: child.db,v 1.3 2010/01/18 23:48:40 tbox Exp $
 
diff --git a/bin/tests/system/smartsign/clean.sh b/bin/tests/system/smartsign/clean.sh
index 992714ff4a2..0f23bf9e1cc 100644
--- a/bin/tests/system/smartsign/clean.sh
+++ b/bin/tests/system/smartsign/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 rm -f K* dsset-* *.signed dnskey.sigs other.sigs dsset.out
 rm -f ns*/named.lock
diff --git a/bin/tests/system/smartsign/parent.db b/bin/tests/system/smartsign/parent.db
index 6bf76a4b063..cf11509f477 100644
--- a/bin/tests/system/smartsign/parent.db
+++ b/bin/tests/system/smartsign/parent.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: parent.db,v 1.3 2010/01/18 23:48:40 tbox Exp $
 
diff --git a/bin/tests/system/smartsign/prereq.sh b/bin/tests/system/smartsign/prereq.sh
index b9ea84a6a26..a0d4e9ce14a 100644
--- a/bin/tests/system/smartsign/prereq.sh
+++ b/bin/tests/system/smartsign/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/smartsign/setup.sh b/bin/tests/system/smartsign/setup.sh
index f2d4cc62a44..2fb9a316871 100644
--- a/bin/tests/system/smartsign/setup.sh
+++ b/bin/tests/system/smartsign/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh
index 4333a1a42cb..15b0efc9837 100644
--- a/bin/tests/system/smartsign/tests.sh
+++ b/bin/tests/system/smartsign/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh
index 4afaba51e2e..e9102915a5b 100644
--- a/bin/tests/system/sortlist/clean.sh
+++ b/bin/tests/system/sortlist/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2012, 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.
 
 rm -f *.dig *.good *.out
 rm -f */named.memstats
diff --git a/bin/tests/system/sortlist/ns1/example.db b/bin/tests/system/sortlist/ns1/example.db
index 8917c834108..bb74a2e45f3 100644
--- a/bin/tests/system/sortlist/ns1/example.db
+++ b/bin/tests/system/sortlist/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example.db,v 1.7 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/sortlist/ns1/named.conf.in b/bin/tests/system/sortlist/ns1/named.conf.in
index 5188c787a03..90156811ff5 100644
--- a/bin/tests/system/sortlist/ns1/named.conf.in
+++ b/bin/tests/system/sortlist/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/sortlist/ns1/root.db b/bin/tests/system/sortlist/ns1/root.db
index de2cd410806..df12612f970 100644
--- a/bin/tests/system/sortlist/ns1/root.db
+++ b/bin/tests/system/sortlist/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.5 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/sortlist/setup.sh b/bin/tests/system/sortlist/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/sortlist/setup.sh
+++ b/bin/tests/system/sortlist/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh
index 4018df735a5..2fc44b0f8f2 100644
--- a/bin/tests/system/sortlist/tests.sh
+++ b/bin/tests/system/sortlist/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/spf/clean.sh b/bin/tests/system/spf/clean.sh
index 5a592c6e299..df9a329b846 100644
--- a/bin/tests/system/spf/clean.sh
+++ b/bin/tests/system/spf/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f ns1/named.run
 rm -f ns1/named.memstats
diff --git a/bin/tests/system/spf/ns1/named.conf.in b/bin/tests/system/spf/ns1/named.conf.in
index a66eed7131d..255da60e213 100644
--- a/bin/tests/system/spf/ns1/named.conf.in
+++ b/bin/tests/system/spf/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/spf/ns1/spf.db b/bin/tests/system/spf/ns1/spf.db
index aa008b4a18f..6c0e7e5512e 100644
--- a/bin/tests/system/spf/ns1/spf.db
+++ b/bin/tests/system/spf/ns1/spf.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 @ 0 IN SOA . . 0 0 0 0 0
 @ 0 IN NS .
diff --git a/bin/tests/system/spf/setup.sh b/bin/tests/system/spf/setup.sh
index 26bc0d83310..7e606316f42 100644
--- a/bin/tests/system/spf/setup.sh
+++ b/bin/tests/system/spf/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/spf/tests.sh b/bin/tests/system/spf/tests.sh
index 341f06c6bfb..f46f64361ec 100644
--- a/bin/tests/system/spf/tests.sh
+++ b/bin/tests/system/spf/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index b04b7e3a8e8..07b699c7024 100755
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2001, 2004-2008, 2010-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.
 
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove
diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh
index e77053fd1bc..bcdcdb753f7 100644
--- a/bin/tests/system/start.sh
+++ b/bin/tests/system/start.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: start.sh,v 1.42 2007/06/18 23:47:27 tbox Exp $
 
diff --git a/bin/tests/system/staticstub/clean.sh b/bin/tests/system/staticstub/clean.sh
index 5b6f640af46..52c25cd96e2 100755
--- a/bin/tests/system/staticstub/clean.sh
+++ b/bin/tests/system/staticstub/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 rm -f tmp
 rm -f dig.out.*
diff --git a/bin/tests/system/staticstub/conf/bad01.conf b/bin/tests/system/staticstub/conf/bad01.conf
index a3c4f295aa3..a81ffee58ac 100644
--- a/bin/tests/system/staticstub/conf/bad01.conf
+++ b/bin/tests/system/staticstub/conf/bad01.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad02.conf b/bin/tests/system/staticstub/conf/bad02.conf
index 327d6a19f48..3c7f503230e 100644
--- a/bin/tests/system/staticstub/conf/bad02.conf
+++ b/bin/tests/system/staticstub/conf/bad02.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad03.conf b/bin/tests/system/staticstub/conf/bad03.conf
index 1f6bf7f6394..1230575779d 100644
--- a/bin/tests/system/staticstub/conf/bad03.conf
+++ b/bin/tests/system/staticstub/conf/bad03.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad04.conf b/bin/tests/system/staticstub/conf/bad04.conf
index f7a0ab1fe7f..6d82f7c7005 100644
--- a/bin/tests/system/staticstub/conf/bad04.conf
+++ b/bin/tests/system/staticstub/conf/bad04.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad05.conf b/bin/tests/system/staticstub/conf/bad05.conf
index 930cce571a7..4446a459d2e 100644
--- a/bin/tests/system/staticstub/conf/bad05.conf
+++ b/bin/tests/system/staticstub/conf/bad05.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad06.conf b/bin/tests/system/staticstub/conf/bad06.conf
index 9d66e3d14b7..d2b0f2856bd 100644
--- a/bin/tests/system/staticstub/conf/bad06.conf
+++ b/bin/tests/system/staticstub/conf/bad06.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad07.conf b/bin/tests/system/staticstub/conf/bad07.conf
index 526b129fcec..c4b2da3844c 100644
--- a/bin/tests/system/staticstub/conf/bad07.conf
+++ b/bin/tests/system/staticstub/conf/bad07.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad08.conf b/bin/tests/system/staticstub/conf/bad08.conf
index 79dce405c61..77bff4d6828 100644
--- a/bin/tests/system/staticstub/conf/bad08.conf
+++ b/bin/tests/system/staticstub/conf/bad08.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad09.conf b/bin/tests/system/staticstub/conf/bad09.conf
index 3478f64d746..b7d03d13408 100644
--- a/bin/tests/system/staticstub/conf/bad09.conf
+++ b/bin/tests/system/staticstub/conf/bad09.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad10.conf b/bin/tests/system/staticstub/conf/bad10.conf
index 2763da05fc8..a9a2a478fb6 100644
--- a/bin/tests/system/staticstub/conf/bad10.conf
+++ b/bin/tests/system/staticstub/conf/bad10.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/bad11.conf b/bin/tests/system/staticstub/conf/bad11.conf
index ddb50897709..ead2b016923 100644
--- a/bin/tests/system/staticstub/conf/bad11.conf
+++ b/bin/tests/system/staticstub/conf/bad11.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/good01.conf b/bin/tests/system/staticstub/conf/good01.conf
index 2678f64c87f..438ae76bc12 100644
--- a/bin/tests/system/staticstub/conf/good01.conf
+++ b/bin/tests/system/staticstub/conf/good01.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/good02.conf b/bin/tests/system/staticstub/conf/good02.conf
index 5d0a241e888..5f8237e24f6 100644
--- a/bin/tests/system/staticstub/conf/good02.conf
+++ b/bin/tests/system/staticstub/conf/good02.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/good03.conf b/bin/tests/system/staticstub/conf/good03.conf
index 0e549162cca..b45ac2a28a9 100644
--- a/bin/tests/system/staticstub/conf/good03.conf
+++ b/bin/tests/system/staticstub/conf/good03.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/good04.conf b/bin/tests/system/staticstub/conf/good04.conf
index c393919934c..d4234822957 100644
--- a/bin/tests/system/staticstub/conf/good04.conf
+++ b/bin/tests/system/staticstub/conf/good04.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/conf/good05.conf b/bin/tests/system/staticstub/conf/good05.conf
index d2d3e41e643..b680940f8ad 100644
--- a/bin/tests/system/staticstub/conf/good05.conf
+++ b/bin/tests/system/staticstub/conf/good05.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 # Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
diff --git a/bin/tests/system/staticstub/ns1/named.conf.in b/bin/tests/system/staticstub/ns1/named.conf.in
index 290cfea3340..4f317551853 100644
--- a/bin/tests/system/staticstub/ns1/named.conf.in
+++ b/bin/tests/system/staticstub/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/staticstub/ns1/root.db b/bin/tests/system/staticstub/ns1/root.db
index 5ae01a87d2e..f79f87132e5 100644
--- a/bin/tests/system/staticstub/ns1/root.db
+++ b/bin/tests/system/staticstub/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.db,v 1.1 2010/12/17 00:57:38 marka Exp $
 
diff --git a/bin/tests/system/staticstub/ns2/named.conf.in b/bin/tests/system/staticstub/ns2/named.conf.in
index 21155b125bc..245c7c2a5b2 100644
--- a/bin/tests/system/staticstub/ns2/named.conf.in
+++ b/bin/tests/system/staticstub/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/staticstub/ns3/example.db.in b/bin/tests/system/staticstub/ns3/example.db.in
index 1c90b7dd128..be8046ce30d 100644
--- a/bin/tests/system/staticstub/ns3/example.db.in
+++ b/bin/tests/system/staticstub/ns3/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.1 2010/12/17 00:57:39 marka Exp $
 
diff --git a/bin/tests/system/staticstub/ns3/example.org.db b/bin/tests/system/staticstub/ns3/example.org.db
index 03ba16633aa..e97f8902eae 100644
--- a/bin/tests/system/staticstub/ns3/example.org.db
+++ b/bin/tests/system/staticstub/ns3/example.org.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.org.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in
index 8844f8ee574..b58219652e4 100644
--- a/bin/tests/system/staticstub/ns3/named.conf.in
+++ b/bin/tests/system/staticstub/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2013, 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.
  */
 
 key rndc_key {
diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh
index 79a67c39556..96cc5851517 100755
--- a/bin/tests/system/staticstub/ns3/sign.sh
+++ b/bin/tests/system/staticstub/ns3/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh 
 #
-# Copyright (C) 2010, 2012, 2014-2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/staticstub/ns3/undelegated.db.in b/bin/tests/system/staticstub/ns3/undelegated.db.in
index 3f9f1723a65..c85337dc41f 100644
--- a/bin/tests/system/staticstub/ns3/undelegated.db.in
+++ b/bin/tests/system/staticstub/ns3/undelegated.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300	; 5 minutes
 undelegated.		IN SOA	ns3.undelegated. hostmaster.undelegated. (
diff --git a/bin/tests/system/staticstub/ns4/example.com.db b/bin/tests/system/staticstub/ns4/example.com.db
index c7d37e2edf3..8e2899469a3 100644
--- a/bin/tests/system/staticstub/ns4/example.com.db
+++ b/bin/tests/system/staticstub/ns4/example.com.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.com.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
diff --git a/bin/tests/system/staticstub/ns4/example.info.db b/bin/tests/system/staticstub/ns4/example.info.db
index 5624b298214..7d2c2091984 100644
--- a/bin/tests/system/staticstub/ns4/example.info.db
+++ b/bin/tests/system/staticstub/ns4/example.info.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.info.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
diff --git a/bin/tests/system/staticstub/ns4/example.org.db b/bin/tests/system/staticstub/ns4/example.org.db
index 77494010929..2bf95444023 100644
--- a/bin/tests/system/staticstub/ns4/example.org.db
+++ b/bin/tests/system/staticstub/ns4/example.org.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.org.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
diff --git a/bin/tests/system/staticstub/ns4/named.conf.in b/bin/tests/system/staticstub/ns4/named.conf.in
index 363a7d09283..b3a82c9e99d 100644
--- a/bin/tests/system/staticstub/ns4/named.conf.in
+++ b/bin/tests/system/staticstub/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/staticstub/ns4/sign.sh b/bin/tests/system/staticstub/ns4/sign.sh
index 52b9e173fd5..dea784fcd21 100755
--- a/bin/tests/system/staticstub/ns4/sign.sh
+++ b/bin/tests/system/staticstub/ns4/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.3 2010/12/17 00:57:39 marka Exp $
 
diff --git a/bin/tests/system/staticstub/ns4/sub.example.db.in b/bin/tests/system/staticstub/ns4/sub.example.db.in
index ea0e256633c..255abd5702c 100644
--- a/bin/tests/system/staticstub/ns4/sub.example.db.in
+++ b/bin/tests/system/staticstub/ns4/sub.example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: sub.example.db.in,v 1.1 2010/12/17 00:57:39 marka Exp $
 
diff --git a/bin/tests/system/staticstub/prereq.sh b/bin/tests/system/staticstub/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100755
--- a/bin/tests/system/staticstub/prereq.sh
+++ b/bin/tests/system/staticstub/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index f03a76f50e2..2c9b0c523ca 100755
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index 2114a4bb9b9..e1217f02070 100755
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2013, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/statistics/ans4/ans.pl b/bin/tests/system/statistics/ans4/ans.pl
index 56e80332bd1..f8feafc91c3 100644
--- a/bin/tests/system/statistics/ans4/ans.pl
+++ b/bin/tests/system/statistics/ans4/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# 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.
 
 #
 # Ad hoc name server
diff --git a/bin/tests/system/statistics/clean.sh b/bin/tests/system/statistics/clean.sh
index 096c3cc8c8e..830c835b634 100644
--- a/bin/tests/system/statistics/clean.sh
+++ b/bin/tests/system/statistics/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/statistics/ns1/named.conf.in b/bin/tests/system/statistics/ns1/named.conf.in
index 6806d92a209..762b0fdf9d5 100644
--- a/bin/tests/system/statistics/ns1/named.conf.in
+++ b/bin/tests/system/statistics/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/statistics/ns1/root.db b/bin/tests/system/statistics/ns1/root.db
index a9698b2051c..d2aec1107ab 100644
--- a/bin/tests/system/statistics/ns1/root.db
+++ b/bin/tests/system/statistics/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/statistics/ns1/zone.db b/bin/tests/system/statistics/ns1/zone.db
index 6d628e35af4..868fffcd033 100644
--- a/bin/tests/system/statistics/ns1/zone.db
+++ b/bin/tests/system/statistics/ns1/zone.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 @		3600	IN SOA	ns.example. hostmaster.example. 1 3600 1200 604800 3600
 @		3600	IN NS	ns.example.
diff --git a/bin/tests/system/statistics/ns2/example.db b/bin/tests/system/statistics/ns2/example.db
index 59b17515317..ede1838609a 100644
--- a/bin/tests/system/statistics/ns2/example.db
+++ b/bin/tests/system/statistics/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: example.db,v 1.1.2.1 2012/01/06 22:40:47 smann Exp $
 
diff --git a/bin/tests/system/statistics/ns2/internal.db b/bin/tests/system/statistics/ns2/internal.db
index 88da9864c15..92c151a3baa 100644
--- a/bin/tests/system/statistics/ns2/internal.db
+++ b/bin/tests/system/statistics/ns2/internal.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: internal.db,v 1.1.2.1 2012/01/06 22:40:47 smann Exp $
 
diff --git a/bin/tests/system/statistics/ns2/named.conf.in b/bin/tests/system/statistics/ns2/named.conf.in
index 1be9209fd6f..c046fe9e827 100644
--- a/bin/tests/system/statistics/ns2/named.conf.in
+++ b/bin/tests/system/statistics/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/statistics/ns3/internal.db b/bin/tests/system/statistics/ns3/internal.db
index 2932eceb638..fd2ee7a99e1 100644
--- a/bin/tests/system/statistics/ns3/internal.db
+++ b/bin/tests/system/statistics/ns3/internal.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/statistics/ns3/named.conf.in b/bin/tests/system/statistics/ns3/named.conf.in
index f3901194cec..fe07cead950 100644
--- a/bin/tests/system/statistics/ns3/named.conf.in
+++ b/bin/tests/system/statistics/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 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.
  */
 
 options {
diff --git a/bin/tests/system/statistics/ns3/root.hint b/bin/tests/system/statistics/ns3/root.hint
index d129f4e5742..384156d05e9 100644
--- a/bin/tests/system/statistics/ns3/root.hint
+++ b/bin/tests/system/statistics/ns3/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/statistics/prereq.sh b/bin/tests/system/statistics/prereq.sh
index 7c3dacb567b..9bca4f871d3 100644
--- a/bin/tests/system/statistics/prereq.sh
+++ b/bin/tests/system/statistics/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
diff --git a/bin/tests/system/statistics/setup.sh b/bin/tests/system/statistics/setup.sh
index 08a9c49e8ca..c9f645b29ea 100644
--- a/bin/tests/system/statistics/setup.sh
+++ b/bin/tests/system/statistics/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh
index 2b063e259a6..ff514ae2a68 100644
--- a/bin/tests/system/statistics/tests.sh
+++ b/bin/tests/system/statistics/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/statschannel/clean.sh b/bin/tests/system/statschannel/clean.sh
index c6d0c008b2f..58eaaf86895 100644
--- a/bin/tests/system/statschannel/clean.sh
+++ b/bin/tests/system/statschannel/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f traffic traffic.out.*
 rm -f dig.out*
diff --git a/bin/tests/system/statschannel/fetch.pl b/bin/tests/system/statschannel/fetch.pl
index 33f3dce490b..e589c450234 100644
--- a/bin/tests/system/statschannel/fetch.pl
+++ b/bin/tests/system/statschannel/fetch.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015, 2016  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.
 
 # fetch.pl:
 # Simple script to fetch HTTP content from the statistics channel
diff --git a/bin/tests/system/statschannel/mem-xml.pl b/bin/tests/system/statschannel/mem-xml.pl
index 58953dd5bd5..430d185d734 100644
--- a/bin/tests/system/statschannel/mem-xml.pl
+++ b/bin/tests/system/statschannel/mem-xml.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  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.
 
 # server-xml.pl:
 # Parses the XML version of the server stats into a normalized format.
diff --git a/bin/tests/system/statschannel/ns2/example.db b/bin/tests/system/statschannel/ns2/example.db
index d845001ab67..b65651aa2dc 100644
--- a/bin/tests/system/statschannel/ns2/example.db
+++ b/bin/tests/system/statschannel/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/statschannel/ns2/named.conf.in b/bin/tests/system/statschannel/ns2/named.conf.in
index b581db97ee3..9030802f328 100644
--- a/bin/tests/system/statschannel/ns2/named.conf.in
+++ b/bin/tests/system/statschannel/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/statschannel/prereq.sh b/bin/tests/system/statschannel/prereq.sh
index b8c27c2d10c..ef052f55801 100644
--- a/bin/tests/system/statschannel/prereq.sh
+++ b/bin/tests/system/statschannel/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 fail=0
 
diff --git a/bin/tests/system/statschannel/server-json.pl b/bin/tests/system/statschannel/server-json.pl
index 0709b6aa157..cb1f4633b41 100644
--- a/bin/tests/system/statschannel/server-json.pl
+++ b/bin/tests/system/statschannel/server-json.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015-2017  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.
 
 # server-json.pl:
 # Parses the JSON version of the server stats into a normalized format.
diff --git a/bin/tests/system/statschannel/server-xml.pl b/bin/tests/system/statschannel/server-xml.pl
index 0640856c6d1..20030241011 100644
--- a/bin/tests/system/statschannel/server-xml.pl
+++ b/bin/tests/system/statschannel/server-xml.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015-2017  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.
 
 # server-xml.pl:
 # Parses the XML version of the server stats into a normalized format.
diff --git a/bin/tests/system/statschannel/setup.sh b/bin/tests/system/statschannel/setup.sh
index 9b759ab0b32..e7ad741204d 100644
--- a/bin/tests/system/statschannel/setup.sh
+++ b/bin/tests/system/statschannel/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index 499c317dfd4..a91b0c14480 100644
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/statschannel/traffic-json.pl b/bin/tests/system/statschannel/traffic-json.pl
index cd457294431..67b53c4e6a8 100644
--- a/bin/tests/system/statschannel/traffic-json.pl
+++ b/bin/tests/system/statschannel/traffic-json.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015-2017  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.
 
 # traffic-json.pl:
 # Parses the JSON version of the RSSAC002 traffic stats into a
diff --git a/bin/tests/system/statschannel/traffic-xml.pl b/bin/tests/system/statschannel/traffic-xml.pl
index 4458a345877..a866c64540e 100644
--- a/bin/tests/system/statschannel/traffic-xml.pl
+++ b/bin/tests/system/statschannel/traffic-xml.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015-2017  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.
 
 # traffic-xml.pl:
 # Parses the XML version of the RSSAC002 traffic stats into a
diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 1be327092ef..aa04f3af983 100644
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2001, 2004-2007, 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.
 
 # Framework for stopping test servers
 # Based on the type of server specified, signal the server to stop, wait
diff --git a/bin/tests/system/stop.sh b/bin/tests/system/stop.sh
index 4c34db572f8..d41dffa199d 100644
--- a/bin/tests/system/stop.sh
+++ b/bin/tests/system/stop.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: stop.sh,v 1.25 2007/06/18 23:47:27 tbox Exp $
 
diff --git a/bin/tests/system/stress/clean.sh b/bin/tests/system/stress/clean.sh
index b6fc7dfc787..97167373086 100644
--- a/bin/tests/system/stress/clean.sh
+++ b/bin/tests/system/stress/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016  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.
 
 # $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
 
diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf
index a5f0391242b..c48bed10e72 100644
--- a/bin/tests/system/stress/ns1/named.conf
+++ b/bin/tests/system/stress/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: named.conf,v 1.6 2007/06/19 23:47:05 tbox Exp $ */
diff --git a/bin/tests/system/stress/ns2/named.conf b/bin/tests/system/stress/ns2/named.conf
index a0f68f268b0..fce8c9f216e 100644
--- a/bin/tests/system/stress/ns2/named.conf
+++ b/bin/tests/system/stress/ns2/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: named.conf,v 1.7 2007/06/19 23:47:05 tbox Exp $ */
diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf
index 152a046bd3d..796a594c6be 100644
--- a/bin/tests/system/stress/ns3/named.conf
+++ b/bin/tests/system/stress/ns3/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2017  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.
  */
 
 /* $Id: named.conf,v 1.8 2007/06/18 23:47:30 tbox Exp $ */
diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf
index 28d70f222d2..e5f010bdfaf 100644
--- a/bin/tests/system/stress/ns4/named.conf
+++ b/bin/tests/system/stress/ns4/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  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.
  */
 
 /* $Id: named.conf,v 1.8 2007/06/18 23:47:31 tbox Exp $ */
diff --git a/bin/tests/system/stress/prereq.sh b/bin/tests/system/stress/prereq.sh
index 287bb182785..de147a4c2af 100644
--- a/bin/tests/system/stress/prereq.sh
+++ b/bin/tests/system/stress/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/stress/setup.pl b/bin/tests/system/stress/setup.pl
index 27d96fb5429..4da9753c02d 100644
--- a/bin/tests/system/stress/setup.pl
+++ b/bin/tests/system/stress/setup.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: setup.pl,v 1.6 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh
index 17265ed868c..7a96f76173a 100644
--- a/bin/tests/system/stress/setup.sh
+++ b/bin/tests/system/stress/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: setup.sh,v 1.5 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh
index 84a76366a41..53c3d20db63 100644
--- a/bin/tests/system/stress/tests.sh
+++ b/bin/tests/system/stress/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/stress/update.pl b/bin/tests/system/stress/update.pl
index e7a70848c22..de01d4a04b2 100644
--- a/bin/tests/system/stress/update.pl
+++ b/bin/tests/system/stress/update.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 #
 # Dynamic update test suite.
diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh
index 2bbf3f5ef10..d5698ef8c06 100644
--- a/bin/tests/system/stub/clean.sh
+++ b/bin/tests/system/stub/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 #
 # Clean up after stub tests.
diff --git a/bin/tests/system/stub/ns1/named.conf.in b/bin/tests/system/stub/ns1/named.conf.in
index 5b363723386..b4ad1523fad 100644
--- a/bin/tests/system/stub/ns1/named.conf.in
+++ b/bin/tests/system/stub/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/stub/ns1/root.db b/bin/tests/system/stub/ns1/root.db
index 19ded07ed9b..fc360a2a8e7 100644
--- a/bin/tests/system/stub/ns1/root.db
+++ b/bin/tests/system/stub/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.9 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/stub/ns2/child.example.db b/bin/tests/system/stub/ns2/child.example.db
index 458762f9fae..01e446ef62a 100644
--- a/bin/tests/system/stub/ns2/child.example.db
+++ b/bin/tests/system/stub/ns2/child.example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: child.example.db,v 1.9 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/stub/ns2/named.conf.in b/bin/tests/system/stub/ns2/named.conf.in
index 9f58aa376be..37e38c57356 100644
--- a/bin/tests/system/stub/ns2/named.conf.in
+++ b/bin/tests/system/stub/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/stub/ns3/example.db b/bin/tests/system/stub/ns3/example.db
index 2fa235c071d..3dbc25d37a7 100644
--- a/bin/tests/system/stub/ns3/example.db
+++ b/bin/tests/system/stub/ns3/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example.db,v 1.9 2007/06/19 23:47:05 tbox Exp $
 
diff --git a/bin/tests/system/stub/ns3/named.conf.in b/bin/tests/system/stub/ns3/named.conf.in
index e97c9ecad2e..4916fab3364 100644
--- a/bin/tests/system/stub/ns3/named.conf.in
+++ b/bin/tests/system/stub/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/stub/setup.sh b/bin/tests/system/stub/setup.sh
index 0ad5ea679bb..9b9aa029a15 100644
--- a/bin/tests/system/stub/setup.sh
+++ b/bin/tests/system/stub/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index e95408388e1..fda4631ba1d 100644
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/synthfromdnssec/clean.sh b/bin/tests/system/synthfromdnssec/clean.sh
index 7be2b7fd164..d56a5315453 100644
--- a/bin/tests/system/synthfromdnssec/clean.sh
+++ b/bin/tests/system/synthfromdnssec/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f */named.memstats
 rm -f */named.conf
diff --git a/bin/tests/system/synthfromdnssec/ns1/example.db.in b/bin/tests/system/synthfromdnssec/ns1/example.db.in
index d4c04d43c3c..87069cb82a0 100644
--- a/bin/tests/system/synthfromdnssec/ns1/example.db.in
+++ b/bin/tests/system/synthfromdnssec/ns1/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 3600
 @		SOA	ns1 hostmaster 1 3600 1200 604800 3600
diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.in b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
index 6649f0fb097..6b7c575f1e2 100644
--- a/bin/tests/system/synthfromdnssec/ns1/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS1
diff --git a/bin/tests/system/synthfromdnssec/ns1/root.db.in b/bin/tests/system/synthfromdnssec/ns1/root.db.in
index d04c525b3b0..8c05adf6a8c 100644
--- a/bin/tests/system/synthfromdnssec/ns1/root.db.in
+++ b/bin/tests/system/synthfromdnssec/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 3600
 @		SOA	ns1 hostmaster 1 3600 1200 604800 3600
diff --git a/bin/tests/system/synthfromdnssec/ns1/sign.sh b/bin/tests/system/synthfromdnssec/ns1/sign.sh
index 4a4b8057e5c..f400552a0be 100644
--- a/bin/tests/system/synthfromdnssec/ns1/sign.sh
+++ b/bin/tests/system/synthfromdnssec/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.in b/bin/tests/system/synthfromdnssec/ns2/named.conf.in
index 91ed5f50c8d..601603e3fa3 100644
--- a/bin/tests/system/synthfromdnssec/ns2/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS2
diff --git a/bin/tests/system/synthfromdnssec/ns2/root.hints b/bin/tests/system/synthfromdnssec/ns2/root.hints
index 42f5ffda450..63fc22d0e1d 100644
--- a/bin/tests/system/synthfromdnssec/ns2/root.hints
+++ b/bin/tests/system/synthfromdnssec/ns2/root.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 .	NS	ns1
 ns1	A	10.53.0.1
diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.in b/bin/tests/system/synthfromdnssec/ns3/named.conf.in
index 80d8f701bdd..8d7650628a7 100644
--- a/bin/tests/system/synthfromdnssec/ns3/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS3
diff --git a/bin/tests/system/synthfromdnssec/ns3/redirect.db b/bin/tests/system/synthfromdnssec/ns3/redirect.db
index 130ddab1dac..4159dbe2e92 100644
--- a/bin/tests/system/synthfromdnssec/ns3/redirect.db
+++ b/bin/tests/system/synthfromdnssec/ns3/redirect.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 ; $Id: redirect.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
diff --git a/bin/tests/system/synthfromdnssec/ns3/root.hints b/bin/tests/system/synthfromdnssec/ns3/root.hints
index 42f5ffda450..63fc22d0e1d 100644
--- a/bin/tests/system/synthfromdnssec/ns3/root.hints
+++ b/bin/tests/system/synthfromdnssec/ns3/root.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 .	NS	ns1
 ns1	A	10.53.0.1
diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.in b/bin/tests/system/synthfromdnssec/ns4/named.conf.in
index 38aef729764..9189e584938 100644
--- a/bin/tests/system/synthfromdnssec/ns4/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS4
diff --git a/bin/tests/system/synthfromdnssec/ns4/root.hints b/bin/tests/system/synthfromdnssec/ns4/root.hints
index 42f5ffda450..63fc22d0e1d 100644
--- a/bin/tests/system/synthfromdnssec/ns4/root.hints
+++ b/bin/tests/system/synthfromdnssec/ns4/root.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 .	NS	ns1
 ns1	A	10.53.0.1
diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.in b/bin/tests/system/synthfromdnssec/ns5/named.conf.in
index 691c1f549c0..9cbf91c03f1 100644
--- a/bin/tests/system/synthfromdnssec/ns5/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 // NS5
diff --git a/bin/tests/system/synthfromdnssec/ns5/root.hints b/bin/tests/system/synthfromdnssec/ns5/root.hints
index 42f5ffda450..63fc22d0e1d 100644
--- a/bin/tests/system/synthfromdnssec/ns5/root.hints
+++ b/bin/tests/system/synthfromdnssec/ns5/root.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 .	NS	ns1
 ns1	A	10.53.0.1
diff --git a/bin/tests/system/synthfromdnssec/prereq.sh b/bin/tests/system/synthfromdnssec/prereq.sh
index 0de9fa3a872..a0d4e9ce14a 100644
--- a/bin/tests/system/synthfromdnssec/prereq.sh
+++ b/bin/tests/system/synthfromdnssec/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/synthfromdnssec/setup.sh b/bin/tests/system/synthfromdnssec/setup.sh
index c93f3948ef2..9dea6478fea 100644
--- a/bin/tests/system/synthfromdnssec/setup.sh
+++ b/bin/tests/system/synthfromdnssec/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/synthfromdnssec/tests.sh b/bin/tests/system/synthfromdnssec/tests.sh
index 31084dc6f4d..3ba4c43f5c6 100644
--- a/bin/tests/system/synthfromdnssec/tests.sh
+++ b/bin/tests/system/synthfromdnssec/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tcp/clean.sh b/bin/tests/system/tcp/clean.sh
index 52151acaa5f..5fb4f9be1a3 100644
--- a/bin/tests/system/tcp/clean.sh
+++ b/bin/tests/system/tcp/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 rm -f */named.memstats
 rm -f */named.run
diff --git a/bin/tests/system/tcp/ns1/named.conf.in b/bin/tests/system/tcp/ns1/named.conf.in
index ca654e8806d..b188783a055 100644
--- a/bin/tests/system/tcp/ns1/named.conf.in
+++ b/bin/tests/system/tcp/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/tcp/ns1/root.db b/bin/tests/system/tcp/ns1/root.db
index 234b91bc789..dab5cea7f77 100644
--- a/bin/tests/system/tcp/ns1/root.db
+++ b/bin/tests/system/tcp/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/tcp/ns2/example.db b/bin/tests/system/tcp/ns2/example.db
index 9ff721c5c1c..4a3f33fb987 100644
--- a/bin/tests/system/tcp/ns2/example.db
+++ b/bin/tests/system/tcp/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/tcp/ns2/named.conf.in b/bin/tests/system/tcp/ns2/named.conf.in
index b6b1c6348be..684b881050f 100644
--- a/bin/tests/system/tcp/ns2/named.conf.in
+++ b/bin/tests/system/tcp/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/tcp/ns3/named.conf.in b/bin/tests/system/tcp/ns3/named.conf.in
index 764f759670e..282bb2cdfbd 100644
--- a/bin/tests/system/tcp/ns3/named.conf.in
+++ b/bin/tests/system/tcp/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/tcp/ns4/named.conf.in b/bin/tests/system/tcp/ns4/named.conf.in
index b810eca4f1c..e6c7c229584 100644
--- a/bin/tests/system/tcp/ns4/named.conf.in
+++ b/bin/tests/system/tcp/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/tcp/setup.sh b/bin/tests/system/tcp/setup.sh
index 5c3440e70bd..4563f04145d 100644
--- a/bin/tests/system/tcp/setup.sh
+++ b/bin/tests/system/tcp/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh
index 09e18244243..89916d78013 100644
--- a/bin/tests/system/tcp/tests.sh
+++ b/bin/tests/system/tcp/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/testcrypto.sh b/bin/tests/system/testcrypto.sh
index 5c5b7c640e3..4716cdff40e 100644
--- a/bin/tests/system/testcrypto.sh
+++ b/bin/tests/system/testcrypto.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=${SYSTEMTESTTOP:=..}
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index a495f2ab4e5..9f192d05be7 100644
--- a/bin/tests/system/testsock.pl
+++ b/bin/tests/system/testsock.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2010-2013, 2016  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.
 
 # $Id: testsock.pl,v 1.20 2011/03/01 23:48:05 tbox Exp $
 
diff --git a/bin/tests/system/testsock6.pl b/bin/tests/system/testsock6.pl
index 275e4613311..e06486e8dfe 100644
--- a/bin/tests/system/testsock6.pl
+++ b/bin/tests/system/testsock6.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 # $Id: testsock6.pl,v 1.5 2010/06/22 23:46:52 tbox Exp $
 
diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index 3615ee3d405..705b2cfdb89 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 
 # Creates the system tests output file from the various test.output files.  It
 # then searches that file and prints the number of tests passed, failed, not
diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index 92edb1f612b..8a5dc7e0860 100644
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2002, 2004, 2007, 2009, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh
index 5e8630d5bff..a8ea8cf4758 100644
--- a/bin/tests/system/tkey/clean.sh
+++ b/bin/tests/system/tkey/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011-2016  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.
 
 rm -f dig.out.* rndc.out.* ns1/named.conf
 rm -f K* ns1/K*
diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index fcd6c45d460..8149269c61d 100644
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2009, 2011, 2012, 2014-2017  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.
  */
 
 /* $Id: keycreate.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index d4835099e33..376d31d0276 100644
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2009-2011, 2014-2017  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.
  */
 
 /* $Id: keydelete.c,v 1.18 2011/01/11 23:47:13 tbox Exp $ */
diff --git a/bin/tests/system/tkey/ns1/example.db b/bin/tests/system/tkey/ns1/example.db
index a5be3a9ddc2..7771d2881bd 100644
--- a/bin/tests/system/tkey/ns1/example.db
+++ b/bin/tests/system/tkey/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 1D
 
diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in
index 133488b8071..5155be40975 100644
--- a/bin/tests/system/tkey/ns1/named.conf.in
+++ b/bin/tests/system/tkey/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2009, 2011, 2013, 2014, 2016, 2017  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.
  */
 
 controls { /* empty */ };
diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh
index c034f53e339..c1e2ff3e312 100644
--- a/bin/tests/system/tkey/ns1/setup.sh
+++ b/bin/tests/system/tkey/ns1/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tkey/prereq.sh b/bin/tests/system/tkey/prereq.sh
index 79a5c98e29e..a0d4e9ce14a 100644
--- a/bin/tests/system/tkey/prereq.sh
+++ b/bin/tests/system/tkey/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2006, 2007, 2009, 2012, 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh
index 20c541f3c8c..96c9881b4da 100644
--- a/bin/tests/system/tkey/setup.sh
+++ b/bin/tests/system/tkey/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2009, 2012-2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
index 2601d7d39cf..53d3ef00228 100644
--- a/bin/tests/system/tkey/tests.sh
+++ b/bin/tests/system/tkey/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2009, 2011-2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tools/clean.sh b/bin/tests/system/tools/clean.sh
index 248b2a2b9fa..002423511c1 100644
--- a/bin/tests/system/tools/clean.sh
+++ b/bin/tests/system/tools/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  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.
 
 rm -f NSEC3
 rm -f nsec3hash
diff --git a/bin/tests/system/tools/tests.sh b/bin/tests/system/tools/tests.sh
index 303aef46a71..9de91de8913 100644
--- a/bin/tests/system/tools/tests.sh
+++ b/bin/tests/system/tools/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh
index dfa712bf821..5fdbb7d8483 100644
--- a/bin/tests/system/tsig/clean.sh
+++ b/bin/tests/system/tsig/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2005-2007, 2012, 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.
 
 #
 # Clean up after tsig tests.
diff --git a/bin/tests/system/tsig/ns1/example.db b/bin/tests/system/tsig/ns1/example.db
index 0afe28602f7..cd90f08115c 100644
--- a/bin/tests/system/tsig/ns1/example.db
+++ b/bin/tests/system/tsig/ns1/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2005-2007, 2009, 2012, 2016  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.
 
 ; $Id: example.db,v 1.7 2009/01/21 23:47:27 tbox Exp $
 
diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in
index 8d61a31a094..fbf30c6dc4e 100644
--- a/bin/tests/system/tsig/ns1/named.conf.in
+++ b/bin/tests/system/tsig/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005-2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
index bb36429ee0a..f0665fba819 100644
--- a/bin/tests/system/tsig/setup.sh
+++ b/bin/tests/system/tsig/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
index 9583cd9cf12..2a27b50b089 100644
--- a/bin/tests/system/tsig/tests.sh
+++ b/bin/tests/system/tsig/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2005-2007, 2011, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tsiggss/authsock.pl b/bin/tests/system/tsiggss/authsock.pl
index 88140fe0f54..57a72b2a3d3 100644
--- a/bin/tests/system/tsiggss/authsock.pl
+++ b/bin/tests/system/tsiggss/authsock.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2011, 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.
 
 # test the update-policy external protocol
 
diff --git a/bin/tests/system/tsiggss/clean.sh b/bin/tests/system/tsiggss/clean.sh
index 5f7684d6300..c97ade76514 100644
--- a/bin/tests/system/tsiggss/clean.sh
+++ b/bin/tests/system/tsiggss/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2011, 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.
 
 #
 # Clean up after tsiggss tests.
diff --git a/bin/tests/system/tsiggss/ns1/named.conf.in b/bin/tests/system/tsiggss/ns1/named.conf.in
index c313a711785..583cb379d91 100644
--- a/bin/tests/system/tsiggss/ns1/named.conf.in
+++ b/bin/tests/system/tsiggss/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/tsiggss/prereq.sh b/bin/tests/system/tsiggss/prereq.sh
index 34c3bc9c671..8fbe01673ac 100644
--- a/bin/tests/system/tsiggss/prereq.sh
+++ b/bin/tests/system/tsiggss/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
index c6b0b6a0cff..fc3164f0c21 100644
--- a/bin/tests/system/tsiggss/setup.sh
+++ b/bin/tests/system/tsiggss/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh
index a4aa7cd9138..b489d7b1624 100644
--- a/bin/tests/system/tsiggss/tests.sh
+++ b/bin/tests/system/tsiggss/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2011, 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.
 
 # tests for TSIG-GSS updates
 
diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh
index b72be418c68..8d734fae667 100644
--- a/bin/tests/system/unknown/clean.sh
+++ b/bin/tests/system/unknown/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 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.
 
 rm -f dig.out check.out
 rm -f */named.memstats
diff --git a/bin/tests/system/unknown/ns1/broken1.db b/bin/tests/system/unknown/ns1/broken1.db
index 2c266a0eb0a..e2e723905f1 100644
--- a/bin/tests/system/unknown/ns1/broken1.db
+++ b/bin/tests/system/unknown/ns1/broken1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: broken1.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/broken2.db b/bin/tests/system/unknown/ns1/broken2.db
index 998aa423818..6025af37d04 100644
--- a/bin/tests/system/unknown/ns1/broken2.db
+++ b/bin/tests/system/unknown/ns1/broken2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: broken2.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/broken3.db b/bin/tests/system/unknown/ns1/broken3.db
index dde9942dfa0..cd787786aa8 100644
--- a/bin/tests/system/unknown/ns1/broken3.db
+++ b/bin/tests/system/unknown/ns1/broken3.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: broken3.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/broken4.db b/bin/tests/system/unknown/ns1/broken4.db
index 7b867267f4a..acb0bb13fb3 100644
--- a/bin/tests/system/unknown/ns1/broken4.db
+++ b/bin/tests/system/unknown/ns1/broken4.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: broken4.db,v 1.6 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/broken5.db b/bin/tests/system/unknown/ns1/broken5.db
index 91c88f4f207..aa8870de9d4 100644
--- a/bin/tests/system/unknown/ns1/broken5.db
+++ b/bin/tests/system/unknown/ns1/broken5.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: broken5.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/class10.hints b/bin/tests/system/unknown/ns1/class10.hints
index 71346505ebe..054b488f463 100644
--- a/bin/tests/system/unknown/ns1/class10.hints
+++ b/bin/tests/system/unknown/ns1/class10.hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: class10.hints,v 1.5 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/example-class10.db b/bin/tests/system/unknown/ns1/example-class10.db
index edb4d1417c2..0560f0843e1 100644
--- a/bin/tests/system/unknown/ns1/example-class10.db
+++ b/bin/tests/system/unknown/ns1/example-class10.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example-class10.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/example-in.db b/bin/tests/system/unknown/ns1/example-in.db
index 9c67769d2b9..e8bfca622f2 100644
--- a/bin/tests/system/unknown/ns1/example-in.db
+++ b/bin/tests/system/unknown/ns1/example-in.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2016  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.
 
 ; $Id: example-in.db,v 1.9 2011/11/02 23:46:24 tbox Exp $
 
diff --git a/bin/tests/system/unknown/ns1/large.db b/bin/tests/system/unknown/ns1/large.db
index 43384be2558..c689cbdac39 100644
--- a/bin/tests/system/unknown/ns1/large.db
+++ b/bin/tests/system/unknown/ns1/large.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/unknown/ns1/named.conf.in b/bin/tests/system/unknown/ns1/named.conf.in
index 1729878ecfe..e92b9c4eff2 100644
--- a/bin/tests/system/unknown/ns1/named.conf.in
+++ b/bin/tests/system/unknown/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/unknown/ns2/named.conf.in b/bin/tests/system/unknown/ns2/named.conf.in
index 8c069759809..2571626bd7d 100644
--- a/bin/tests/system/unknown/ns2/named.conf.in
+++ b/bin/tests/system/unknown/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/unknown/ns3/named.conf.in b/bin/tests/system/unknown/ns3/named.conf.in
index a0ee08ae936..2ccb07421ed 100644
--- a/bin/tests/system/unknown/ns3/named.conf.in
+++ b/bin/tests/system/unknown/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/unknown/ns3/sign.sh b/bin/tests/system/unknown/ns3/sign.sh
index f0c827ad107..8227d32e43f 100644
--- a/bin/tests/system/unknown/ns3/sign.sh
+++ b/bin/tests/system/unknown/ns3/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016, 2017  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.
 
 # $Id: sign.sh,v 1.8 2012/02/23 06:53:15 marka Exp $
 
diff --git a/bin/tests/system/unknown/prereq.sh b/bin/tests/system/unknown/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/unknown/prereq.sh
+++ b/bin/tests/system/unknown/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index b9a4bf11a15..d8f85c17bd2 100644
--- a/bin/tests/system/unknown/setup.sh
+++ b/bin/tests/system/unknown/setup.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index eae0f4a8442..7fbec3f71e5 100644
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/unknown/zones/nan.bad b/bin/tests/system/unknown/zones/nan.bad
index afe4aa543d1..39efac784f2 100644
--- a/bin/tests/system/unknown/zones/nan.bad
+++ b/bin/tests/system/unknown/zones/nan.bad
@@ -1,7 +1,10 @@
-; Copyright (C) 2013, 2016  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.
 
 @ 0 IN TYPE353 \# cat 010101010101010101
diff --git a/bin/tests/system/upforwd/ans4/ans.pl b/bin/tests/system/upforwd/ans4/ans.pl
index 0a99d070276..e98c2cfccf0 100644
--- a/bin/tests/system/upforwd/ans4/ans.pl
+++ b/bin/tests/system/upforwd/ans4/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 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.
 
 #
 # This is the name server from hell.  It provides canned
diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index aa37c06e7a0..d6222042eb6 100644
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 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.
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/upforwd/ns1/example1.db b/bin/tests/system/upforwd/ns1/example1.db
index 93df626cdc2..ca885c586ac 100644
--- a/bin/tests/system/upforwd/ns1/example1.db
+++ b/bin/tests/system/upforwd/ns1/example1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example1.db,v 1.4 2007/06/19 23:47:06 tbox Exp $
 
diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in
index e5fcd351339..ea42b4d4735 100644
--- a/bin/tests/system/upforwd/ns1/named.conf.in
+++ b/bin/tests/system/upforwd/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 key "update.example." {
diff --git a/bin/tests/system/upforwd/ns2/named.conf.in b/bin/tests/system/upforwd/ns2/named.conf.in
index 5b76142b16b..bce4809b595 100644
--- a/bin/tests/system/upforwd/ns2/named.conf.in
+++ b/bin/tests/system/upforwd/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/upforwd/ns3/named.conf.in b/bin/tests/system/upforwd/ns3/named.conf.in
index 6ef38248ead..e440a1f0d29 100644
--- a/bin/tests/system/upforwd/ns3/named.conf.in
+++ b/bin/tests/system/upforwd/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/upforwd/ns3/nomaster.db b/bin/tests/system/upforwd/ns3/nomaster.db
index 5370216a620..407c18296a4 100644
--- a/bin/tests/system/upforwd/ns3/nomaster.db
+++ b/bin/tests/system/upforwd/ns3/nomaster.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: nomaster.db,v 1.3 2011/08/31 23:46:44 tbox Exp $
 
diff --git a/bin/tests/system/upforwd/prereq.sh b/bin/tests/system/upforwd/prereq.sh
index d0d27a8b096..affe54bfcfc 100644
--- a/bin/tests/system/upforwd/prereq.sh
+++ b/bin/tests/system/upforwd/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index c33ebceffae..93e394930f4 100644
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index e112f913e9f..aec19ce92f5 100644
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-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.
 
 # ns1 = stealth master
 # ns2 = slave with update forwarding disabled; not currently used
diff --git a/bin/tests/system/verify/clean.sh b/bin/tests/system/verify/clean.sh
index 661c2246f04..7479b86edae 100644
--- a/bin/tests/system/verify/clean.sh
+++ b/bin/tests/system/verify/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2012, 2014, 2016  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.
 
 rm -f zones/*.good
 rm -f zones/*.good.tmp
diff --git a/bin/tests/system/verify/prereq.sh b/bin/tests/system/verify/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/verify/prereq.sh
+++ b/bin/tests/system/verify/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/verify/setup.sh b/bin/tests/system/verify/setup.sh
index 0b825ce7750..af4b6026ad6 100644
--- a/bin/tests/system/verify/setup.sh
+++ b/bin/tests/system/verify/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016, 2017  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/verify/tests.sh b/bin/tests/system/verify/tests.sh
index a677ba88a50..5815f8d5ace 100644
--- a/bin/tests/system/verify/tests.sh
+++ b/bin/tests/system/verify/tests.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh
index 5c8cd16ce27..b616a42ac7f 100644
--- a/bin/tests/system/verify/zones/genzones.sh
+++ b/bin/tests/system/verify/zones/genzones.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2012-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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/verify/zones/unsigned.db b/bin/tests/system/verify/zones/unsigned.db
index 109e13868cb..0fa22ecffab 100644
--- a/bin/tests/system/verify/zones/unsigned.db
+++ b/bin/tests/system/verify/zones/unsigned.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index 5af2a3e5cc0..3fbb4b0b4ef 100644
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2005, 2007, 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.
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/views/ns1/named.conf.in b/bin/tests/system/views/ns1/named.conf.in
index b098ff58af5..b4a2fa8c05f 100644
--- a/bin/tests/system/views/ns1/named.conf.in
+++ b/bin/tests/system/views/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/views/ns1/root.db b/bin/tests/system/views/ns1/root.db
index 79282fa48ad..38a04b55627 100644
--- a/bin/tests/system/views/ns1/root.db
+++ b/bin/tests/system/views/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/views/ns2/1.10.in-addr.arpa.db b/bin/tests/system/views/ns2/1.10.in-addr.arpa.db
index 65c1e10b96d..ffe6d0d105f 100644
--- a/bin/tests/system/views/ns2/1.10.in-addr.arpa.db
+++ b/bin/tests/system/views/ns2/1.10.in-addr.arpa.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 @	IN	SOA	. . 0 0 0 0 0
 @	IN	NS 	.
diff --git a/bin/tests/system/views/ns2/clone.db b/bin/tests/system/views/ns2/clone.db
index 76d7003b187..52bedaab3a2 100644
--- a/bin/tests/system/views/ns2/clone.db
+++ b/bin/tests/system/views/ns2/clone.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL	600
 @		IN SOA	mname1. . (
diff --git a/bin/tests/system/views/ns2/example1.db b/bin/tests/system/views/ns2/example1.db
index 0cc8b4b1350..9a3a25cdca2 100644
--- a/bin/tests/system/views/ns2/example1.db
+++ b/bin/tests/system/views/ns2/example1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example1.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/views/ns2/example2.db b/bin/tests/system/views/ns2/example2.db
index d4a1bcbdc22..939eb3dce5b 100644
--- a/bin/tests/system/views/ns2/example2.db
+++ b/bin/tests/system/views/ns2/example2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: example2.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/views/ns2/external/inline.db b/bin/tests/system/views/ns2/external/inline.db
index af54bd65234..e41e68c3df2 100644
--- a/bin/tests/system/views/ns2/external/inline.db
+++ b/bin/tests/system/views/ns2/external/inline.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300	; 5 minutes
 inline.			IN SOA	mname1. . (
diff --git a/bin/tests/system/views/ns2/internal.db b/bin/tests/system/views/ns2/internal.db
index 5c7c8e89b1d..fc09d024090 100644
--- a/bin/tests/system/views/ns2/internal.db
+++ b/bin/tests/system/views/ns2/internal.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: internal.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/views/ns2/internal/inline.db b/bin/tests/system/views/ns2/internal/inline.db
index 7b0dcf81c4b..8da79408935 100644
--- a/bin/tests/system/views/ns2/internal/inline.db
+++ b/bin/tests/system/views/ns2/internal/inline.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2014, 2016  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.
 
 $TTL 300	; 5 minutes
 inline.			IN SOA	mname1. . (
diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index 3c80e5513bf..b91f95b043c 100644
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in
index e79ee0a5628..b9456e0b484 100644
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/views/ns3/child.clone.db b/bin/tests/system/views/ns3/child.clone.db
index 2229f219728..9ea8d121e92 100644
--- a/bin/tests/system/views/ns3/child.clone.db
+++ b/bin/tests/system/views/ns3/child.clone.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/views/ns3/internal.db b/bin/tests/system/views/ns3/internal.db
index 7b1db679cd0..c6b3ef0ffec 100644
--- a/bin/tests/system/views/ns3/internal.db
+++ b/bin/tests/system/views/ns3/internal.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: internal.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in
index 0e6d60aea3c..617df48b483 100644
--- a/bin/tests/system/views/ns3/named1.conf.in
+++ b/bin/tests/system/views/ns3/named1.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in
index 7904fc6f2f2..f72255c29a9 100644
--- a/bin/tests/system/views/ns3/named2.conf.in
+++ b/bin/tests/system/views/ns3/named2.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/views/ns5/child.clone.db b/bin/tests/system/views/ns5/child.clone.db
index 053f382261f..8dd4ec13ee6 100644
--- a/bin/tests/system/views/ns5/child.clone.db
+++ b/bin/tests/system/views/ns5/child.clone.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.in
index 006ec33a2eb..d30998787aa 100644
--- a/bin/tests/system/views/ns5/named.conf.in
+++ b/bin/tests/system/views/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index 13fdc86a9e2..38804205b66 100644
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 4ab29cd5caf..6978fba5cbb 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/wildcard/clean.sh b/bin/tests/system/wildcard/clean.sh
index 5a3329f29e5..8f99328904d 100644
--- a/bin/tests/system/wildcard/clean.sh
+++ b/bin/tests/system/wildcard/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-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.
 
 rm -f ns*/named.run
 rm -f ns*/named.conf
diff --git a/bin/tests/system/wildcard/ns1/dlv.db.in b/bin/tests/system/wildcard/ns1/dlv.db.in
index 920de3b32f5..f794f1a636a 100644
--- a/bin/tests/system/wildcard/ns1/dlv.db.in
+++ b/bin/tests/system/wildcard/ns1/dlv.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/wildcard/ns1/named.conf.in b/bin/tests/system/wildcard/ns1/named.conf.in
index c7d5b3fd442..e02ee67d2a1 100644
--- a/bin/tests/system/wildcard/ns1/named.conf.in
+++ b/bin/tests/system/wildcard/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 options {
diff --git a/bin/tests/system/wildcard/ns1/nsec.db.in b/bin/tests/system/wildcard/ns1/nsec.db.in
index 310c9671846..7ebfbc2d8f1 100644
--- a/bin/tests/system/wildcard/ns1/nsec.db.in
+++ b/bin/tests/system/wildcard/ns1/nsec.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/wildcard/ns1/nsec3.db.in b/bin/tests/system/wildcard/ns1/nsec3.db.in
index 310c9671846..7ebfbc2d8f1 100644
--- a/bin/tests/system/wildcard/ns1/nsec3.db.in
+++ b/bin/tests/system/wildcard/ns1/nsec3.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/wildcard/ns1/private.nsec.db.in b/bin/tests/system/wildcard/ns1/private.nsec.db.in
index 2aaabaa0f7e..5362c0ad1b0 100644
--- a/bin/tests/system/wildcard/ns1/private.nsec.db.in
+++ b/bin/tests/system/wildcard/ns1/private.nsec.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/wildcard/ns1/private.nsec3.db.in b/bin/tests/system/wildcard/ns1/private.nsec3.db.in
index 9224e16b3fc..2e42acb5242 100644
--- a/bin/tests/system/wildcard/ns1/private.nsec3.db.in
+++ b/bin/tests/system/wildcard/ns1/private.nsec3.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/wildcard/ns1/root.db.in b/bin/tests/system/wildcard/ns1/root.db.in
index 2d3e74913bd..62565c81f69 100644
--- a/bin/tests/system/wildcard/ns1/root.db.in
+++ b/bin/tests/system/wildcard/ns1/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2013, 2016  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.
 
 ; $Id$
 
diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh
index 819845df6af..2700aa64f30 100755
--- a/bin/tests/system/wildcard/ns1/sign.sh
+++ b/bin/tests/system/wildcard/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-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.
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/wildcard/ns2/hints b/bin/tests/system/wildcard/ns2/hints
index dc56df61d97..66cb2f122e0 100644
--- a/bin/tests/system/wildcard/ns2/hints
+++ b/bin/tests/system/wildcard/ns2/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: hints,v 1.1.2.1 2010/06/01 03:55:02 marka Exp $
 
diff --git a/bin/tests/system/wildcard/ns2/named.conf.in b/bin/tests/system/wildcard/ns2/named.conf.in
index 3eb3b186f01..67a50fcbc05 100644
--- a/bin/tests/system/wildcard/ns2/named.conf.in
+++ b/bin/tests/system/wildcard/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/wildcard/ns3/hints b/bin/tests/system/wildcard/ns3/hints
index dc56df61d97..66cb2f122e0 100644
--- a/bin/tests/system/wildcard/ns3/hints
+++ b/bin/tests/system/wildcard/ns3/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id: hints,v 1.1.2.1 2010/06/01 03:55:02 marka Exp $
 
diff --git a/bin/tests/system/wildcard/ns3/named.conf.in b/bin/tests/system/wildcard/ns3/named.conf.in
index 62d3f2a5375..ad908a4cc78 100644
--- a/bin/tests/system/wildcard/ns3/named.conf.in
+++ b/bin/tests/system/wildcard/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/wildcard/ns4/named.conf.in b/bin/tests/system/wildcard/ns4/named.conf.in
index ae0d4834c44..0b432c059b9 100644
--- a/bin/tests/system/wildcard/ns4/named.conf.in
+++ b/bin/tests/system/wildcard/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/wildcard/ns5/hints b/bin/tests/system/wildcard/ns5/hints
index d76b98ae6e9..66cb2f122e0 100644
--- a/bin/tests/system/wildcard/ns5/hints
+++ b/bin/tests/system/wildcard/ns5/hints
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 ; $Id: hints,v 1.1.2.1 2010/06/01 03:55:02 marka Exp $
 
diff --git a/bin/tests/system/wildcard/ns5/named.conf.in b/bin/tests/system/wildcard/ns5/named.conf.in
index e53d00cef0d..9ef24c73ea6 100644
--- a/bin/tests/system/wildcard/ns5/named.conf.in
+++ b/bin/tests/system/wildcard/ns5/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/wildcard/prereq.sh b/bin/tests/system/wildcard/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/wildcard/prereq.sh
+++ b/bin/tests/system/wildcard/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index 2d25a357d79..2feddbd74b4 100644
--- a/bin/tests/system/wildcard/setup.sh
+++ b/bin/tests/system/wildcard/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/wildcard/tests.sh b/bin/tests/system/wildcard/tests.sh
index 56d730f42ec..5037a72b5f6 100644
--- a/bin/tests/system/wildcard/tests.sh
+++ b/bin/tests/system/wildcard/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index 5f60be024e7..ca30fa6dd46 100644
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 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.
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/xfer/ns1/axfr-too-big.db b/bin/tests/system/xfer/ns1/axfr-too-big.db
index d43760d9a8d..ff6e4b965ad 100644
--- a/bin/tests/system/xfer/ns1/axfr-too-big.db
+++ b/bin/tests/system/xfer/ns1/axfr-too-big.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL	3600
 @	IN	SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/xfer/ns1/ixfr-too-big.db.in b/bin/tests/system/xfer/ns1/ixfr-too-big.db.in
index 318bb772af3..7372793e1fa 100644
--- a/bin/tests/system/xfer/ns1/ixfr-too-big.db.in
+++ b/bin/tests/system/xfer/ns1/ixfr-too-big.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL	3600
 @	IN	SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/xfer/ns1/named.conf.in b/bin/tests/system/xfer/ns1/named.conf.in
index 2f59a44bbf5..c0e8112ec61 100644
--- a/bin/tests/system/xfer/ns1/named.conf.in
+++ b/bin/tests/system/xfer/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/xfer/ns1/root.db b/bin/tests/system/xfer/ns1/root.db
index 777fd5a046d..2c1a29ebfa0 100644
--- a/bin/tests/system/xfer/ns1/root.db
+++ b/bin/tests/system/xfer/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/xfer/ns2/mapped.db.in b/bin/tests/system/xfer/ns2/mapped.db.in
index 7bca23ac9b0..fc7911802df 100644
--- a/bin/tests/system/xfer/ns2/mapped.db.in
+++ b/bin/tests/system/xfer/ns2/mapped.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 mapped.                 3600    IN      SOA     . . 0 0 0 2147483647 0
 example.aa.             3600    IN      A       1.2.3.4
diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.in
index c0e1db40ae8..547a9b0d4c0 100644
--- a/bin/tests/system/xfer/ns2/named.conf.in
+++ b/bin/tests/system/xfer/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/xfer/ns2/slave.db.in b/bin/tests/system/xfer/ns2/slave.db.in
index c8f9438ce5e..4ee2094af8d 100644
--- a/bin/tests/system/xfer/ns2/slave.db.in
+++ b/bin/tests/system/xfer/ns2/slave.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 5
 
diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.in
index e9677816f1d..b4bfac519ee 100644
--- a/bin/tests/system/xfer/ns3/named.conf.in
+++ b/bin/tests/system/xfer/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/xfer/ns4/named.conf.base b/bin/tests/system/xfer/ns4/named.conf.base
index 4bc5e3f0b23..14a5e0577aa 100644
--- a/bin/tests/system/xfer/ns4/named.conf.base
+++ b/bin/tests/system/xfer/ns4/named.conf.base
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 options {
diff --git a/bin/tests/system/xfer/ns4/root.db.in b/bin/tests/system/xfer/ns4/root.db.in
index fc1ae072dc9..9d400d410f5 100644
--- a/bin/tests/system/xfer/ns4/root.db.in
+++ b/bin/tests/system/xfer/ns4/root.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2016  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.
 
 ; $Id: root.db.in,v 1.3 2011/12/01 23:46:51 tbox Exp $
 
diff --git a/bin/tests/system/xfer/ns6/named.conf.in b/bin/tests/system/xfer/ns6/named.conf.in
index 9b62caf0dfb..5983f982c24 100644
--- a/bin/tests/system/xfer/ns6/named.conf.in
+++ b/bin/tests/system/xfer/ns6/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/xfer/ns7/named.conf.in b/bin/tests/system/xfer/ns7/named.conf.in
index 4549065dd13..04f1e4efe54 100644
--- a/bin/tests/system/xfer/ns7/named.conf.in
+++ b/bin/tests/system/xfer/ns7/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/xfer/ns8/example.db b/bin/tests/system/xfer/ns8/example.db
index 1b0e1aa568a..d9a664bac57 100644
--- a/bin/tests/system/xfer/ns8/example.db
+++ b/bin/tests/system/xfer/ns8/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
diff --git a/bin/tests/system/xfer/ns8/named.conf.in b/bin/tests/system/xfer/ns8/named.conf.in
index 0984e0a26f9..ab6e0c9878e 100644
--- a/bin/tests/system/xfer/ns8/named.conf.in
+++ b/bin/tests/system/xfer/ns8/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 include "../../common/rndc.key";
diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh
index c208894b086..daa3d5d86cc 100644
--- a/bin/tests/system/xfer/prereq.sh
+++ b/bin/tests/system/xfer/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 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.
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index e886d578d2b..19fed32e849 100644
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2002, 2004, 2007, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 257c4d4236b..e96598716a1 100755
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2005, 2007, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index a608e7a1517..e823c9179e3 100644
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 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.
 
 #
 # Clean up after zone transfer quota tests.
diff --git a/bin/tests/system/xferquota/ns1/changing1.db b/bin/tests/system/xferquota/ns1/changing1.db
index 99822898d50..6226c37ab5b 100644
--- a/bin/tests/system/xferquota/ns1/changing1.db
+++ b/bin/tests/system/xferquota/ns1/changing1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: changing1.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/xferquota/ns1/changing2.db b/bin/tests/system/xferquota/ns1/changing2.db
index 7d0fd1fe8e4..5f390f32e2a 100644
--- a/bin/tests/system/xferquota/ns1/changing2.db
+++ b/bin/tests/system/xferquota/ns1/changing2.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: changing2.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/xferquota/ns1/named.conf.in b/bin/tests/system/xferquota/ns1/named.conf.in
index 2562c552a3a..290778e0b3e 100644
--- a/bin/tests/system/xferquota/ns1/named.conf.in
+++ b/bin/tests/system/xferquota/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/xferquota/ns1/root.db b/bin/tests/system/xferquota/ns1/root.db
index 36604b6490d..738a81c9373 100644
--- a/bin/tests/system/xferquota/ns1/root.db
+++ b/bin/tests/system/xferquota/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
 
 ; $Id: root.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/xferquota/ns2/example.db b/bin/tests/system/xferquota/ns2/example.db
index 07bac739e03..a8f518d0fe1 100644
--- a/bin/tests/system/xferquota/ns2/example.db
+++ b/bin/tests/system/xferquota/ns2/example.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2000-2004, 2007, 2009, 2016  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.
 
 ; $Id: example.db,v 1.14 2009/01/21 23:47:27 tbox Exp $
 
diff --git a/bin/tests/system/xferquota/ns2/named.conf.in b/bin/tests/system/xferquota/ns2/named.conf.in
index c10e83b9c57..8b68164edd9 100644
--- a/bin/tests/system/xferquota/ns2/named.conf.in
+++ b/bin/tests/system/xferquota/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 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.
  */
 
 options {
diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl
index 8bac85946d5..cf7ec39db89 100644
--- a/bin/tests/system/xferquota/setup.pl
+++ b/bin/tests/system/xferquota/setup.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2016  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.
 
 # $Id: setup.pl,v 1.16 2011/10/26 23:46:15 tbox Exp $
 
diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index 70328d53ad6..5d418992fa8 100644
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 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.
 
 #
 # Set up test data for zone transfer quota tests.
diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index 076410c87fc..6ee1c66e0e5 100755
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/zero/ans5/ans.pl b/bin/tests/system/zero/ans5/ans.pl
index 45e44731bd8..6f81e7c5e6f 100644
--- a/bin/tests/system/zero/ans5/ans.pl
+++ b/bin/tests/system/zero/ans5/ans.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# 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.
 
 #
 # Don't respond if the "norespond" file exists; otherwise respond to
diff --git a/bin/tests/system/zero/clean.sh b/bin/tests/system/zero/clean.sh
index 6dfc3c30708..00fc10a0326 100644
--- a/bin/tests/system/zero/clean.sh
+++ b/bin/tests/system/zero/clean.sh
@@ -1,8 +1,11 @@
-# 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.
 
 rm -f */named.conf
 rm -f */named.run
diff --git a/bin/tests/system/zero/ns1/named.conf.in b/bin/tests/system/zero/ns1/named.conf.in
index 5d01ab306ec..b24ceaa28dd 100644
--- a/bin/tests/system/zero/ns1/named.conf.in
+++ b/bin/tests/system/zero/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/zero/ns1/root.db b/bin/tests/system/zero/ns1/root.db
index 6f58cb30d9d..c20b5fc460d 100644
--- a/bin/tests/system/zero/ns1/root.db
+++ b/bin/tests/system/zero/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 $TTL 300
 @	SOA ns1. hostmaster.warn.example. (
diff --git a/bin/tests/system/zero/ns2/named.conf.in b/bin/tests/system/zero/ns2/named.conf.in
index 032592021fe..b0f237ab25f 100644
--- a/bin/tests/system/zero/ns2/named.conf.in
+++ b/bin/tests/system/zero/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/zero/ns2/tld.db b/bin/tests/system/zero/ns2/tld.db
index 7fe09a59652..11b5b137653 100644
--- a/bin/tests/system/zero/ns2/tld.db
+++ b/bin/tests/system/zero/ns2/tld.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 1
 @	300	SOA	ns2.tld. hostmaster.ns2.tld. 0 1 1 1 1
diff --git a/bin/tests/system/zero/ns3/named.conf.in b/bin/tests/system/zero/ns3/named.conf.in
index 5f2184a9d77..4036dd9efc0 100644
--- a/bin/tests/system/zero/ns3/named.conf.in
+++ b/bin/tests/system/zero/ns3/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/zero/ns3/root.hint b/bin/tests/system/zero/ns3/root.hint
index c0eb8d164c0..c1784c7ee88 100644
--- a/bin/tests/system/zero/ns3/root.hint
+++ b/bin/tests/system/zero/ns3/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2013, 2016  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.
 
 . NS ns1.
 ns1. A 10.53.0.1
diff --git a/bin/tests/system/zero/ns4/named.conf.in b/bin/tests/system/zero/ns4/named.conf.in
index 1abd8bc715c..00be8eca83e 100644
--- a/bin/tests/system/zero/ns4/named.conf.in
+++ b/bin/tests/system/zero/ns4/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 options {
diff --git a/bin/tests/system/zero/ns4/one.tld.db b/bin/tests/system/zero/ns4/one.tld.db
index 217e8e58dba..7706e44327d 100644
--- a/bin/tests/system/zero/ns4/one.tld.db
+++ b/bin/tests/system/zero/ns4/one.tld.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2016  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.
 
 $TTL 1
 ;	The TTL of all these records needs to be 1.
diff --git a/bin/tests/system/zero/setup.sh b/bin/tests/system/zero/setup.sh
index 830d98d392b..27b8ba7e370 100644
--- a/bin/tests/system/zero/setup.sh
+++ b/bin/tests/system/zero/setup.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh
index a2610bb81c7..73c277c4b83 100644
--- a/bin/tests/system/zero/tests.sh
+++ b/bin/tests/system/zero/tests.sh
@@ -1,8 +1,11 @@
-# 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/zonechecks/a.db b/bin/tests/system/zonechecks/a.db
index 85d7ac12ca8..6584ccac47a 100644
--- a/bin/tests/system/zonechecks/a.db
+++ b/bin/tests/system/zonechecks/a.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: a.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/zonechecks/aaaa.db b/bin/tests/system/zonechecks/aaaa.db
index 166bbeeb9d0..1679bb79280 100644
--- a/bin/tests/system/zonechecks/aaaa.db
+++ b/bin/tests/system/zonechecks/aaaa.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: aaaa.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/zonechecks/bigserial.db b/bin/tests/system/zonechecks/bigserial.db
index 28081027c8b..8925fc1e576 100644
--- a/bin/tests/system/zonechecks/bigserial.db
+++ b/bin/tests/system/zonechecks/bigserial.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2015, 2016  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.
 
 @	3600	IN SOA	ns hostmaster 3003113544 3600 1200 604800 3600
 @	3600	IN NS	ns
diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh
index 4c383546a04..16cad7a876d 100644
--- a/bin/tests/system/zonechecks/clean.sh
+++ b/bin/tests/system/zonechecks/clean.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 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.
 
 rm -f *.out
 rm -f */named.memstats
diff --git a/bin/tests/system/zonechecks/cname.db b/bin/tests/system/zonechecks/cname.db
index 92a163292c9..76a899f9c24 100644
--- a/bin/tests/system/zonechecks/cname.db
+++ b/bin/tests/system/zonechecks/cname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: cname.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/zonechecks/dname.db b/bin/tests/system/zonechecks/dname.db
index 2bb4fe8d0fe..d507351114e 100644
--- a/bin/tests/system/zonechecks/dname.db
+++ b/bin/tests/system/zonechecks/dname.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: dname.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/zonechecks/noaddress.db b/bin/tests/system/zonechecks/noaddress.db
index 745c0e9f44b..43a8468a3b2 100644
--- a/bin/tests/system/zonechecks/noaddress.db
+++ b/bin/tests/system/zonechecks/noaddress.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: noaddress.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in
index 5e1eff0085b..cd60ba32f2a 100644
--- a/bin/tests/system/zonechecks/ns1/named.conf.in
+++ b/bin/tests/system/zonechecks/ns1/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012-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.
  */
 
 // NS1
diff --git a/bin/tests/system/zonechecks/ns2/named.conf.in b/bin/tests/system/zonechecks/ns2/named.conf.in
index 50d88289778..be847feaff4 100644
--- a/bin/tests/system/zonechecks/ns2/named.conf.in
+++ b/bin/tests/system/zonechecks/ns2/named.conf.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 // NS2
diff --git a/bin/tests/system/zonechecks/nxdomain.db b/bin/tests/system/zonechecks/nxdomain.db
index cd176612293..82c950dd147 100644
--- a/bin/tests/system/zonechecks/nxdomain.db
+++ b/bin/tests/system/zonechecks/nxdomain.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2004, 2007, 2016  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.
 
 ; $Id: nxdomain.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/bin/tests/system/zonechecks/prereq.sh b/bin/tests/system/zonechecks/prereq.sh
index 0eacf1db84b..a0d4e9ce14a 100644
--- a/bin/tests/system/zonechecks/prereq.sh
+++ b/bin/tests/system/zonechecks/prereq.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index 17c1d77a297..9a247044862 100644
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh
index 093831bba80..fb3b4660523 100644
--- a/bin/tests/system/zonechecks/tests.sh
+++ b/bin/tests/system/zonechecks/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 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.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/t_api.pl b/bin/tests/t_api.pl
index da386a3246f..d34eaa7bd5b 100644
--- a/bin/tests/t_api.pl
+++ b/bin/tests/t_api.pl
@@ -1,10 +1,13 @@
 #!/usr/local/bin/perl
 #
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: t_api.pl,v 1.10 2007/06/19 23:46:59 tbox Exp $
 
diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index dd60feb3b7e..8ec77c0746d 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 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.
  */
 
 /* $Id: task_test.c,v 1.51 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in
index b7923c26095..ba26d59faa9 100644
--- a/bin/tests/tasks/Makefile.in
+++ b/bin/tests/tasks/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2002, 2004, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index adebd3a9d91..4b52e3ba4f2 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2011, 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.
  */
 
 /* $Id: t_tasks.c,v 1.49 2011/07/27 07:45:55 marka Exp $ */
diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index 5f6015bdcbd..d2f10737ab1 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 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.
  */
 
 /* $Id: timer_test.c,v 1.40 2007/06/19 23:46:59 tbox Exp $ */
diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index fe0ea6d778b..0f2acf16446 100644
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2002, 2004, 2007, 2009, 2012, 2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c
index ef7a3b9f146..9de8a2a6623 100644
--- a/bin/tests/timers/t_timers.c
+++ b/bin/tests/timers/t_timers.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007-2009, 2011, 2013, 2016  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.
  */
 
 /* $Id: t_timers.c,v 1.33 2011/03/14 14:13:10 fdupont Exp $ */
diff --git a/bin/tests/virtual-time/Makefile.in b/bin/tests/virtual-time/Makefile.in
index 6750e7dd469..bf4136dcfb7 100644
--- a/bin/tests/virtual-time/Makefile.in
+++ b/bin/tests/virtual-time/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2010/06/17 05:38:04 marka Exp $
 
diff --git a/bin/tests/virtual-time/README b/bin/tests/virtual-time/README
index 755534786a8..9d078e4bd55 100644
--- a/bin/tests/virtual-time/README
+++ b/bin/tests/virtual-time/README
@@ -1,9 +1,12 @@
-Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2010, 2016, 2018  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 copied from ../system.
 
 This test suite uses a virtual time, gettimeofday(), select(),
diff --git a/bin/tests/virtual-time/autosign-ksk/clean.sh b/bin/tests/virtual-time/autosign-ksk/clean.sh
index 14f10b1da0e..82354806fbe 100644
--- a/bin/tests/virtual-time/autosign-ksk/clean.sh
+++ b/bin/tests/virtual-time/autosign-ksk/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2015, 2016  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.
 
 # $Id: clean.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in b/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in
index b12f382bb35..693990c59f6 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.3 2010/06/21 23:46:48 tbox Exp $
 
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/named.conf b/bin/tests/virtual-time/autosign-ksk/ns1/named.conf
index bd35b599488..d2cbafa0f8b 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/named.conf
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: named.conf,v 1.2 2010/06/21 02:31:45 marka Exp $ */
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/root.db b/bin/tests/virtual-time/autosign-ksk/ns1/root.db
index bf6827adf61..98f72843b8a 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/root.db
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.db,v 1.3 2010/06/21 23:46:48 tbox Exp $
 
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh b/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh
index b3542f6bc6a..7e2854292c8 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: sign.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh b/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh
index 35c86ae428d..8a7420eaddf 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: wrap.sh,v 1.3 2010/06/21 23:46:48 tbox Exp $
 
diff --git a/bin/tests/virtual-time/autosign-ksk/setup.sh b/bin/tests/virtual-time/autosign-ksk/setup.sh
index 9ad8e71b88b..ec05f4ba56e 100644
--- a/bin/tests/virtual-time/autosign-ksk/setup.sh
+++ b/bin/tests/virtual-time/autosign-ksk/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: setup.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/autosign-ksk/tests.sh b/bin/tests/virtual-time/autosign-ksk/tests.sh
index 4a97305e3e4..5a43e94d45d 100644
--- a/bin/tests/virtual-time/autosign-ksk/tests.sh
+++ b/bin/tests/virtual-time/autosign-ksk/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: tests.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/autosign-zsk/clean.sh b/bin/tests/virtual-time/autosign-zsk/clean.sh
index 14f10b1da0e..82354806fbe 100644
--- a/bin/tests/virtual-time/autosign-zsk/clean.sh
+++ b/bin/tests/virtual-time/autosign-zsk/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2015, 2016  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.
 
 # $Id: clean.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in b/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in
index b12f382bb35..693990c59f6 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.3 2010/06/21 23:46:48 tbox Exp $
 
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/named.conf b/bin/tests/virtual-time/autosign-zsk/ns1/named.conf
index 5f6f2ddaca1..038c6767399 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/named.conf
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: named.conf,v 1.2 2010/06/21 02:31:45 marka Exp $ */
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/root.db b/bin/tests/virtual-time/autosign-zsk/ns1/root.db
index bf6827adf61..98f72843b8a 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/root.db
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.db,v 1.3 2010/06/21 23:46:48 tbox Exp $
 
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh b/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh
index 635e0827f18..e1b360cdb6e 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: sign.sh,v 1.2 2010/06/21 02:31:46 marka Exp $
 
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh b/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh
index 35c86ae428d..8a7420eaddf 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: wrap.sh,v 1.3 2010/06/21 23:46:48 tbox Exp $
 
diff --git a/bin/tests/virtual-time/autosign-zsk/setup.sh b/bin/tests/virtual-time/autosign-zsk/setup.sh
index 9ad8e71b88b..ec05f4ba56e 100644
--- a/bin/tests/virtual-time/autosign-zsk/setup.sh
+++ b/bin/tests/virtual-time/autosign-zsk/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: setup.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/autosign-zsk/tests.sh b/bin/tests/virtual-time/autosign-zsk/tests.sh
index 2eb3371ec82..ea573959705 100644
--- a/bin/tests/virtual-time/autosign-zsk/tests.sh
+++ b/bin/tests/virtual-time/autosign-zsk/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: tests.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/cleanall.sh b/bin/tests/virtual-time/cleanall.sh
index c6abb503d93..e91bf8a2f81 100644
--- a/bin/tests/virtual-time/cleanall.sh
+++ b/bin/tests/virtual-time/cleanall.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016, 2017  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.
 
 # $Id: cleanall.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/common/controls.conf b/bin/tests/virtual-time/common/controls.conf
index e40b22175f1..82006c36aab 100644
--- a/bin/tests/virtual-time/common/controls.conf
+++ b/bin/tests/virtual-time/common/controls.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: controls.conf,v 1.2 2010/06/17 05:38:05 marka Exp $ */
diff --git a/bin/tests/virtual-time/common/rndc.conf b/bin/tests/virtual-time/common/rndc.conf
index 70bb1d208e7..4df55875c44 100644
--- a/bin/tests/virtual-time/common/rndc.conf
+++ b/bin/tests/virtual-time/common/rndc.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: rndc.conf,v 1.2 2010/06/17 05:38:05 marka Exp $ */
diff --git a/bin/tests/virtual-time/common/root.hint b/bin/tests/virtual-time/common/root.hint
index 72e8ba5641b..7ca68f1d1f0 100644
--- a/bin/tests/virtual-time/common/root.hint
+++ b/bin/tests/virtual-time/common/root.hint
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.hint,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/conf.sh.in b/bin/tests/virtual-time/conf.sh.in
index 09f575d5c65..c548466e877 100644
--- a/bin/tests/virtual-time/conf.sh.in
+++ b/bin/tests/virtual-time/conf.sh.in
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016, 2017  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.
 
 # $Id: conf.sh.in,v 1.3 2010/06/21 02:31:45 marka Exp $
 
diff --git a/bin/tests/virtual-time/run.sh b/bin/tests/virtual-time/run.sh
index 23a7377370a..b162a62d872 100644
--- a/bin/tests/virtual-time/run.sh
+++ b/bin/tests/virtual-time/run.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: run.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/runall.sh b/bin/tests/virtual-time/runall.sh
index 7a7511e77df..2ffe0ea5714 100644
--- a/bin/tests/virtual-time/runall.sh
+++ b/bin/tests/virtual-time/runall.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: runall.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/setup.sh b/bin/tests/virtual-time/setup.sh
index 280aa1133d5..2ab99dcf78b 100644
--- a/bin/tests/virtual-time/setup.sh
+++ b/bin/tests/virtual-time/setup.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: setup.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/slave/clean.sh b/bin/tests/virtual-time/slave/clean.sh
index 04af3c157ed..167e6779b72 100644
--- a/bin/tests/virtual-time/slave/clean.sh
+++ b/bin/tests/virtual-time/slave/clean.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2015, 2016  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.
 
 # $Id: clean.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/slave/ns1/example.db.in b/bin/tests/virtual-time/slave/ns1/example.db.in
index 0c75c87f3ba..af9449c8494 100644
--- a/bin/tests/virtual-time/slave/ns1/example.db.in
+++ b/bin/tests/virtual-time/slave/ns1/example.db.in
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: example.db.in,v 1.3 2010/06/18 23:46:42 tbox Exp $
 
diff --git a/bin/tests/virtual-time/slave/ns1/named.conf b/bin/tests/virtual-time/slave/ns1/named.conf
index 7128dd62d00..60d23c6a5bd 100644
--- a/bin/tests/virtual-time/slave/ns1/named.conf
+++ b/bin/tests/virtual-time/slave/ns1/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: named.conf,v 1.3 2010/06/18 23:46:42 tbox Exp $ */
diff --git a/bin/tests/virtual-time/slave/ns1/root.db b/bin/tests/virtual-time/slave/ns1/root.db
index f1e2ce51a3f..2cbbd9221f1 100644
--- a/bin/tests/virtual-time/slave/ns1/root.db
+++ b/bin/tests/virtual-time/slave/ns1/root.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2010, 2016  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.
 
 ; $Id: root.db,v 1.3 2010/06/18 23:46:43 tbox Exp $
 
diff --git a/bin/tests/virtual-time/slave/ns1/wrap.sh b/bin/tests/virtual-time/slave/ns1/wrap.sh
index 93abbe29461..764bc36b598 100644
--- a/bin/tests/virtual-time/slave/ns1/wrap.sh
+++ b/bin/tests/virtual-time/slave/ns1/wrap.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: wrap.sh,v 1.3 2010/06/18 23:46:43 tbox Exp $
 
diff --git a/bin/tests/virtual-time/slave/setup.sh b/bin/tests/virtual-time/slave/setup.sh
index 5aa2cc93e1d..ba7f3efc678 100644
--- a/bin/tests/virtual-time/slave/setup.sh
+++ b/bin/tests/virtual-time/slave/setup.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: setup.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/slave/tests.sh b/bin/tests/virtual-time/slave/tests.sh
index 1d7b7a93371..2f5a78bcfa7 100644
--- a/bin/tests/virtual-time/slave/tests.sh
+++ b/bin/tests/virtual-time/slave/tests.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: tests.sh,v 1.2 2010/06/17 05:38:06 marka Exp $
 
diff --git a/bin/tests/virtual-time/start.pl b/bin/tests/virtual-time/start.pl
index 2709fba7fd1..105ac3503a1 100644
--- a/bin/tests/virtual-time/start.pl
+++ b/bin/tests/virtual-time/start.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2010, 2012, 2015, 2016  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.
 
 # $Id: start.pl,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/start.sh b/bin/tests/virtual-time/start.sh
index 883a6d75ef6..258ce96d072 100644
--- a/bin/tests/virtual-time/start.sh
+++ b/bin/tests/virtual-time/start.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: start.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/stop.pl b/bin/tests/virtual-time/stop.pl
index 4b8fab3defd..2225147349f 100644
--- a/bin/tests/virtual-time/stop.pl
+++ b/bin/tests/virtual-time/stop.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: stop.pl,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/stop.sh b/bin/tests/virtual-time/stop.sh
index 7cd5d690fc0..1a17f77bf15 100644
--- a/bin/tests/virtual-time/stop.sh
+++ b/bin/tests/virtual-time/stop.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: stop.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/testsock.pl b/bin/tests/virtual-time/testsock.pl
index 14999f4a63f..7d8543c17b8 100644
--- a/bin/tests/virtual-time/testsock.pl
+++ b/bin/tests/virtual-time/testsock.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2010, 2012, 2016  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.
 
 # $Id: testsock.pl,v 1.2 2010/06/17 05:38:05 marka Exp $
 
diff --git a/bin/tests/virtual-time/vtwrapper.c b/bin/tests/virtual-time/vtwrapper.c
index ed0c78b7385..472aeb78bed 100644
--- a/bin/tests/virtual-time/vtwrapper.c
+++ b/bin/tests/virtual-time/vtwrapper.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2016  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.
  */
 
 /* $Id: vtwrapper.c,v 1.4 2010/08/12 09:31:50 fdupont Exp $ */
diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index 7e90292df78..473159ef93c 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 #include <config.h>
diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c
index fc1a810b636..f4658e8aac3 100644
--- a/bin/tests/zone_test.c
+++ b/bin/tests/zone_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2012, 2014-2016  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.
  */
 
 /* $Id: zone_test.c,v 1.35 2009/09/02 23:48:01 tbox Exp $ */
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index b1623114239..e8f5dfdf19e 100644
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2010, 2012-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tools/arpaname.c b/bin/tools/arpaname.c
index 171333c7eeb..3ee90cffb9f 100644
--- a/bin/tools/arpaname.c
+++ b/bin/tools/arpaname.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2015, 2016  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.
  */
 
 /* $Id: arpaname.c,v 1.4 2009/10/27 03:05:33 marka Exp $ */
diff --git a/bin/tools/arpaname.docbook b/bin/tools/arpaname.docbook
index 731042551c5..26093d541ef 100644
--- a/bin/tools/arpaname.docbook
+++ b/bin/tools/arpaname.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -32,6 +35,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c
index 756b22b38b4..cdc108b9713 100644
--- a/bin/tools/dnstap-read.c
+++ b/bin/tools/dnstap-read.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*
diff --git a/bin/tools/dnstap-read.docbook b/bin/tools/dnstap-read.docbook
index d0c8b1c7f4d..6e1dd60f1b6 100644
--- a/bin/tools/dnstap-read.docbook
+++ b/bin/tools/dnstap-read.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -32,6 +35,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tools/genrandom.c b/bin/tools/genrandom.c
index 1e36971aa73..f495a7e22d2 100644
--- a/bin/tools/genrandom.c
+++ b/bin/tools/genrandom.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2005, 2007, 2009, 2010, 2012, 2014, 2016  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.
  */
 
 /* $Id: genrandom.c,v 1.7 2010/05/17 23:51:04 tbox Exp $ */
diff --git a/bin/tools/genrandom.docbook b/bin/tools/genrandom.docbook
index f106702dc5f..b4f369a933f 100644
--- a/bin/tools/genrandom.docbook
+++ b/bin/tools/genrandom.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009-2011, 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -35,6 +38,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index e685a884b58..7c8c3be29b1 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/bin/tools/mdig.docbook b/bin/tools/mdig.docbook
index 587e097188d..1f65e6fefb9 100644
--- a/bin/tools/mdig.docbook
+++ b/bin/tools/mdig.docbook
@@ -1,11 +1,14 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2015-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -32,6 +35,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c
index 71e7a913101..a7c69207d4e 100644
--- a/bin/tools/named-journalprint.c
+++ b/bin/tools/named-journalprint.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2009, 2015, 2016  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.
  */
 
 /* $Id: named-journalprint.c,v 1.2 2009/12/04 21:59:23 marka Exp $ */
diff --git a/bin/tools/named-journalprint.docbook b/bin/tools/named-journalprint.docbook
index 7dde98df395..a782d21479d 100644
--- a/bin/tools/named-journalprint.docbook
+++ b/bin/tools/named-journalprint.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -34,6 +37,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c
index e502607f5b3..2b4cfaa6f2f 100644
--- a/bin/tools/named-nzd2nzf.c
+++ b/bin/tools/named-nzd2nzf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 #include "config.h"
diff --git a/bin/tools/named-nzd2nzf.docbook b/bin/tools/named-nzd2nzf.docbook
index 151cd30166e..6857c43c514 100644
--- a/bin/tools/named-nzd2nzf.docbook
+++ b/bin/tools/named-nzd2nzf.docbook
@@ -2,11 +2,14 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2016  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.
 -->
 
 <refentry id="man.named-nzd2nzf">
@@ -30,6 +33,7 @@
   <docinfo>
     <copyright>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c
index 63a91484b5e..602457ce663 100644
--- a/bin/tools/named-rrchecker.c
+++ b/bin/tools/named-rrchecker.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 #include <config.h>
diff --git a/bin/tools/named-rrchecker.docbook b/bin/tools/named-rrchecker.docbook
index 94ba01586c3..b1015054b17 100644
--- a/bin/tools/named-rrchecker.docbook
+++ b/bin/tools/named-rrchecker.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2013-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -31,6 +34,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c
index 4fc4339b05e..0b1632b449e 100644
--- a/bin/tools/nsec3hash.c
+++ b/bin/tools/nsec3hash.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2008, 2009, 2011, 2014, 2016, 2017  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.
  */
 
 #include <config.h>
diff --git a/bin/tools/nsec3hash.docbook b/bin/tools/nsec3hash.docbook
index d28a13c8347..68cad4484be 100644
--- a/bin/tools/nsec3hash.docbook
+++ b/bin/tools/nsec3hash.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -34,6 +37,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index a6b063fdeba..7c2ac9954f0 100644
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 2001, 2002, 2004, 2007, 2009, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2002, 2004, 2007, 2009, 2013, 2016-2018  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.
  */
 
 /* $Id: AccountInfo.cpp,v 1.10 2009/09/29 23:48:04 tbox Exp $ */
diff --git a/bin/win32/BINDInstall/AccountInfo.h b/bin/win32/BINDInstall/AccountInfo.h
index 9cf0d86483f..6e933926bc5 100644
--- a/bin/win32/BINDInstall/AccountInfo.h
+++ b/bin/win32/BINDInstall/AccountInfo.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: AccountInfo.h,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index 8b20f9ef347..de9b1e835e1 100644
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2009, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2007, 2009, 2016, 2018  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.
  */
 
 /* $Id: BINDInstall.cpp,v 1.9 2009/09/29 23:48:04 tbox Exp $ */
diff --git a/bin/win32/BINDInstall/BINDInstall.h b/bin/win32/BINDInstall/BINDInstall.h
index 906738a5818..85f479fd6f1 100644
--- a/bin/win32/BINDInstall/BINDInstall.h
+++ b/bin/win32/BINDInstall/BINDInstall.h
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2007, 2016, 2018  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.
  */
 
 /* $Id: BINDInstall.h,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 441b760d92f..436e89bf0ef 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 2001, 2003-2010, 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2003-2010, 2013-2018  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.
  */
 
 /* $Id: BINDInstallDlg.cpp,v 1.48 2010/01/07 23:48:54 tbox Exp $ */
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h
index 6dba6f514d1..8b9a5b2967b 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.h
+++ b/bin/win32/BINDInstall/BINDInstallDlg.h
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2009, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2007, 2009, 2015-2018  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.
  */
 
 /* $Id: BINDInstallDlg.h,v 1.11 2009/09/01 06:51:47 marka Exp $ */
diff --git a/bin/win32/BINDInstall/DirBrowse.cpp b/bin/win32/BINDInstall/DirBrowse.cpp
index ac384fc526c..636bf24d526 100644
--- a/bin/win32/BINDInstall/DirBrowse.cpp
+++ b/bin/win32/BINDInstall/DirBrowse.cpp
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2007, 2016, 2018  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.
  */
 
 /* $Id: DirBrowse.cpp,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/bin/win32/BINDInstall/DirBrowse.h b/bin/win32/BINDInstall/DirBrowse.h
index 0be9bfe22bc..38ec7fe49a0 100644
--- a/bin/win32/BINDInstall/DirBrowse.h
+++ b/bin/win32/BINDInstall/DirBrowse.h
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2007, 2016, 2018  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.
  */
 
 /* $Id: DirBrowse.h,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/config.h.win32 b/config.h.win32
index f48cad2357f..5405d83010a 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2006-2009, 2011-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.
  */
 
 /*
diff --git a/configure.in b/configure.in
index e2e6c1ef1b3..db8bbe99761 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-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.
 
 dnl
 AC_DIVERT_PUSH(1)dnl
diff --git a/conftools/perllib/dnsconf/DNSConf-macros.h b/conftools/perllib/dnsconf/DNSConf-macros.h
index 22d962a592f..94ece409b31 100644
--- a/conftools/perllib/dnsconf/DNSConf-macros.h
+++ b/conftools/perllib/dnsconf/DNSConf-macros.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: DNSConf-macros.h,v 1.9 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/conftools/perllib/dnsconf/DNSConf.i b/conftools/perllib/dnsconf/DNSConf.i
index 6f97177b7e8..eb3e4a42f02 100644
--- a/conftools/perllib/dnsconf/DNSConf.i
+++ b/conftools/perllib/dnsconf/DNSConf.i
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: DNSConf.i,v 1.9 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/conftools/perllib/dnsconf/Makefile.PL b/conftools/perllib/dnsconf/Makefile.PL
index 8b722136c14..0014aa1b4a9 100644
--- a/conftools/perllib/dnsconf/Makefile.PL
+++ b/conftools/perllib/dnsconf/Makefile.PL
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.PL,v 1.9 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/conftools/perllib/dnsconf/named1.conf b/conftools/perllib/dnsconf/named1.conf
index 443258742a7..64b0f273d54 100644
--- a/conftools/perllib/dnsconf/named1.conf
+++ b/conftools/perllib/dnsconf/named1.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: named1.conf,v 1.9 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/conftools/perllib/dnsconf/test.pl b/conftools/perllib/dnsconf/test.pl
index dcbb08f21f5..85c662f9c4c 100644
--- a/conftools/perllib/dnsconf/test.pl
+++ b/conftools/perllib/dnsconf/test.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: test.pl,v 1.9 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/contrib/dnspriv/README.md b/contrib/dnspriv/README.md
index 8297cb118ac..8fa67952089 100644
--- a/contrib/dnspriv/README.md
+++ b/contrib/dnspriv/README.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2017  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.
 -->
 ### DNS Privacy in BIND
 
diff --git a/contrib/dnspriv/named.conf b/contrib/dnspriv/named.conf
index 03fb612433c..12d07a389b7 100644
--- a/contrib/dnspriv/named.conf
+++ b/contrib/dnspriv/named.conf
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 options {
diff --git a/contrib/dnspriv/nginx.conf b/contrib/dnspriv/nginx.conf
index b11749da8cf..65e386837be 100644
--- a/contrib/dnspriv/nginx.conf
+++ b/contrib/dnspriv/nginx.conf
@@ -1,8 +1,11 @@
-# Copyright (C) 2017  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.
 
 # uncomment to choose an appropriate UID/GID; default is 'nobody'
 # user bind bind;
diff --git a/contrib/perftcpdns/Makefile.in b/contrib/perftcpdns/Makefile.in
index f89de29e486..bff2db00a34 100644
--- a/contrib/perftcpdns/Makefile.in
+++ b/contrib/perftcpdns/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 CC = @CC@
 LIBOBJS = @LIBOBJS@
diff --git a/contrib/perftcpdns/configure.in b/contrib/perftcpdns/configure.in
index 492deaf43f5..35dc82081bb 100644
--- a/contrib/perftcpdns/configure.in
+++ b/contrib/perftcpdns/configure.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 AC_INIT(perftcpdns.c)
 
diff --git a/contrib/perftcpdns/perftcpdns.c b/contrib/perftcpdns/perftcpdns.c
index c7aaf2318ba..6c6aac8772e 100644
--- a/contrib/perftcpdns/perftcpdns.c
+++ b/contrib/perftcpdns/perftcpdns.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2014, 2016  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.
  */
 
 /*
diff --git a/contrib/scripts/check-secure-delegation.pl.in b/contrib/scripts/check-secure-delegation.pl.in
index 0e08b173412..92ea1b0e2d4 100644
--- a/contrib/scripts/check-secure-delegation.pl.in
+++ b/contrib/scripts/check-secure-delegation.pl.in
@@ -1,10 +1,13 @@
 #!@PERL@
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 # $Id: check-secure-delegation.pl.in,v 1.2 2010/12/21 02:32:21 marka Exp $
 
diff --git a/contrib/scripts/named-bootconf.sh b/contrib/scripts/named-bootconf.sh
index f5907cf1e75..86a592a2c35 100644
--- a/contrib/scripts/named-bootconf.sh
+++ b/contrib/scripts/named-bootconf.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Portions Copyright (C) 1999-2001, 2004, 2006, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Portions Copyright (C) 1999-2001, 2004, 2006, 2007, 2012, 2014, 2016, 2018  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.
 
 # $Id: named-bootconf.sh,v 1.12 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/contrib/scripts/nanny.pl b/contrib/scripts/nanny.pl
index 535fb890279..9cfc6d34beb 100644
--- a/contrib/scripts/nanny.pl
+++ b/contrib/scripts/nanny.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016  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.
 
 # $Id: nanny.pl,v 1.11 2007/06/19 23:47:07 tbox Exp $
 
diff --git a/contrib/scripts/zone-edit.sh.in b/contrib/scripts/zone-edit.sh.in
index bb4beba9b02..f5419196d86 100644
--- a/contrib/scripts/zone-edit.sh.in
+++ b/contrib/scripts/zone-edit.sh.in
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  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.
 
 # $Id: zone-edit.sh.in,v 1.2 2010/12/21 23:47:08 tbox Exp $
 
diff --git a/contrib/sdb/dir/dirdb.c b/contrib/sdb/dir/dirdb.c
index 749a36d1bd0..66b54901d47 100644
--- a/contrib/sdb/dir/dirdb.c
+++ b/contrib/sdb/dir/dirdb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016  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.
  */
 
 /* $Id: dirdb.c,v 1.14 2011/10/11 23:46:45 tbox Exp $ */
diff --git a/contrib/sdb/dir/dirdb.h b/contrib/sdb/dir/dirdb.h
index 3559733ff9a..8fddafb37b9 100644
--- a/contrib/sdb/dir/dirdb.h
+++ b/contrib/sdb/dir/dirdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: dirdb.h,v 1.5 2007/06/19 23:47:07 tbox Exp $ */
diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
index 726b0a39818..ef5fc3c07c8 100644
--- a/contrib/sdb/pgsql/pgsqldb.c
+++ b/contrib/sdb/pgsql/pgsqldb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016  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.
  */
 
 /* $Id: pgsqldb.c,v 1.17 2011/10/11 23:46:45 tbox Exp $ */
diff --git a/contrib/sdb/pgsql/pgsqldb.h b/contrib/sdb/pgsql/pgsqldb.h
index f74c8abbf09..0655e334027 100644
--- a/contrib/sdb/pgsql/pgsqldb.h
+++ b/contrib/sdb/pgsql/pgsqldb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: pgsqldb.h,v 1.5 2007/06/19 23:47:08 tbox Exp $ */
diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index 5b9e236bc4d..81eb35bd8f2 100644
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007-2009, 2014, 2016  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.
  */
 
 /* $Id: zonetodb.c,v 1.23 2009/09/02 23:48:01 tbox Exp $ */
diff --git a/contrib/sdb/tcl/lookup.tcl b/contrib/sdb/tcl/lookup.tcl
index f3ec4fd4c32..5ed7d62439e 100644
--- a/contrib/sdb/tcl/lookup.tcl
+++ b/contrib/sdb/tcl/lookup.tcl
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: lookup.tcl,v 1.10 2007/06/19 23:47:08 tbox Exp $
 
diff --git a/contrib/sdb/tcl/tcldb.c b/contrib/sdb/tcl/tcldb.c
index 03456ee3cb5..733b11627b3 100644
--- a/contrib/sdb/tcl/tcldb.c
+++ b/contrib/sdb/tcl/tcldb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016  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.
  */
 
 /* $Id: tcldb.c,v 1.12 2011/10/11 23:46:45 tbox Exp $ */
diff --git a/contrib/sdb/tcl/tcldb.h b/contrib/sdb/tcl/tcldb.h
index 03b81ce5d41..cfe8b0dcc49 100644
--- a/contrib/sdb/tcl/tcldb.h
+++ b/contrib/sdb/tcl/tcldb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: tcldb.h,v 1.7 2007/06/19 23:47:10 tbox Exp $ */
diff --git a/contrib/sdb/time/timedb.c b/contrib/sdb/time/timedb.c
index 0af5ee5ff21..0285edb0229 100644
--- a/contrib/sdb/time/timedb.c
+++ b/contrib/sdb/time/timedb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016  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.
  */
 
 /* $Id: timedb.c,v 1.12 2011/10/11 23:46:45 tbox Exp $ */
diff --git a/contrib/sdb/time/timedb.h b/contrib/sdb/time/timedb.h
index 0068f59fcfb..5df13d9758c 100644
--- a/contrib/sdb/time/timedb.h
+++ b/contrib/sdb/time/timedb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: timedb.h,v 1.5 2007/06/19 23:47:13 tbox Exp $ */
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fd3b9816a21..760dde41da9 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004-2007, 2012, 2015, 2016  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.
 
 # This Makefile is a placeholder.  It exists merely to make
 # sure that its directory gets created in the object directory
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 46b08155fed..8314f85a176 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2000-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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 69138f6bf6b..53d97bf339e 100644
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2002, 2004-2007, 2009, 2012, 2014-2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/doc/arm/README-SGML b/doc/arm/README-SGML
index 8406524b43a..40dfbc07cd3 100644
--- a/doc/arm/README-SGML
+++ b/doc/arm/README-SGML
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2015, 2016, 2018  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.
+
 The BIND v9 ARM master document is now kept in DocBook 5 XML format.
 
 Most of the ARM is in the single file "Bv9ARM-book.xml", with certain
diff --git a/doc/arm/acl.grammar.xml b/doc/arm/acl.grammar.xml
index cfe0d080d77..3d838b13f06 100644
--- a/doc/arm/acl.grammar.xml
+++ b/doc/arm/acl.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/catz.xml b/doc/arm/catz.xml
index 17316ee8c0f..f314b44d9a1 100644
--- a/doc/arm/catz.xml
+++ b/doc/arm/catz.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2016, 2017  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.
 -->
 
 <section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="catz-info"><info><title>Catalog Zones</title></info>
diff --git a/doc/arm/controls.grammar.xml b/doc/arm/controls.grammar.xml
index 035b1460c67..df4accfe30f 100644
--- a/doc/arm/controls.grammar.xml
+++ b/doc/arm/controls.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/delegation-only.zoneopt.xml b/doc/arm/delegation-only.zoneopt.xml
index 6845b2f04f7..a26ce24f450 100644
--- a/doc/arm/delegation-only.zoneopt.xml
+++ b/doc/arm/delegation-only.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/dlz.xml b/doc/arm/dlz.xml
index 89a20f89175..93ee5db5ec7 100644
--- a/doc/arm/dlz.xml
+++ b/doc/arm/dlz.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2012-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/dnssec.xml b/doc/arm/dnssec.xml
index f3d869304e0..de922dcb5ab 100644
--- a/doc/arm/dnssec.xml
+++ b/doc/arm/dnssec.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2010, 2011, 2015-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/dyndb.xml b/doc/arm/dyndb.xml
index 0d449f092ec..a9c5b498720 100644
--- a/doc/arm/dyndb.xml
+++ b/doc/arm/dyndb.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015, 2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/forward.zoneopt.xml b/doc/arm/forward.zoneopt.xml
index 15b8aeb6c1d..429bbca35e3 100644
--- a/doc/arm/forward.zoneopt.xml
+++ b/doc/arm/forward.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/hint.zoneopt.xml b/doc/arm/hint.zoneopt.xml
index df02f139016..c1b4fad4bbd 100644
--- a/doc/arm/hint.zoneopt.xml
+++ b/doc/arm/hint.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/in-view.zoneopt.xml b/doc/arm/in-view.zoneopt.xml
index 9b93a78073f..a91b6f3742a 100644
--- a/doc/arm/in-view.zoneopt.xml
+++ b/doc/arm/in-view.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/key.grammar.xml b/doc/arm/key.grammar.xml
index e0946ab2638..33cc23ac425 100644
--- a/doc/arm/key.grammar.xml
+++ b/doc/arm/key.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/libdns.xml b/doc/arm/libdns.xml
index c680e8f518e..4562f6a7c9e 100644
--- a/doc/arm/libdns.xml
+++ b/doc/arm/libdns.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2010, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
index c81e87305da..216ac77fab8 100644
--- a/doc/arm/logging-categories.xml
+++ b/doc/arm/logging-categories.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/logging.grammar.xml b/doc/arm/logging.grammar.xml
index 076e5dfa84f..cc15150ab8c 100644
--- a/doc/arm/logging.grammar.xml
+++ b/doc/arm/logging.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/managed-keys.grammar.xml b/doc/arm/managed-keys.grammar.xml
index 875870ed787..d79f27fe063 100644
--- a/doc/arm/managed-keys.grammar.xml
+++ b/doc/arm/managed-keys.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/managed-keys.xml b/doc/arm/managed-keys.xml
index e5638394335..ba45a6c1c00 100644
--- a/doc/arm/managed-keys.xml
+++ b/doc/arm/managed-keys.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2010, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/master.zoneopt.xml b/doc/arm/master.zoneopt.xml
index 06d86f918c1..f68ace8b982 100644
--- a/doc/arm/master.zoneopt.xml
+++ b/doc/arm/master.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/masters.grammar.xml b/doc/arm/masters.grammar.xml
index edbc47a9e62..658fdfc1f4f 100644
--- a/doc/arm/masters.grammar.xml
+++ b/doc/arm/masters.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/notes-wrapper.xml b/doc/arm/notes-wrapper.xml
index 95c545cb8b9..2a8f6d885e2 100644
--- a/doc/arm/notes-wrapper.xml
+++ b/doc/arm/notes-wrapper.xml
@@ -1,11 +1,14 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2014-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 69672ccb048..b8c58fed88b 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -7,11 +7,14 @@
 <!ENTITY mdash "&#8212;">
 <!ENTITY ouml "&#xf6;">]>
 <!--
- - Copyright (C) 2014-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.
 -->
 
 <section xmlns:db="http://docbook.org/ns/docbook" version="5.0"><info/>
diff --git a/doc/arm/noteversion.xml.in b/doc/arm/noteversion.xml.in
index 581d9414386..14bbba43894 100644
--- a/doc/arm/noteversion.xml.in
+++ b/doc/arm/noteversion.xml.in
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015, 2016  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.
 -->
 
 <title>Release Notes for BIND Version @BIND9_VERSION@</title>
diff --git a/doc/arm/options.grammar.xml b/doc/arm/options.grammar.xml
index 85ed2f16367..09dbab854c9 100644
--- a/doc/arm/options.grammar.xml
+++ b/doc/arm/options.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/pkcs11.xml b/doc/arm/pkcs11.xml
index 11a125ab018..973845f10c1 100644
--- a/doc/arm/pkcs11.xml
+++ b/doc/arm/pkcs11.xml
@@ -1,11 +1,14 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2010, 2012-2016  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
diff --git a/doc/arm/pkgversion.xml.in b/doc/arm/pkgversion.xml.in
index 508fb7f7d7b..74abbfcdc66 100644
--- a/doc/arm/pkgversion.xml.in
+++ b/doc/arm/pkgversion.xml.in
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015, 2016  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.
 -->
 
       <para>This version of the manual corresponds to BIND version @PACKAGE_VERSION@.</para>
diff --git a/doc/arm/redirect.zoneopt.xml b/doc/arm/redirect.zoneopt.xml
index 4dc8fcb9fdf..335cfa03877 100644
--- a/doc/arm/redirect.zoneopt.xml
+++ b/doc/arm/redirect.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/releaseinfo.xml.in b/doc/arm/releaseinfo.xml.in
index 4200cb6782f..fa7a3cd58c1 100644
--- a/doc/arm/releaseinfo.xml.in
+++ b/doc/arm/releaseinfo.xml.in
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015, 2016  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.
 -->
 
 <releaseinfo>BIND Version @BIND9_VERSION@</releaseinfo>
diff --git a/doc/arm/server.grammar.xml b/doc/arm/server.grammar.xml
index 27239bb159f..acec1e6c1d9 100644
--- a/doc/arm/server.grammar.xml
+++ b/doc/arm/server.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/slave.zoneopt.xml b/doc/arm/slave.zoneopt.xml
index 80d9f5d083c..32e494a317e 100644
--- a/doc/arm/slave.zoneopt.xml
+++ b/doc/arm/slave.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/static-stub.zoneopt.xml b/doc/arm/static-stub.zoneopt.xml
index 6f8346ffe7f..84e9bb0f41d 100644
--- a/doc/arm/static-stub.zoneopt.xml
+++ b/doc/arm/static-stub.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/statistics-channels.grammar.xml b/doc/arm/statistics-channels.grammar.xml
index 8ff58b1f599..d2c381d4395 100644
--- a/doc/arm/statistics-channels.grammar.xml
+++ b/doc/arm/statistics-channels.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/arm/stub.zoneopt.xml b/doc/arm/stub.zoneopt.xml
index 1f803782b41..7365ece5264 100644
--- a/doc/arm/stub.zoneopt.xml
+++ b/doc/arm/stub.zoneopt.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-zoneopt.pl -->
diff --git a/doc/arm/trusted-keys.grammar.xml b/doc/arm/trusted-keys.grammar.xml
index 1315b4d93fe..b0bd3d79f8c 100644
--- a/doc/arm/trusted-keys.grammar.xml
+++ b/doc/arm/trusted-keys.grammar.xml
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 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.
 -->
 
 <!-- Generated by doc/misc/docbook-options.pl -->
diff --git a/doc/design/addressdb b/doc/design/addressdb
index 97904c876f2..2b1f5583c1a 100644
--- a/doc/design/addressdb
+++ b/doc/design/addressdb
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2016, 2018  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.
+
 $Id: addressdb,v 1.6 2004/03/05 05:04:45 marka Exp $
 
 You are lost in a maze of twisty little pointers, all alike...
diff --git a/doc/design/cds-child b/doc/design/cds-child
index da15f0738df..33953fa1d16 100644
--- a/doc/design/cds-child
+++ b/doc/design/cds-child
@@ -1,9 +1,12 @@
-Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2015, 2016, 2018  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.
+
 	  CDS / CDNSKEY Child side processing.
 
 * We need a mechanism to say that key should have a cds publish
diff --git a/doc/design/compression b/doc/design/compression
index ab6c968fecd..0891918e045 100644
--- a/doc/design/compression
+++ b/doc/design/compression
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 			Name Compression
 
 	$Id: compression,v 1.9 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/database b/doc/design/database
index 8f3f532ee0d..76fd270056d 100644
--- a/doc/design/database
+++ b/doc/design/database
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: database,v 1.9 2004/03/05 05:04:46 marka Exp $
 
 Databases
diff --git a/doc/design/db_rules b/doc/design/db_rules
index b7a1940b59e..7e87ccc571a 100644
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: db_rules,v 1.8 2004/03/05 05:04:46 marka Exp $
 
 Here is a more formal statement of the important database design
diff --git a/doc/design/decompression b/doc/design/decompression
index 7c558c18312..35ab69114c3 100644
--- a/doc/design/decompression
+++ b/doc/design/decompression
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 			Name Decompression
 
 	$Id: decompression,v 1.8 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/dispatch b/doc/design/dispatch
index b36faab0d21..e7bca417cbe 100644
--- a/doc/design/dispatch
+++ b/doc/design/dispatch
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2016, 2018  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.
+
 $Id: dispatch,v 1.6 2004/03/05 05:04:46 marka Exp $
 
 UDP receive:
diff --git a/doc/design/dscp b/doc/design/dscp
index c37295325e7..883a93352ea 100644
--- a/doc/design/dscp
+++ b/doc/design/dscp
@@ -1,9 +1,12 @@
-Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2013, 2016, 2018  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.
+
 	Differentiate Services Code Point Support
 
 $Id: dscp,v 1.1.2.1 2012/02/24 05:20:36 marka Exp $
diff --git a/doc/design/keydone b/doc/design/keydone
index db9d89658bb..743cca2cde1 100644
--- a/doc/design/keydone
+++ b/doc/design/keydone
@@ -1,9 +1,12 @@
-Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2011, 2016, 2018  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.
+
 $Id: keydone,v 1.2 2011/10/19 23:46:56 tbox Exp $
 
         rndc keydone <rdata> zone [class [view]]
diff --git a/doc/design/logging b/doc/design/logging
index 0d8ccb2fea0..e20dc8f1acf 100644
--- a/doc/design/logging
+++ b/doc/design/logging
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: logging,v 1.10 2004/03/05 05:04:46 marka Exp $
 
 OVERVIEW
diff --git a/doc/design/ncache b/doc/design/ncache
index 86617916c20..c46c885347f 100644
--- a/doc/design/ncache
+++ b/doc/design/ncache
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: ncache,v 1.7 2004/03/05 05:04:46 marka Exp $
 
 Negative Caching
diff --git a/doc/design/rdataset b/doc/design/rdataset
index d095c60617d..681555ef051 100644
--- a/doc/design/rdataset
+++ b/doc/design/rdataset
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: rdataset,v 1.6 2004/03/05 05:04:46 marka Exp $
 
 Need way to "dup" an rdataset (i.e. different rdataset handle, same underlying
diff --git a/doc/design/red-black b/doc/design/red-black
index 07c65cbc358..4d7ef6f811b 100644
--- a/doc/design/red-black
+++ b/doc/design/red-black
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: red-black,v 1.9 2004/03/05 05:04:46 marka Exp $
 
                  Red-Black Tree Implementation Notes
diff --git a/doc/design/resolver b/doc/design/resolver
index 973e0a26a41..d3886015dc5 100644
--- a/doc/design/resolver
+++ b/doc/design/resolver
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: resolver,v 1.6 2004/03/05 05:04:47 marka Exp $
 
 Multi-target Resolver
diff --git a/doc/design/search b/doc/design/search
index a9bb161d613..12344c20b2e 100644
--- a/doc/design/search
+++ b/doc/design/search
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: search,v 1.10 2004/03/05 05:04:47 marka Exp $
 
 What follows is pseudocode for the zone and cache lookup algorithms, as they
diff --git a/doc/design/tasks b/doc/design/tasks
index e4b087e2544..898c475d131 100644
--- a/doc/design/tasks
+++ b/doc/design/tasks
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: tasks,v 1.7 2004/03/05 05:04:47 marka Exp $
 
 Changes I made last week to the task code simplified the task shutdown
diff --git a/doc/design/verify b/doc/design/verify
index a175a519716..f351f5cb2b1 100644
--- a/doc/design/verify
+++ b/doc/design/verify
@@ -1,9 +1,12 @@
-Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2012, 2016, 2018  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.
+
 $Id$
 
 	dnssec-verify a tool to verify a zone is correctly signed.
diff --git a/doc/design/windows-nt b/doc/design/windows-nt
index 5c5ed17fc01..8112457e0bf 100644
--- a/doc/design/windows-nt
+++ b/doc/design/windows-nt
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: windows-nt,v 1.8 2004/03/05 05:04:47 marka Exp $
 
                      Windows NT Portability Notes
diff --git a/doc/design/zone b/doc/design/zone
index 8c2645cd66b..fa5e01f475b 100644
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 			Zones
 
 	$Id: zone,v 1.10 2004/03/05 05:04:47 marka Exp $
diff --git a/doc/dev/DBC b/doc/dev/DBC
index 2435052f982..670b2de019c 100644
--- a/doc/dev/DBC
+++ b/doc/dev/DBC
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: DBC,v 1.6 2004/03/05 05:04:49 marka Exp $
 
 Design By Contract
diff --git a/doc/dev/HOW-ADB-WORKS.txt b/doc/dev/HOW-ADB-WORKS.txt
index 0ab04675a2c..54fb0e769b1 100644
--- a/doc/dev/HOW-ADB-WORKS.txt
+++ b/doc/dev/HOW-ADB-WORKS.txt
@@ -1,9 +1,12 @@
-Copyright (C) 2003, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2003, 2004, 2016, 2018  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.
+
 $Id: HOW-ADB-WORKS.txt,v 1.2 2004/03/05 05:04:50 marka Exp $
 
 Recently, several groups have expressed concern over potential
diff --git a/doc/dev/autoconf b/doc/dev/autoconf
index 597e4c2e8ac..3153869fe75 100644
--- a/doc/dev/autoconf
+++ b/doc/dev/autoconf
@@ -1,9 +1,12 @@
-Copyright (C) 2001, 2002, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2001, 2002, 2004, 2016, 2018  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.
+
 $Id: autoconf,v 1.4 2004/03/05 05:04:50 marka Exp $
 
 Here are some hints on how to use autoconf correctly when doing
diff --git a/doc/dev/coding.html b/doc/dev/coding.html
index 6447039ac32..fda8a40131d 100644
--- a/doc/dev/coding.html
+++ b/doc/dev/coding.html
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 1999-2002, 2004, 2007, 2016  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.
 -->
 
 <!-- $Id: coding.html,v 1.22 2007/06/19 23:47:13 tbox Exp $ -->
diff --git a/doc/dev/contrib.md b/doc/dev/contrib.md
index b2aefabb97b..dbf15b6271f 100644
--- a/doc/dev/contrib.md
+++ b/doc/dev/contrib.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2017  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.
 -->
 ## BIND Source Access and Contributor Guidelines
 *Apr 14, 2017*
diff --git a/doc/dev/cvs-usage b/doc/dev/cvs-usage
index f948c173e8f..752e19c2d1f 100644
--- a/doc/dev/cvs-usage
+++ b/doc/dev/cvs-usage
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2016, 2018  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.
+
 Notes on CVS Usage
 
 Accessing the repository
diff --git a/doc/dev/dev.md b/doc/dev/dev.md
index a1e56133a80..2624128398b 100644
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2017  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.
 -->
 ## BIND Developer Information
 
diff --git a/doc/dev/magic_numbers b/doc/dev/magic_numbers
index 3b8cabbad56..27ecf1fcdae 100644
--- a/doc/dev/magic_numbers
+++ b/doc/dev/magic_numbers
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2002, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2002, 2004, 2016, 2018  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.
+
 $Id: magic_numbers,v 1.7 2004/03/05 05:04:50 marka Exp $
 
 Magic Numbers
diff --git a/doc/dev/rdata.md b/doc/dev/rdata.md
index 0b421cf469e..7bb9394958b 100644
--- a/doc/dev/rdata.md
+++ b/doc/dev/rdata.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 1999-2001, 2004, 2007, 2016, 2017  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.
 -->
 ## RDATA Types
 
diff --git a/doc/dev/release b/doc/dev/release
index eed5ed594f6..f4374ab3b06 100644
--- a/doc/dev/release
+++ b/doc/dev/release
@@ -1,9 +1,12 @@
-Copyright (C) 2000-2007, 2009, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000-2007, 2009, 2014, 2016, 2018  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.
+
 $Id: release,v 1.74 2009/08/06 23:47:44 tbox Exp $
 
 Preparing a bind9 release
diff --git a/doc/dev/results b/doc/dev/results
index c39f5f0c866..178d6d4fcc9 100644
--- a/doc/dev/results
+++ b/doc/dev/results
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: results,v 1.7 2004/03/05 05:04:50 marka Exp $
 
 Result Codes
diff --git a/doc/dev/style.md b/doc/dev/style.md
index 6ccd899fbbb..8c74dcebce9 100644
--- a/doc/dev/style.md
+++ b/doc/dev/style.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2017  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.
 -->
 ## BIND 9 Coding Style
 
diff --git a/doc/dev/tests b/doc/dev/tests
index 2387f0d9d7a..ec3ed5445b4 100644
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2016, 2018  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.
+
 $Id: tests,v 1.15 2004/03/05 05:04:50 marka Exp $
 
 We do hourly test builds of the bind9 tree.  This is an attempt to
diff --git a/doc/dev/unexpected b/doc/dev/unexpected
index 2b0de61faeb..1e31f005b55 100644
--- a/doc/dev/unexpected
+++ b/doc/dev/unexpected
@@ -1,9 +1,12 @@
-Copyright (C) 1999-2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 1999-2001, 2004, 2016, 2018  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.
+
 $Id: unexpected,v 1.6 2004/03/05 05:04:50 marka Exp $
 
 Unexpected Errors
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index 43e79037647..e9305ab2183 100644
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2006, 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.4 2007/06/19 23:47:13 tbox Exp $
 
diff --git a/doc/doxygen/doxygen-input-filter.in b/doc/doxygen/doxygen-input-filter.in
index 2a356866554..fefcd227cf2 100644
--- a/doc/doxygen/doxygen-input-filter.in
+++ b/doc/doxygen/doxygen-input-filter.in
@@ -1,10 +1,13 @@
 #!@PERL@ -w
 #
-# Copyright (C) 2006, 2007, 2012, 2016  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.
 
 # $Id: doxygen-input-filter.in,v 1.4 2007/06/19 23:47:13 tbox Exp $
 
diff --git a/doc/doxygen/isc-footer.html b/doc/doxygen/isc-footer.html
index 90a0b7e5ca0..4b9dd2c441c 100644
--- a/doc/doxygen/isc-footer.html
+++ b/doc/doxygen/isc-footer.html
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2006, 2007, 2016  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.
 -->
 
 <!-- $Id: isc-footer.html,v 1.5 2007/06/19 23:47:13 tbox Exp $ -->
diff --git a/doc/doxygen/isc-header.html b/doc/doxygen/isc-header.html
index b3ea268e9ad..f42c5b66e05 100644
--- a/doc/doxygen/isc-header.html
+++ b/doc/doxygen/isc-header.html
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2006, 2007, 2016  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.
 -->
 
 <!-- $Id: isc-header.html,v 1.5 2007/06/19 23:47:13 tbox Exp $ -->
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 2f58c68fff3..c4967ff519b 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2004, 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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/doc/misc/dnssec b/doc/misc/dnssec
index b577d12736c..a94ff7aabdf 100644
--- a/doc/misc/dnssec
+++ b/doc/misc/dnssec
@@ -1,9 +1,12 @@
-Copyright (C) 2000-2002, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000-2002, 2004, 2016, 2018  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.
+
 DNSSEC Release Notes
 
 This document summarizes the state of the DNSSEC implementation in
diff --git a/doc/misc/docbook-grammars.pl b/doc/misc/docbook-grammars.pl
index 91bf48d7d18..43f47e813db 100644
--- a/doc/misc/docbook-grammars.pl
+++ b/doc/misc/docbook-grammars.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 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.
 
 use warnings;
 use strict;
diff --git a/doc/misc/docbook-options.pl b/doc/misc/docbook-options.pl
index 4ec7101c956..6495b53e810 100644
--- a/doc/misc/docbook-options.pl
+++ b/doc/misc/docbook-options.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# 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.
 
 use warnings;
 use strict;
diff --git a/doc/misc/docbook-zoneopt.pl b/doc/misc/docbook-zoneopt.pl
index cc18bcad1e7..295fc2865ac 100644
--- a/doc/misc/docbook-zoneopt.pl
+++ b/doc/misc/docbook-zoneopt.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 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.
 
 use warnings;
 use strict;
diff --git a/doc/misc/format-options.pl b/doc/misc/format-options.pl
index fcbc8e633c6..8dbe3d583c0 100644
--- a/doc/misc/format-options.pl
+++ b/doc/misc/format-options.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: format-options.pl,v 1.5 2007/09/24 04:21:59 marka Exp $
 
diff --git a/doc/misc/ipv6 b/doc/misc/ipv6
index 5f05db9e5f0..7cc2ff7902b 100644
--- a/doc/misc/ipv6
+++ b/doc/misc/ipv6
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2016, 2018  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.
+
 Currently, there are multiple interesting problems with ipv6
 implementations on various platforms.  These problems range from not
 being able to use ipv6 with bind9 (or in particular the ISC socket
diff --git a/doc/misc/migration b/doc/misc/migration
index d20d2a9cea5..f1fb72ebeac 100644
--- a/doc/misc/migration
+++ b/doc/misc/migration
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2016, 2018  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.
+
                    BIND 8 to BIND 9 Migration Notes
 
 BIND 9 is designed to be mostly upwards compatible with BIND 8, but
diff --git a/doc/misc/migration-4to9 b/doc/misc/migration-4to9
index 7c8c61801c9..bb2b0f779ab 100644
--- a/doc/misc/migration-4to9
+++ b/doc/misc/migration-4to9
@@ -1,9 +1,12 @@
-Copyright (C) 2001, 2004, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2001, 2004, 2016, 2018  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.
+
 $Id: migration-4to9,v 1.4 2004/03/05 05:04:53 marka Exp $
 
 		   BIND 4 to BIND 9 Migration Notes
diff --git a/doc/misc/rfc-compliance b/doc/misc/rfc-compliance
index 9d991c0c040..3fe47310743 100644
--- a/doc/misc/rfc-compliance
+++ b/doc/misc/rfc-compliance
@@ -1,9 +1,12 @@
-Copyright (C) 2001, 2004, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2001, 2004, 2015, 2016, 2018  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.
+
 BIND 9 is striving for strict compliance with IETF standards.  We
 believe this release of BIND 9 complies with the following RFCs, with
 the caveats and exceptions listed in the numbered notes below.  Note
diff --git a/doc/misc/roadmap b/doc/misc/roadmap
index 90aa87935ee..e2680f4543c 100644
--- a/doc/misc/roadmap
+++ b/doc/misc/roadmap
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2016-2018  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.
+
 Road Map to the BIND 9 Source Tree
 
 bin/named		The name server.  This relies heavily on the
diff --git a/doc/misc/sdb b/doc/misc/sdb
index e03a735bdca..ee4ab7d7e0d 100644
--- a/doc/misc/sdb
+++ b/doc/misc/sdb
@@ -1,9 +1,12 @@
-Copyright (C) 2000, 2001, 2004, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2016-2018  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.
+
 Using the BIND 9 Simplified Database Interface
 
 This document describes the care and feeding of the BIND 9 Simplified
diff --git a/doc/misc/sort-options.pl b/doc/misc/sort-options.pl
index 88b6c6216df..cd3ffd3e87e 100644
--- a/doc/misc/sort-options.pl
+++ b/doc/misc/sort-options.pl
@@ -1,10 +1,13 @@
 #!/bin/perl
 #
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: sort-options.pl,v 1.3 2007/09/24 23:46:48 tbox Exp $
 
diff --git a/doc/misc/tcp-fast-open b/doc/misc/tcp-fast-open
index f9492bb70c1..616512994eb 100644
--- a/doc/misc/tcp-fast-open
+++ b/doc/misc/tcp-fast-open
@@ -1,9 +1,12 @@
-Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016-2018  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.
+
 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/doc/tex/Makefile.in b/doc/tex/Makefile.in
index 9480384b7aa..c4bb60384a5 100644
--- a/doc/tex/Makefile.in
+++ b/doc/tex/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2015, 2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/doc/xsl/Makefile.in b/doc/xsl/Makefile.in
index 5e0d5696b3d..3138c29cd51 100644
--- a/doc/xsl/Makefile.in
+++ b/doc/xsl/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2005, 2007, 2012, 2014-2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/doc/xsl/arm-param.xsl b/doc/xsl/arm-param.xsl
index a0483f7d59e..c3014914a0c 100644
--- a/doc/xsl/arm-param.xsl
+++ b/doc/xsl/arm-param.xsl
@@ -1,10 +1,13 @@
 <?xml version='1.0' encoding="iso-8859-1"?>
 <!--
- - 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.
 -->
 
 <xsl:stylesheet version="1.0"
diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl
index 991afa349d6..6a0b8137551 100644
--- a/doc/xsl/copyright.xsl
+++ b/doc/xsl/copyright.xsl
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2005, 2007, 2009, 2015, 2016  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.
 -->
 
 <!-- $Id$ -->
diff --git a/doc/xsl/isc-docbook-chunk.xsl.in b/doc/xsl/isc-docbook-chunk.xsl.in
index bcde58ea049..6f9977e11e9 100644
--- a/doc/xsl/isc-docbook-chunk.xsl.in
+++ b/doc/xsl/isc-docbook-chunk.xsl.in
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2005, 2007, 2014-2016  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.
 -->
 
 <!-- ISC customizations for Docbook-XSL chunked HTML generator -->
diff --git a/doc/xsl/isc-docbook-html.xsl.in b/doc/xsl/isc-docbook-html.xsl.in
index 908657abf0d..6d27de8b821 100644
--- a/doc/xsl/isc-docbook-html.xsl.in
+++ b/doc/xsl/isc-docbook-html.xsl.in
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2005, 2007, 2014-2016  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.
 -->
 
 <!-- ISC customizations for Docbook-XSL HTML generator -->
diff --git a/doc/xsl/isc-docbook-text.xsl b/doc/xsl/isc-docbook-text.xsl
index 61688198c09..fcfa5b9e007 100644
--- a/doc/xsl/isc-docbook-text.xsl
+++ b/doc/xsl/isc-docbook-text.xsl
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2005, 2007, 2015, 2016  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.
 -->
 
 <!-- $Id$ -->
diff --git a/doc/xsl/isc-manpage.xsl.in b/doc/xsl/isc-manpage.xsl.in
index 2ab531c5912..f466d78c1d0 100644
--- a/doc/xsl/isc-manpage.xsl.in
+++ b/doc/xsl/isc-manpage.xsl.in
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2005, 2007, 2015, 2016  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.
 -->
 
 <!-- $Id$ -->
diff --git a/doc/xsl/isc-notes-html.xsl.in b/doc/xsl/isc-notes-html.xsl.in
index ec37e3360f3..3f6b2a290a8 100644
--- a/doc/xsl/isc-notes-html.xsl.in
+++ b/doc/xsl/isc-notes-html.xsl.in
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015, 2016  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.
 -->
 
 <!-- ISC customizations for Docbook-XSL HTML generator -->
diff --git a/doc/xsl/notes-param.xsl b/doc/xsl/notes-param.xsl
index fa726bbdccc..f2b3e8b24f2 100644
--- a/doc/xsl/notes-param.xsl
+++ b/doc/xsl/notes-param.xsl
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2015, 2016  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.
 -->
 
 <!-- ISC customizations for dblatex generator -->
diff --git a/doc/xsl/pre-latex.xsl b/doc/xsl/pre-latex.xsl
index 32148d9df14..375584aedb6 100644
--- a/doc/xsl/pre-latex.xsl
+++ b/doc/xsl/pre-latex.xsl
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2005, 2007, 2015, 2016  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.
 -->
 
 <!-- $Id: pre-latex.xsl,v 1.6 2007/06/19 23:47:13 tbox Exp $ -->
diff --git a/isc-config.sh.docbook b/isc-config.sh.docbook
index d30e4e3e9da..ed38bb7c8e4 100644
--- a/isc-config.sh.docbook
+++ b/isc-config.sh.docbook
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2009, 2014-2017  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.
 -->
 
 <!-- Converted by db4-upgrade version 1.0 -->
@@ -29,6 +32,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/isc-config.sh.in b/isc-config.sh.in
index 39ca2e82f30..240a6c50be0 100644
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2003, 2004, 2007, 2012, 2013, 2015-2017  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.
 
 # $Id: isc-config.sh.in,v 1.17 2007/06/19 23:46:59 tbox Exp $
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5d357827aec..ff7c0eb9f9e 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2003, 2004, 2007, 2012-2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index e48b52ce804..2a27b7e82e8 100644
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index ef40bca6b33..06709638fb2 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-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.
  */
 
 /*! \file */
diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c
index a724ed304b8..4a828852051 100644
--- a/lib/bind9/getaddresses.c
+++ b/lib/bind9/getaddresses.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2002, 2004, 2005, 2007, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/lib/bind9/include/Makefile.in b/lib/bind9/include/Makefile.in
index 709a5c91579..4127b6899ec 100644
--- a/lib/bind9/include/Makefile.in
+++ b/lib/bind9/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.4 2007/06/19 23:47:16 tbox Exp $
 
diff --git a/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in
index f223ad3774e..16d37b74fb9 100644
--- a/lib/bind9/include/bind9/Makefile.in
+++ b/lib/bind9/include/bind9/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2004, 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.8 2007/06/19 23:47:16 tbox Exp $
 
diff --git a/lib/bind9/include/bind9/check.h b/lib/bind9/include/bind9/check.h
index d5960269caf..b826e42504e 100644
--- a/lib/bind9/include/bind9/check.h
+++ b/lib/bind9/include/bind9/check.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: check.h,v 1.9 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/bind9/include/bind9/getaddresses.h b/lib/bind9/include/bind9/getaddresses.h
index 4a5a431dde0..f4d012778b5 100644
--- a/lib/bind9/include/bind9/getaddresses.h
+++ b/lib/bind9/include/bind9/getaddresses.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2009, 2016, 2017  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.
  */
 
 /* $Id: getaddresses.h,v 1.11 2009/01/17 23:47:42 tbox Exp $ */
diff --git a/lib/bind9/include/bind9/version.h b/lib/bind9/include/bind9/version.h
index b579c40ae4c..b4d8d04d713 100644
--- a/lib/bind9/include/bind9/version.h
+++ b/lib/bind9/include/bind9/version.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: version.h,v 1.9 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/bind9/version.c b/lib/bind9/version.c
index b09142fa629..ac41f5754e8 100644
--- a/lib/bind9/version.c
+++ b/lib/bind9/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.8 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/bind9/win32/DLLMain.c b/lib/bind9/win32/DLLMain.c
index 943f4daa760..f5521b2aea3 100644
--- a/lib/bind9/win32/DLLMain.c
+++ b/lib/bind9/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: DLLMain.c,v 1.4 2007/06/18 23:47:39 tbox Exp $ */
diff --git a/lib/bind9/win32/version.c b/lib/bind9/win32/version.c
index b9887323e2e..47117a6d7fc 100644
--- a/lib/bind9/win32/version.c
+++ b/lib/bind9/win32/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.5 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 74c01839eff..b8e6e722c01 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index 13142bd6620..371f4bcc770 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2009, 2011, 2013, 2014, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index b30f6951397..68cffe96e51 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /*! \file
diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c
index 3bb001406e8..d67ad955ab5 100644
--- a/lib/dns/badcache.c
+++ b/lib/dns/badcache.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /*! \file */
diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index 22ba897d3f5..c1fb585931c 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2005, 2007, 2009, 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.
  */
 
 /* $Id: byaddr.c,v 1.41 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 9d9fc1a5003..ce40969889b 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2011-2017  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.
  */
 
 /* $Id: cache.c,v 1.91 2011/08/26 05:12:56 marka Exp $ */
diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c
index 7ec6c17fea1..0a7d5d63b9a 100644
--- a/lib/dns/callbacks.c
+++ b/lib/dns/callbacks.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011, 2012, 2015, 2016  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.
  */
 
 /* $Id: callbacks.c,v 1.19.40.1 2012/02/07 00:44:13 each Exp $ */
diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 5019ffa5bba..6c937031d79 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*! \file */
diff --git a/lib/dns/client.c b/lib/dns/client.c
index 9a8d9b3819f..70659fbf8f1 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/clientinfo.c b/lib/dns/clientinfo.c
index 43f01c10151..6d025d9888e 100644
--- a/lib/dns/clientinfo.c
+++ b/lib/dns/clientinfo.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2014, 2016  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.
  */
 
 /*! \file */
diff --git a/lib/dns/compress.c b/lib/dns/compress.c
index f1c110dab9e..8352a426528 100644
--- a/lib/dns/compress.c
+++ b/lib/dns/compress.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2015-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/db.c b/lib/dns/db.c
index 430592856f1..6006db05912 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007-2009, 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.
  */
 
 /*! \file */
diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c
index 2f19e2034b9..2d507748767 100644
--- a/lib/dns/dbiterator.c
+++ b/lib/dns/dbiterator.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: dbiterator.c,v 1.18 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c
index 73c63c99dc2..08aedf87226 100644
--- a/lib/dns/dbtable.c
+++ b/lib/dns/dbtable.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2013, 2016  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.
  */
 
 /*
diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 713a90fe015..fe7181b7734 100644
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2005, 2007-2009, 2011, 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.
  */
 
 /* $Id: diff.c,v 1.26 2011/03/25 23:53:02 each Exp $ */
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 5707abd53e5..33e6ace7bc5 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2011-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
index 6571394765f..384a49c8fbc 100644
--- a/lib/dns/dlz.c
+++ b/lib/dns/dlz.c
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005, 2007, 2009-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2001, 2005, 2007, 2009-2013, 2015, 2016, 2018  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.
  */
 
 /*
diff --git a/lib/dns/dns64.c b/lib/dns/dns64.c
index 54ddbd2ca9a..39480491941 100644
--- a/lib/dns/dns64.c
+++ b/lib/dns/dns64.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2011, 2014, 2016, 2017  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.
  */
 
 /* $Id: dns64.c,v 1.8 2011/03/12 04:59:47 tbox Exp $ */
diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c
index ab49fe1a6c7..77701da990a 100644
--- a/lib/dns/dnsrps.c
+++ b/lib/dns/dnsrps.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 874d1d32e38..d07057031e5 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index 6403303aab5..54ae1e9cd9d 100644
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*
diff --git a/lib/dns/ds.c b/lib/dns/ds.c
index a65fa890f2a..28a5c3efe38 100644
--- a/lib/dns/ds.c
+++ b/lib/dns/ds.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002-2007, 2010, 2012, 2014, 2016  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.
  */
 
 /* $Id: ds.c,v 1.13 2010/12/23 23:47:08 tbox Exp $ */
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 2e1d695382c..76327754925 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -5,7 +5,10 @@
  * 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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/dst_gost.h b/lib/dns/dst_gost.h
index 86dda8b7994..e42c6a1592c 100644
--- a/lib/dns/dst_gost.h
+++ b/lib/dns/dst_gost.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef DST_GOST_H
diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index 254b34f8252..2fc7c083685 100644
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2000-2002, 2004-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2000-2002, 2004-2014, 2016-2018  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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/dst_lib.c b/lib/dns/dst_lib.c
index 696488e715b..44cb7c86464 100644
--- a/lib/dns/dst_lib.c
+++ b/lib/dns/dst_lib.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /*
diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h
index f8a3057c853..c1a3aa27a42 100644
--- a/lib/dns/dst_openssl.h
+++ b/lib/dns/dst_openssl.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007-2009, 2011, 2012, 2015, 2016  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.
  */
 
 /* $Id: dst_openssl.h,v 1.11 2011/03/12 04:59:48 tbox Exp $ */
diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index 5b64142de59..da34aff0768 100644
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -5,7 +5,10 @@
  * 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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/dst_parse.h b/lib/dns/dst_parse.h
index e42357cfbdb..46257b6d1ae 100644
--- a/lib/dns/dst_parse.h
+++ b/lib/dns/dst_parse.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2000-2002, 2004-2010, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2000-2002, 2004-2010, 2012, 2014, 2016-2018  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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/dst_pkcs11.h b/lib/dns/dst_pkcs11.h
index d9b35f57e53..b8011f2c4ce 100644
--- a/lib/dns/dst_pkcs11.h
+++ b/lib/dns/dst_pkcs11.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef DST_PKCS11_H
diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index 5761ac4fe70..f7138d2b691 100644
--- a/lib/dns/dst_result.c
+++ b/lib/dns/dst_result.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2008, 2012-2016  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.
  */
 
 /*%
diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
index ad3e95db781..e21a84c71e2 100644
--- a/lib/dns/dyndb.c
+++ b/lib/dns/dyndb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 
diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c
index 653665b9491..cec084fdfd2 100644
--- a/lib/dns/ecdb.c
+++ b/lib/dns/ecdb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009-2017  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.
  */
 
 #include "config.h"
diff --git a/lib/dns/ecs.c b/lib/dns/ecs.c
index 45c703db439..71f32073de6 100644
--- a/lib/dns/ecs.c
+++ b/lib/dns/ecs.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index e6d71c356cf..8b3f992a68a 100644
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2013, 2016  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.
  */
 
 /*! \file */
diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h
index 26086d85a77..0c4ba46c257 100644
--- a/lib/dns/gen-unix.h
+++ b/lib/dns/gen-unix.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2016  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.
  */
 
 /* $Id: gen-unix.h,v 1.21 2009/01/17 23:47:42 tbox Exp $ */
diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h
index 45e779b45bd..2ff0e2f6503 100644
--- a/lib/dns/gen-win32.h
+++ b/lib/dns/gen-win32.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2014, 2016  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.
  */
 
 /*
diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index cfd964b3e14..00809a46538 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2009, 2012-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c
index 6abe9cfdb8e..cb354820512 100644
--- a/lib/dns/geoip.c
+++ b/lib/dns/geoip.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*! \file */
diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c
index 8f09ffc83fb..4d4549d2a46 100644
--- a/lib/dns/gssapi_link.c
+++ b/lib/dns/gssapi_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004-2009, 2011-2016  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.
  */
 
 /*
diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c
index 1a808cc7d14..45be76aaec5 100644
--- a/lib/dns/gssapictx.c
+++ b/lib/dns/gssapictx.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2017  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.
  */
 
 /* $Id: gssapictx.c,v 1.29 2011/08/29 06:33:25 marka Exp $ */
diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index cc0f7500090..0f7a58c23bc 100644
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_link.c
@@ -5,7 +5,10 @@
  * 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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/include/Makefile.in b/lib/dns/include/Makefile.in
index 506cace9e24..10733c7c907 100644
--- a/lib/dns/include/Makefile.in
+++ b/lib/dns/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.15 2007/06/19 23:47:16 tbox Exp $
 
diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index dec7a7b8612..ab63d832775 100644
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2004, 2007-2009, 2011-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index 22fb3ffa3b5..b6a92e3f706 100644
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009, 2011, 2013, 2014, 2016, 2017  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.
  */
 
 #ifndef DNS_ACL_H
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index b33e0d4c714..e04605415ce 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2008, 2011, 2013-2016  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.
  */
 
 /* $Id: adb.h,v 1.88 2011/12/05 17:10:51 each Exp $ */
diff --git a/lib/dns/include/dns/badcache.h b/lib/dns/include/dns/badcache.h
index baf25b1c597..29f40475add 100644
--- a/lib/dns/include/dns/badcache.h
+++ b/lib/dns/include/dns/badcache.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef DNS_BADCACHE_H
diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h
index b35893bf98f..ab46bcc1a50 100644
--- a/lib/dns/include/dns/bit.h
+++ b/lib/dns/include/dns/bit.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: bit.h,v 1.14 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h
index 3444cf703e7..296093ce107 100644
--- a/lib/dns/include/dns/byaddr.h
+++ b/lib/dns/include/dns/byaddr.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2007, 2016  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.
  */
 
 /* $Id: byaddr.h,v 1.22 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index ea1b25eafe6..290a4e801b2 100644
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2011-2013, 2016, 2017  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.
  */
 
 /* $Id: cache.h,v 1.32 2011/08/02 23:47:52 tbox Exp $ */
diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h
index bed336579db..ea74117d3c0 100644
--- a/lib/dns/include/dns/callbacks.h
+++ b/lib/dns/include/dns/callbacks.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2011-2013, 2016  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.
  */
 
 /* $Id: callbacks.h,v 1.26.40.1 2012/02/07 00:44:16 each Exp $ */
diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h
index 631daa4e19e..a062847cd4a 100644
--- a/lib/dns/include/dns/catz.h
+++ b/lib/dns/include/dns/catz.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 
diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h
index 1210316fb5c..80f2a0f1911 100644
--- a/lib/dns/include/dns/cert.h
+++ b/lib/dns/include/dns/cert.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: cert.h,v 1.19 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h
index 61e6bc094d4..d9e6cc20150 100644
--- a/lib/dns/include/dns/client.h
+++ b/lib/dns/include/dns/client.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2013, 2014, 2016, 2017  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.
  */
 
 /* $Id: client.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h
index 74ad64f2cd0..a31937bdd1b 100644
--- a/lib/dns/include/dns/clientinfo.h
+++ b/lib/dns/include/dns/clientinfo.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2014, 2016  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.
  */
 
 /* $Id: clientinfo.h,v 1.3 2011/10/11 23:46:45 tbox Exp $ */
diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h
index a9d4d5adf4b..dd497f09125 100644
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009, 2015-2017  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.
  */
 
 #ifndef DNS_COMPRESS_H
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 2ce5134a2f6..6b7a2528589 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2011-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.
  */
 
 #ifndef DNS_DB_H
diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index 7ad46a46bf9..1dbebc16002 100644
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: dbiterator.h,v 1.25 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h
index 7ebb04d0e27..f0767c74569 100644
--- a/lib/dns/include/dns/dbtable.h
+++ b/lib/dns/include/dns/dbtable.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: dbtable.h,v 1.23 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h
index 22a6d868abc..3997db2004f 100644
--- a/lib/dns/include/dns/diff.h
+++ b/lib/dns/include/dns/diff.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2010, 2013, 2016  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.
  */
 
 /* $Id: diff.h,v 1.19 2010/06/04 23:51:14 tbox Exp $ */
diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index 29334b03401..d3caf9cfac6 100644
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2011-2017  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.
  */
 
 #ifndef DNS_DISPATCH_H
diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h
index 7e6cb5a172e..b9a450c4d05 100644
--- a/lib/dns/include/dns/dlz.h
+++ b/lib/dns/include/dns/dlz.h
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005-2007, 2009-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2001, 2005-2007, 2009-2013, 2016, 2018  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.
  */
 
 /*
diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h
index eca2a7f1c82..aa8c0e29af4 100644
--- a/lib/dns/include/dns/dlz_dlopen.h
+++ b/lib/dns/include/dns/dlz_dlopen.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2013, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/include/dns/dns64.h b/lib/dns/include/dns/dns64.h
index 389740f25cf..935d8926e86 100644
--- a/lib/dns/include/dns/dns64.h
+++ b/lib/dns/include/dns/dns64.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010, 2014, 2016  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.
  */
 
 /* $Id: dns64.h,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
diff --git a/lib/dns/include/dns/dnsrps.h b/lib/dns/include/dns/dnsrps.h
index c0eb2058e28..f79c24efb94 100644
--- a/lib/dns/include/dns/dnsrps.h
+++ b/lib/dns/include/dns/dnsrps.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef DNS_DNSRPS_H
diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index 1c907a6d072..b3c59c384ec 100644
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009-2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h
index 416f6b71cbe..54d3f9474e8 100644
--- a/lib/dns/include/dns/dnstap.h
+++ b/lib/dns/include/dns/dnstap.h
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #ifndef _DNSTAP_H
diff --git a/lib/dns/include/dns/ds.h b/lib/dns/include/dns/ds.h
index 2f9c47d9034..24eb6645c14 100644
--- a/lib/dns/include/dns/ds.h
+++ b/lib/dns/include/dns/ds.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004-2007, 2010, 2012, 2014, 2016  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.
  */
 
 /* $Id: ds.h,v 1.12 2010/12/23 23:47:08 tbox Exp $ */
diff --git a/lib/dns/include/dns/dsdigest.h b/lib/dns/include/dns/dsdigest.h
index 21b98cf151b..dada001be10 100644
--- a/lib/dns/include/dns/dsdigest.h
+++ b/lib/dns/include/dns/dsdigest.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/include/dns/dyndb.h b/lib/dns/include/dns/dyndb.h
index 66e820b0e4e..c1b69d6ae14 100644
--- a/lib/dns/include/dns/dyndb.h
+++ b/lib/dns/include/dns/dyndb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef DNS_DYNDB_H
diff --git a/lib/dns/include/dns/ecdb.h b/lib/dns/include/dns/ecdb.h
index 2b897b5571a..b7f46144e36 100644
--- a/lib/dns/include/dns/ecdb.h
+++ b/lib/dns/include/dns/ecdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012, 2016  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.
  */
 
 /* $Id: ecdb.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/dns/include/dns/ecs.h b/lib/dns/include/dns/ecs.h
index fcb82afa273..356531e341b 100644
--- a/lib/dns/include/dns/ecs.h
+++ b/lib/dns/include/dns/ecs.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef DNS_ECS_H
diff --git a/lib/dns/include/dns/edns.h b/lib/dns/include/dns/edns.h
index 173ccd4fffd..018c89d34e6 100644
--- a/lib/dns/include/dns/edns.h
+++ b/lib/dns/include/dns/edns.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 #ifndef DNS_EDNS_H
diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index f41c3c8c7b0..7b108172238 100644
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009-2011, 2014, 2016, 2017  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.
  */
 
 /* $Id: events.h,v 1.61 2011/10/28 06:20:06 each Exp $ */
diff --git a/lib/dns/include/dns/fixedname.h b/lib/dns/include/dns/fixedname.h
index af26271fb77..208c96aacdb 100644
--- a/lib/dns/include/dns/fixedname.h
+++ b/lib/dns/include/dns/fixedname.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: fixedname.h,v 1.19 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index e8e95eee69e..16e10092235 100644
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2013, 2016  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.
  */
 
 #ifndef DNS_FORWARD_H
diff --git a/lib/dns/include/dns/geoip.h b/lib/dns/include/dns/geoip.h
index f2eeb73a7ba..b45d5419fd2 100644
--- a/lib/dns/include/dns/geoip.h
+++ b/lib/dns/include/dns/geoip.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2014, 2016  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.
  */
 
 #ifndef DNS_GEOIP_H
diff --git a/lib/dns/include/dns/ipkeylist.h b/lib/dns/include/dns/ipkeylist.h
index 23272582959..697c11d2040 100644
--- a/lib/dns/include/dns/ipkeylist.h
+++ b/lib/dns/include/dns/ipkeylist.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 #ifndef DNS_IPKEYLIST_H
diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h
index d55248462bf..6dcbfabe72e 100644
--- a/lib/dns/include/dns/iptable.h
+++ b/lib/dns/include/dns/iptable.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2007, 2012, 2014, 2016  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.
  */
 
 /* $Id: iptable.h,v 1.4 2007/09/14 01:46:05 marka Exp $ */
diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index c3e352c4bdb..84d33978bad 100644
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2009, 2011, 2013, 2016, 2017  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.
  */
 
 /* $Id: journal.h,v 1.43 2011/12/22 07:32:41 each Exp $ */
diff --git a/lib/dns/include/dns/keydata.h b/lib/dns/include/dns/keydata.h
index 70d3c7c3899..0ee541b19b1 100644
--- a/lib/dns/include/dns/keydata.h
+++ b/lib/dns/include/dns/keydata.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: keydata.h,v 1.2 2009/06/30 02:52:32 each Exp $ */
diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h
index 0ef19ed6c30..a27b52abd89 100644
--- a/lib/dns/include/dns/keyflags.h
+++ b/lib/dns/include/dns/keyflags.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: keyflags.h,v 1.16 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index fd089b6a547..4dccad10c52 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 2014-2017  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.
  */
 
 /* $Id: keytable.h,v 1.23 2010/06/25 03:24:05 marka Exp $ */
diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index 509973e4f3a..79f650ffd94 100644
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2010, 2012, 2016, 2017  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.
  */
 
 /* $Id: keyvalues.h,v 1.29 2010/12/23 23:47:08 tbox Exp $ */
diff --git a/lib/dns/include/dns/lib.h b/lib/dns/include/dns/lib.h
index 2bcc2502477..4535e4f018e 100644
--- a/lib/dns/include/dns/lib.h
+++ b/lib/dns/include/dns/lib.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2016, 2017  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.
  */
 
 /* $Id: lib.h,v 1.18 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h
index abf026afb9c..9eb184db695 100644
--- a/lib/dns/include/dns/librpz.h
+++ b/lib/dns/include/dns/librpz.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*
diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index 6225bad37a8..54e7b3da214 100644
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2007, 2009, 2011-2017  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.
  */
 
 /*! \file dns/log.h
diff --git a/lib/dns/include/dns/lookup.h b/lib/dns/include/dns/lookup.h
index 6e7e6fa6227..c549ed96d26 100644
--- a/lib/dns/include/dns/lookup.h
+++ b/lib/dns/include/dns/lookup.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: lookup.h,v 1.14 2009/01/17 23:47:43 tbox Exp $ */
diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index d91bbd44e99..a0075fddcdf 100644
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2009, 2011-2014, 2016  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.
  */
 
 /* $Id: master.h,v 1.57.8.1 2012/02/07 00:44:16 each Exp $ */
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index 09eee8d59b2..6a3fe6ca218 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2008, 2011, 2013-2017  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.
  */
 
 /* $Id: masterdump.h,v 1.47 2011/12/08 23:46:49 tbox Exp $ */
diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 899af96cc2f..58839cfd292 100644
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2010, 2012-2017  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.
  */
 
 #ifndef DNS_MESSAGE_H
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 425e5bb7832..0e8df13a124 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2007, 2009-2013, 2015-2017  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.
  */
 
 /* $Id: name.h,v 1.137 2011/01/13 04:59:26 tbox Exp $ */
diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h
index 8235b2443a4..501e6424caf 100644
--- a/lib/dns/include/dns/ncache.h
+++ b/lib/dns/include/dns/ncache.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2010, 2013, 2016  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.
  */
 
 /* $Id: ncache.h,v 1.29 2010/05/14 23:50:40 tbox Exp $ */
diff --git a/lib/dns/include/dns/nsec.h b/lib/dns/include/dns/nsec.h
index 6cb86da6b03..3c31e604b09 100644
--- a/lib/dns/include/dns/nsec.h
+++ b/lib/dns/include/dns/nsec.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2008, 2011, 2012, 2016  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.
  */
 
 /* $Id: nsec.h,v 1.14 2011/06/10 23:47:32 tbox Exp $ */
diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h
index 54abd56a57c..cc4fa018355 100644
--- a/lib/dns/include/dns/nsec3.h
+++ b/lib/dns/include/dns/nsec3.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008-2013, 2016, 2017  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.
  */
 
 /* $Id: nsec3.h,v 1.14 2011/10/28 12:20:31 tbox Exp $ */
diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h
index 09644bd80fe..63b99b0b2c3 100644
--- a/lib/dns/include/dns/nta.h
+++ b/lib/dns/include/dns/nta.h
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #ifndef DNS_NTA_H
diff --git a/lib/dns/include/dns/opcode.h b/lib/dns/include/dns/opcode.h
index d4a428873a6..887d31c2481 100644
--- a/lib/dns/include/dns/opcode.h
+++ b/lib/dns/include/dns/opcode.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004-2007, 2016  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.
  */
 
 /* $Id: opcode.h,v 1.8 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/order.h b/lib/dns/include/dns/order.h
index 456afef926b..f96578ac138 100644
--- a/lib/dns/include/dns/order.h
+++ b/lib/dns/include/dns/order.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004-2007, 2016, 2017  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.
  */
 
 /* $Id: order.h,v 1.9 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 45112aeb8f7..81eacd8e42c 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2009, 2013-2017  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.
  */
 
 /* $Id: peer.h,v 1.35 2009/01/17 23:47:43 tbox Exp $ */
diff --git a/lib/dns/include/dns/portlist.h b/lib/dns/include/dns/portlist.h
index 436f242800b..43fafce9806 100644
--- a/lib/dns/include/dns/portlist.h
+++ b/lib/dns/include/dns/portlist.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2007, 2016  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.
  */
 
 /* $Id: portlist.h,v 1.9 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/private.h b/lib/dns/include/dns/private.h
index d8928e8bec9..53496b7559e 100644
--- a/lib/dns/include/dns/private.h
+++ b/lib/dns/include/dns/private.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011, 2012, 2016  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.
  */
 
 /* $Id: private.h,v 1.5 2011/10/28 12:20:31 tbox Exp $ */
diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 768f4d301e5..47b753c4a70 100644
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2009, 2012-2017  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.
  */
 
 /* $Id: rbt.h,v 1.77.666.4 2012/02/08 19:53:30 each Exp $ */
diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h
index fcedd25d84f..ba9a73cbbd2 100644
--- a/lib/dns/include/dns/rcode.h
+++ b/lib/dns/include/dns/rcode.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2008, 2016  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.
  */
 
 /* $Id: rcode.h,v 1.21 2008/09/25 04:02:39 tbox Exp $ */
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 376da655de1..35125a2bf22 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2009, 2011-2013, 2016, 2017  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.
  */
 
 /* $Id: rdata.h,v 1.80 2011/03/20 02:31:53 marka Exp $ */
diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h
index a87729179b7..3e186d50af1 100644
--- a/lib/dns/include/dns/rdataclass.h
+++ b/lib/dns/include/dns/rdataclass.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: rdataclass.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h
index 75a4fa34437..6103fa9a13e 100644
--- a/lib/dns/include/dns/rdatalist.h
+++ b/lib/dns/include/dns/rdatalist.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2008, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index de3ea377756..7085d424b06 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2012, 2014-2017  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.
  */
 
 #ifndef DNS_RDATASET_H
diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h
index 5aea4d4dc3e..7084763aa8b 100644
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: rdatasetiter.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index 50e16e82ddf..8a542cc0713 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2008, 2016  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.
  */
 
 /* $Id: rdataslab.h,v 1.33 2008/04/01 23:47:10 tbox Exp $ */
diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h
index 24382733aae..bc5ebf3188f 100644
--- a/lib/dns/include/dns/rdatatype.h
+++ b/lib/dns/include/dns/rdatatype.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004-2008, 2016  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.
  */
 
 /* $Id: rdatatype.h,v 1.26 2008/09/25 04:02:39 tbox Exp $ */
diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index bc2b087d5a2..da7c7a0bacc 100644
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004-2007, 2009, 2010, 2013-2016  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.
  */
 
 /* $Id: request.h,v 1.31 2010/03/04 23:50:34 tbox Exp $ */
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 8544dbe8103..d553021560d 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2017  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.
  */
 
 #ifndef DNS_RESOLVER_H
diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 45b1613c71d..92fa5e12909 100644
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2016  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.
  */
 
 #ifndef DNS_RESULT_H
diff --git a/lib/dns/include/dns/rootns.h b/lib/dns/include/dns/rootns.h
index 2f72ab95d5e..03fe974b2ae 100644
--- a/lib/dns/include/dns/rootns.h
+++ b/lib/dns/include/dns/rootns.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: rootns.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index e59fa8abd77..7e98837d4d1 100644
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2013, 2015-2017  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.
  */
 
 
diff --git a/lib/dns/include/dns/rriterator.h b/lib/dns/include/dns/rriterator.h
index 1b9cbefe5b9..4944e681046 100644
--- a/lib/dns/include/dns/rriterator.h
+++ b/lib/dns/include/dns/rriterator.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 #ifndef DNS_RRITERATOR_H
diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h
index 37fb839c45a..c2be4855311 100644
--- a/lib/dns/include/dns/rrl.h
+++ b/lib/dns/include/dns/rrl.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 
diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h
index 63f7b05c054..e26d84a371a 100644
--- a/lib/dns/include/dns/sdb.h
+++ b/lib/dns/include/dns/sdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2011, 2012, 2016  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.
  */
 
 /* $Id: sdb.h,v 1.25 2011/10/11 23:46:45 tbox Exp $ */
diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index acb966328f9..848251dc9e4 100644
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005-2007, 2009-2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2001, 2005-2007, 2009-2012, 2016, 2018  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.
  */
 
 /*
diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h
index 4ff5f0f86a4..9a748b2a0a6 100644
--- a/lib/dns/include/dns/secalg.h
+++ b/lib/dns/include/dns/secalg.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: secalg.h,v 1.21 2009/10/12 23:48:02 tbox Exp $ */
diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h
index 81db102aa73..fbde88164f8 100644
--- a/lib/dns/include/dns/secproto.h
+++ b/lib/dns/include/dns/secproto.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: secproto.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h
index 7730928914a..56d334c4730 100644
--- a/lib/dns/include/dns/soa.h
+++ b/lib/dns/include/dns/soa.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: soa.h,v 1.12 2009/09/10 01:47:09 each Exp $ */
diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h
index 3d9126fb8fe..281ca2f2e0e 100644
--- a/lib/dns/include/dns/ssu.h
+++ b/lib/dns/include/dns/ssu.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2008, 2010, 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.
  */
 
 #ifndef DNS_SSU_H
diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h
index f4b061dc76f..a46b71fe66b 100644
--- a/lib/dns/include/dns/stats.h
+++ b/lib/dns/include/dns/stats.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2009, 2012, 2014-2017  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.
  */
 
 #ifndef DNS_STATS_H
diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h
index 2c2cd1bb525..03983ed1126 100644
--- a/lib/dns/include/dns/tcpmsg.h
+++ b/lib/dns/include/dns/tcpmsg.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2015, 2016  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.
  */
 
 /* $Id: tcpmsg.h,v 1.22 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h
index 86323a18dc1..9d3650fbe17 100644
--- a/lib/dns/include/dns/time.h
+++ b/lib/dns/include/dns/time.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2012, 2016  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.
  */
 
 /* $Id: time.h,v 1.19 2012/01/27 23:46:58 tbox Exp $ */
diff --git a/lib/dns/include/dns/timer.h b/lib/dns/include/dns/timer.h
index 07d12bcac14..5778960467d 100644
--- a/lib/dns/include/dns/timer.h
+++ b/lib/dns/include/dns/timer.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: timer.h,v 1.9 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h
index 86ea33c6450..98f6c6816bf 100644
--- a/lib/dns/include/dns/tkey.h
+++ b/lib/dns/include/dns/tkey.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009-2011, 2016  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.
  */
 
 /* $Id: tkey.h,v 1.32 2011/01/08 23:47:01 tbox Exp $ */
diff --git a/lib/dns/include/dns/tsec.h b/lib/dns/include/dns/tsec.h
index 4a9db26d8ae..452a3bf6b50 100644
--- a/lib/dns/include/dns/tsec.h
+++ b/lib/dns/include/dns/tsec.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2010, 2012, 2016  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.
  */
 
 /* $Id: tsec.h,v 1.6 2010/12/09 00:54:34 marka Exp $ */
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index dc37a1d1dfb..ea8a5e55f21 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009-2011, 2016  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.
  */
 
 /* $Id: tsig.h,v 1.59 2011/01/11 23:47:13 tbox Exp $ */
diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h
index 1571f6e4bea..887f4cb5838 100644
--- a/lib/dns/include/dns/ttl.h
+++ b/lib/dns/include/dns/ttl.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2014, 2016  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.
  */
 
 /* $Id: ttl.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index b97638f71d7..5daef6498fa 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2017  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.
  */
 
 #ifndef DNS_TYPES_H
diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h
index e3994aa0d33..a2bc40f1de7 100644
--- a/lib/dns/include/dns/update.h
+++ b/lib/dns/include/dns/update.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2015, 2016  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.
  */
 
 /* $Id: update.h,v 1.5 2011/08/30 23:46:53 tbox Exp $ */
diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index a030572e678..1f845f8c8c9 100644
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2010, 2013, 2014, 2016  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.
  */
 
 /* $Id: validator.h,v 1.46 2010/02/25 05:08:01 tbox Exp $ */
diff --git a/lib/dns/include/dns/version.h b/lib/dns/include/dns/version.h
index 4c237f036e9..f87de6387a6 100644
--- a/lib/dns/include/dns/version.h
+++ b/lib/dns/include/dns/version.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2012, 2013, 2016  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.
  */
 
 /* $Id: version.h,v 1.9.1234.1 2012/02/11 22:37:57 each Exp $ */
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 3bb4bfb0888..46cd2a777df 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2017  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.
  */
 
 #ifndef DNS_VIEW_H
diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h
index 7ebd8966cdf..4edc9ffd488 100644
--- a/lib/dns/include/dns/xfrin.h
+++ b/lib/dns/include/dns/xfrin.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2007, 2009, 2013, 2016  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.
  */
 
 /* $Id: xfrin.h,v 1.30 2009/01/17 23:47:43 tbox Exp $ */
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index fa0d30ee52d..4c6346a9171 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 #ifndef DNS_ZONE_H
diff --git a/lib/dns/include/dns/zonekey.h b/lib/dns/include/dns/zonekey.h
index 9988227f441..10da59927ce 100644
--- a/lib/dns/include/dns/zonekey.h
+++ b/lib/dns/include/dns/zonekey.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: zonekey.h,v 1.10 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
index 6b2739f0d82..0af2a1aee30 100644
--- a/lib/dns/include/dns/zt.h
+++ b/lib/dns/include/dns/zt.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2011, 2016, 2017  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.
  */
 
 /* $Id: zt.h,v 1.40 2011/09/02 23:46:32 tbox Exp $ */
diff --git a/lib/dns/include/dst/Makefile.in b/lib/dns/include/dst/Makefile.in
index 060bb13d7f9..2c0676a3bc1 100644
--- a/lib/dns/include/dst/Makefile.in
+++ b/lib/dns/include/dst/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.4 2007/12/11 20:28:55 marka Exp $
 
diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index a2d4ee68f45..53baf0bcdf9 100644
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004-2017  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.
  */
 
 #ifndef DST_DST_H
diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h
index 8e201f8157e..291cff3bc06 100644
--- a/lib/dns/include/dst/gssapi.h
+++ b/lib/dns/include/dst/gssapi.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009-2011, 2013, 2016, 2017  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.
  */
 
 /* $Id: gssapi.h,v 1.16 2011/01/08 23:47:01 tbox Exp $ */
diff --git a/lib/dns/include/dst/lib.h b/lib/dns/include/dst/lib.h
index a323ef362cb..28bb67a9821 100644
--- a/lib/dns/include/dst/lib.h
+++ b/lib/dns/include/dst/lib.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: lib.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h
index ddd656e2ee7..cb03ce04669 100644
--- a/lib/dns/include/dst/result.h
+++ b/lib/dns/include/dst/result.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2008, 2012, 2014, 2016  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.
  */
 
 /* $Id: result.h,v 1.9 2008/04/01 23:47:10 tbox Exp $ */
diff --git a/lib/dns/ipkeylist.c b/lib/dns/ipkeylist.c
index f51a2de72d3..7ae8e3670f8 100644
--- a/lib/dns/ipkeylist.c
+++ b/lib/dns/ipkeylist.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/lib/dns/iptable.c b/lib/dns/iptable.c
index e5b9b1f6bae..09323cb9ca1 100644
--- a/lib/dns/iptable.c
+++ b/lib/dns/iptable.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2007-2009, 2013, 2014, 2016, 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index e1dc62ce6cf..fd91f618aa9 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007-2011, 2013-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/key.c b/lib/dns/key.c
index 779943c5b09..543a338c65f 100644
--- a/lib/dns/key.c
+++ b/lib/dns/key.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2011, 2016  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.
  */
 
 /* $Id: key.c,v 1.11 2011/10/20 21:20:02 marka Exp $ */
diff --git a/lib/dns/keydata.c b/lib/dns/keydata.c
index 09b9dd96b71..f20c4a14da2 100644
--- a/lib/dns/keydata.c
+++ b/lib/dns/keydata.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2014, 2016  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.
  */
 
 /* $Id: keydata.c,v 1.3 2009/07/01 23:47:36 tbox Exp $ */
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index c77c160fd78..356791db6a5 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 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.
  */
 
 /* $Id: keytable.c,v 1.41 2010/06/25 23:46:51 tbox Exp $ */
diff --git a/lib/dns/lib.c b/lib/dns/lib.c
index b678fdfa76f..c6d83e94891 100644
--- a/lib/dns/lib.c
+++ b/lib/dns/lib.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2013-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/log.c b/lib/dns/log.c
index d2b5f0ab067..d777f515da6 100644
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2007, 2009, 2011-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index a80047a880a..889c802eec7 100644
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2013, 2016  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.
  */
 
 /* $Id: lookup.c,v 1.21 2007/06/18 23:47:40 tbox Exp $ */
diff --git a/lib/dns/master.c b/lib/dns/master.c
index 58435824dfb..634a2c0dffd 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2011-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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 70b0537bef8..0c17907a3d6 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2011-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.
  */
 
 /*! \file */
diff --git a/lib/dns/message.c b/lib/dns/message.c
index ef71fa16ebe..e3f2858e33e 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /*! \file */
diff --git a/lib/dns/name.c b/lib/dns/name.c
index d42543d57e1..09c1a2991b7 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 4fcaccb804e..3e4e4bf223d 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2008, 2010-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index bb6edd3b386..dc4ee21cdc8 100644
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007-2009, 2011-2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 1a8dcbc2b9e..f48c000fab5 100644
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2008-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/nta.c b/lib/dns/nta.c
index 6eb1e7d9cd9..7f2acfeaf47 100644
--- a/lib/dns/nta.c
+++ b/lib/dns/nta.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-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.
  */
 
 /*! \file */
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index e649141dadd..44536330fe0 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 1999-2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2012, 2014-2018  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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index ab2f68a935c..b8b4be6c2f1 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 1999-2002, 2004-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2002, 2004-2009, 2011-2018  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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index 4c2d3e43ef2..3d233192c21 100644
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 1999-2002, 2004-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2002, 2004-2009, 2011-2018  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/.
  *
- * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) Network Associates, 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/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c
index 9168ec2d2a7..a8941a808a6 100644
--- a/lib/dns/opensslecdsa_link.c
+++ b/lib/dns/opensslecdsa_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c
index 820b5b30c73..3ba8bce424b 100644
--- a/lib/dns/openssleddsa_link.c
+++ b/lib/dns/openssleddsa_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/opensslgost_link.c b/lib/dns/opensslgost_link.c
index a0d14dc9785..f9545117d57 100644
--- a/lib/dns/opensslgost_link.c
+++ b/lib/dns/opensslgost_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2010-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 5dddc2eda40..62a525d5df3 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2009, 2011-2017  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.
  */
 
 /*
diff --git a/lib/dns/order.c b/lib/dns/order.c
index d75588645d4..50b55f45a89 100644
--- a/lib/dns/order.c
+++ b/lib/dns/order.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2015-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index ed573d47b74..172a5122537 100644
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2009, 2012-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/pkcs11.c b/lib/dns/pkcs11.c
index 09300618b9b..1b6dccc4fd7 100644
--- a/lib/dns/pkcs11.c
+++ b/lib/dns/pkcs11.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016, 2017  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.
  */
 
 #ifdef PKCS11CRYPTO
diff --git a/lib/dns/pkcs11dh_link.c b/lib/dns/pkcs11dh_link.c
index 179b2c0b7e6..c192b53e2f5 100644
--- a/lib/dns/pkcs11dh_link.c
+++ b/lib/dns/pkcs11dh_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #ifdef PKCS11CRYPTO
diff --git a/lib/dns/pkcs11dsa_link.c b/lib/dns/pkcs11dsa_link.c
index df38e85aa17..8d0fc62b8b6 100644
--- a/lib/dns/pkcs11dsa_link.c
+++ b/lib/dns/pkcs11dsa_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #ifdef PKCS11CRYPTO
diff --git a/lib/dns/pkcs11ecdsa_link.c b/lib/dns/pkcs11ecdsa_link.c
index 26126e1270a..8f3ee4c4d67 100644
--- a/lib/dns/pkcs11ecdsa_link.c
+++ b/lib/dns/pkcs11ecdsa_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/pkcs11eddsa_link.c b/lib/dns/pkcs11eddsa_link.c
index 095bfe1a2d5..ac7f2bb0d55 100644
--- a/lib/dns/pkcs11eddsa_link.c
+++ b/lib/dns/pkcs11eddsa_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/pkcs11gost_link.c b/lib/dns/pkcs11gost_link.c
index dd4f3667cc7..55121cf9360 100644
--- a/lib/dns/pkcs11gost_link.c
+++ b/lib/dns/pkcs11gost_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c
index 861a6c0d307..d7494100f78 100644
--- a/lib/dns/pkcs11rsa_link.c
+++ b/lib/dns/pkcs11rsa_link.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/portlist.c b/lib/dns/portlist.c
index 536ca4cd16c..cc1bf720ffa 100644
--- a/lib/dns/portlist.c
+++ b/lib/dns/portlist.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2007, 2014, 2016  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.
  */
 
 /* $Id: portlist.c,v 1.13 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/private.c b/lib/dns/private.c
index 51e3d0aea1f..f700693491e 100644
--- a/lib/dns/private.c
+++ b/lib/dns/private.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011, 2012, 2015-2017  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.
  */
 
 #include "config.h"
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 262d77dd16e..ebb9218c72f 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007-2009, 2011-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.
  */
 
 /*! \file */
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 97b89dfa5f9..62ec8ca502a 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /*! \file */
diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h
index ad76b2c95ed..5fe2f540490 100644
--- a/lib/dns/rbtdb.h
+++ b/lib/dns/rbtdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rbtdb64.c b/lib/dns/rbtdb64.c
index 0fdf58ce0ec..6f4a659c9c0 100644
--- a/lib/dns/rbtdb64.c
+++ b/lib/dns/rbtdb64.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: rbtdb64.c,v 1.11 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h
index d675a76bffe..796fc664e8b 100644
--- a/lib/dns/rbtdb64.h
+++ b/lib/dns/rbtdb64.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: rbtdb64.h,v 1.17 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index aaec1afa1d0..035edf09267 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 42d4e2dc05a..38096bba06e 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index c5cacd0d6e8..9282c073f1b 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 2011, 2012, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h
index 6aba2a79226..16a2765a358 100644
--- a/lib/dns/rdata/any_255/tsig_250.h
+++ b/lib/dns/rdata/any_255/tsig_250.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: tsig_250.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c
index ac34c8ed2bd..0bf718ebc52 100644
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2009, 2014-2017  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.
  */
 
 /* $Id: a_1.c,v 1.8 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/ch_3/a_1.h b/lib/dns/rdata/ch_3/a_1.h
index e6f28aa31bd..ca0309ae4de 100644
--- a/lib/dns/rdata/ch_3/a_1.h
+++ b/lib/dns/rdata/ch_3/a_1.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2016  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.
  */
 
 /* $Id: a_1.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index ff22e994427..b72db8c7616 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007, 2009, 2014-2017  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.
  */
 
 /* $Id: afsdb_18.c,v 1.49 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h
index 82a6bc10517..13b078f150b 100644
--- a/lib/dns/rdata/generic/afsdb_18.h
+++ b/lib/dns/rdata/generic/afsdb_18.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_AFSDB_18_H
diff --git a/lib/dns/rdata/generic/avc_258.c b/lib/dns/rdata/generic/avc_258.c
index 2b683272dbf..b895c860aeb 100644
--- a/lib/dns/rdata/generic/avc_258.c
+++ b/lib/dns/rdata/generic/avc_258.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 #ifndef RDATA_GENERIC_AVC_258_C
diff --git a/lib/dns/rdata/generic/avc_258.h b/lib/dns/rdata/generic/avc_258.h
index 5700e90c29a..b5d78d008e3 100644
--- a/lib/dns/rdata/generic/avc_258.h
+++ b/lib/dns/rdata/generic/avc_258.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 #ifndef GENERIC_AVC_258_H
diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c
index 55da5883b2c..73e377033cb 100644
--- a/lib/dns/rdata/generic/caa_257.c
+++ b/lib/dns/rdata/generic/caa_257.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #ifndef GENERIC_CAA_257_C
diff --git a/lib/dns/rdata/generic/caa_257.h b/lib/dns/rdata/generic/caa_257.h
index 8f2f4295291..6283e7d30a7 100644
--- a/lib/dns/rdata/generic/caa_257.h
+++ b/lib/dns/rdata/generic/caa_257.h
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #ifndef GENERIC_CAA_257_H
diff --git a/lib/dns/rdata/generic/cdnskey_60.c b/lib/dns/rdata/generic/cdnskey_60.c
index b38ab2945b2..22dda77c121 100644
--- a/lib/dns/rdata/generic/cdnskey_60.c
+++ b/lib/dns/rdata/generic/cdnskey_60.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /* draft-ietf-dnsop-delegation-trust-maintainance-14 */
diff --git a/lib/dns/rdata/generic/cdnskey_60.h b/lib/dns/rdata/generic/cdnskey_60.h
index bd7b50fbc8a..541a4c2e2b9 100644
--- a/lib/dns/rdata/generic/cdnskey_60.h
+++ b/lib/dns/rdata/generic/cdnskey_60.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 #ifndef GENERIC_CDNSKEY_60_H
diff --git a/lib/dns/rdata/generic/cds_59.c b/lib/dns/rdata/generic/cds_59.c
index b2feba7a0b3..6e3fdeb0402 100644
--- a/lib/dns/rdata/generic/cds_59.c
+++ b/lib/dns/rdata/generic/cds_59.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /* draft-ietf-dnsop-delegation-trust-maintainance-14 */
diff --git a/lib/dns/rdata/generic/cds_59.h b/lib/dns/rdata/generic/cds_59.h
index 04f376f4ab9..0797bca0855 100644
--- a/lib/dns/rdata/generic/cds_59.h
+++ b/lib/dns/rdata/generic/cds_59.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 #ifndef GENERIC_CDS_59_H
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index aab6626b5fd..1838e38acff 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 2011, 2012, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h
index d7c717c94cb..d7047a501bb 100644
--- a/lib/dns/rdata/generic/cert_37.h
+++ b/lib/dns/rdata/generic/cert_37.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: cert_37.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index c2081c96154..b717219488b 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: cname_5.c,v 1.49 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h
index 70e8d448ef6..b65eb8e5aa2 100644
--- a/lib/dns/rdata/generic/cname_5.h
+++ b/lib/dns/rdata/generic/cname_5.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: cname_5.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/csync_62.c b/lib/dns/rdata/generic/csync_62.c
index 5e7ce04b465..eff2ef5e410 100644
--- a/lib/dns/rdata/generic/csync_62.c
+++ b/lib/dns/rdata/generic/csync_62.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 /* RFC 7477 */
diff --git a/lib/dns/rdata/generic/csync_62.h b/lib/dns/rdata/generic/csync_62.h
index 3d1f8e0ee13..98a43953736 100644
--- a/lib/dns/rdata/generic/csync_62.h
+++ b/lib/dns/rdata/generic/csync_62.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef GENERIC_CSYNC_62_H
diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c
index 79ee0e4bc5f..82d07078de2 100644
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2009-2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/dlv_32769.h b/lib/dns/rdata/generic/dlv_32769.h
index 1a2e272708c..7095dbafd17 100644
--- a/lib/dns/rdata/generic/dlv_32769.h
+++ b/lib/dns/rdata/generic/dlv_32769.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2015, 2016  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.
  */
 
 /* $Id: dlv_32769.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index fd8d2cd450e..697c353e4f4 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: dname_39.c,v 1.40 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h
index ee50f51b402..cd7fd5ee8ea 100644
--- a/lib/dns/rdata/generic/dname_39.h
+++ b/lib/dns/rdata/generic/dname_39.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_DNAME_39_H
diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index 4cdbb4ff772..0f14a6b8d2c 100644
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2005, 2007, 2009, 2011-2013, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/dnskey_48.h b/lib/dns/rdata/generic/dnskey_48.h
index 4d536bc661c..ac4a6deaf0e 100644
--- a/lib/dns/rdata/generic/dnskey_48.h
+++ b/lib/dns/rdata/generic/dnskey_48.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2005, 2007, 2015, 2016  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.
  */
 
 #ifndef GENERIC_DNSKEY_48_H
diff --git a/lib/dns/rdata/generic/doa_259.c b/lib/dns/rdata/generic/doa_259.c
index 036a1fd593d..2e5b4746e9a 100644
--- a/lib/dns/rdata/generic/doa_259.c
+++ b/lib/dns/rdata/generic/doa_259.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef RDATA_GENERIC_DOA_259_C
diff --git a/lib/dns/rdata/generic/doa_259.h b/lib/dns/rdata/generic/doa_259.h
index 730ddeebae1..9ba0bb87518 100644
--- a/lib/dns/rdata/generic/doa_259.h
+++ b/lib/dns/rdata/generic/doa_259.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef GENERIC_DOA_259_H
diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index c0ce384971c..b2d4678ec38 100644
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2009-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/ds_43.h b/lib/dns/rdata/generic/ds_43.h
index 3b174a0a45d..fdc4f524d61 100644
--- a/lib/dns/rdata/generic/ds_43.h
+++ b/lib/dns/rdata/generic/ds_43.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: ds_43.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/eui48_108.c b/lib/dns/rdata/generic/eui48_108.c
index 03cba20dcdd..6b7bb54a091 100644
--- a/lib/dns/rdata/generic/eui48_108.c
+++ b/lib/dns/rdata/generic/eui48_108.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013-2016  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.
  */
 
 #ifndef RDATA_GENERIC_EUI48_108_C
diff --git a/lib/dns/rdata/generic/eui48_108.h b/lib/dns/rdata/generic/eui48_108.h
index 4cff9dd2cca..1bb168ab7d7 100644
--- a/lib/dns/rdata/generic/eui48_108.h
+++ b/lib/dns/rdata/generic/eui48_108.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/eui64_109.c b/lib/dns/rdata/generic/eui64_109.c
index 9da897c8398..cccb49975bb 100644
--- a/lib/dns/rdata/generic/eui64_109.c
+++ b/lib/dns/rdata/generic/eui64_109.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013-2016  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.
  */
 
 #ifndef RDATA_GENERIC_EUI64_109_C
diff --git a/lib/dns/rdata/generic/eui64_109.h b/lib/dns/rdata/generic/eui64_109.h
index 6884f75ceb4..638c72e5464 100644
--- a/lib/dns/rdata/generic/eui64_109.h
+++ b/lib/dns/rdata/generic/eui64_109.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index c4bb05be3c3..90560d209f2 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2014-2016  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.
  */
 
 /* $Id: gpos_27.c,v 1.43 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h
index ecad9981e84..96153a222e9 100644
--- a/lib/dns/rdata/generic/gpos_27.h
+++ b/lib/dns/rdata/generic/gpos_27.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_GPOS_27_H
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index b3f69705cbe..848c2f981ad 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2007, 2009, 2014-2016  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.
  */
 
 /* $Id: hinfo_13.c,v 1.46 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h
index 9a348a19475..383dcfc872c 100644
--- a/lib/dns/rdata/generic/hinfo_13.h
+++ b/lib/dns/rdata/generic/hinfo_13.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2016  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.
  */
 
 #ifndef GENERIC_HINFO_13_H
diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c
index 91451cb03ca..a2d9dc64ed8 100644
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011, 2013-2017  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.
  */
 
 /* $Id: hip_55.c,v 1.8 2011/01/13 04:59:26 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/hip_55.h b/lib/dns/rdata/generic/hip_55.h
index 95051e56d88..368a9831795 100644
--- a/lib/dns/rdata/generic/hip_55.h
+++ b/lib/dns/rdata/generic/hip_55.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: hip_55.h,v 1.2 2009/02/26 06:09:19 marka Exp $ */
diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index 347985d1544..1f5acd4c255 100644
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2009, 2011, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/ipseckey_45.h b/lib/dns/rdata/generic/ipseckey_45.h
index dcaf4e7985d..7f3704133c5 100644
--- a/lib/dns/rdata/generic/ipseckey_45.h
+++ b/lib/dns/rdata/generic/ipseckey_45.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2016  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.
  */
 
 /* $Id: ipseckey_45.h,v 1.4 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 07992c8f4e2..f424150c739 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2013-2016  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.
  */
 
 /* $Id: isdn_20.c,v 1.40 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h
index b91b356965d..52a4f90abef 100644
--- a/lib/dns/rdata/generic/isdn_20.h
+++ b/lib/dns/rdata/generic/isdn_20.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_ISDN_20_H
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 10067c6dfb0..9fff142c19c 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 2011-2013, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h
index d1e14c1c5f1..edc1c6e94f2 100644
--- a/lib/dns/rdata/generic/key_25.h
+++ b/lib/dns/rdata/generic/key_25.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 #ifndef GENERIC_KEY_25_H
diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index 6ddf2890336..b0537c1197a 100644
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011-2013, 2015-2017  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.
  */
 
 #ifndef GENERIC_KEYDATA_65533_C
diff --git a/lib/dns/rdata/generic/keydata_65533.h b/lib/dns/rdata/generic/keydata_65533.h
index fe412b8ef12..903fa155d61 100644
--- a/lib/dns/rdata/generic/keydata_65533.h
+++ b/lib/dns/rdata/generic/keydata_65533.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 #ifndef GENERIC_KEYDATA_65533_H
diff --git a/lib/dns/rdata/generic/l32_105.c b/lib/dns/rdata/generic/l32_105.c
index 8e53b530be1..9ae90c4395d 100644
--- a/lib/dns/rdata/generic/l32_105.c
+++ b/lib/dns/rdata/generic/l32_105.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013-2017  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.
  */
 
 #ifndef RDATA_GENERIC_L32_105_C
diff --git a/lib/dns/rdata/generic/l32_105.h b/lib/dns/rdata/generic/l32_105.h
index bb969c5241a..404bda24d48 100644
--- a/lib/dns/rdata/generic/l32_105.h
+++ b/lib/dns/rdata/generic/l32_105.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/l64_106.c b/lib/dns/rdata/generic/l64_106.c
index b2aa62579bf..d89923335d2 100644
--- a/lib/dns/rdata/generic/l64_106.c
+++ b/lib/dns/rdata/generic/l64_106.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013-2017  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.
  */
 
 #ifndef RDATA_GENERIC_L64_106_C
diff --git a/lib/dns/rdata/generic/l64_106.h b/lib/dns/rdata/generic/l64_106.h
index 0e4af7f39ae..a9c4a78fe4e 100644
--- a/lib/dns/rdata/generic/l64_106.h
+++ b/lib/dns/rdata/generic/l64_106.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index 6e32bc0858b..e0b72514abe 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 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.
  */
 
 /* $Id: loc_29.c,v 1.50 2009/12/04 21:09:33 marka Exp $ */
diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h
index b5257a74eca..1a654c01b57 100644
--- a/lib/dns/rdata/generic/loc_29.h
+++ b/lib/dns/rdata/generic/loc_29.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_LOC_29_H
diff --git a/lib/dns/rdata/generic/lp_107.c b/lib/dns/rdata/generic/lp_107.c
index ec2a3fd3b03..41295cd084e 100644
--- a/lib/dns/rdata/generic/lp_107.c
+++ b/lib/dns/rdata/generic/lp_107.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 #ifndef RDATA_GENERIC_LP_107_C
diff --git a/lib/dns/rdata/generic/lp_107.h b/lib/dns/rdata/generic/lp_107.h
index 1fb14898ec3..1e47b27eca9 100644
--- a/lib/dns/rdata/generic/lp_107.h
+++ b/lib/dns/rdata/generic/lp_107.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index f1b91575a73..e0a5989b5b6 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: mb_7.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h
index 88b9eca4a0b..5aa2e218824 100644
--- a/lib/dns/rdata/generic/mb_7.h
+++ b/lib/dns/rdata/generic/mb_7.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 4da70d35c11..ba193257fba 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: md_3.c,v 1.49 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index ed5aa907347..f51ad1c7eda 100644
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 4f0fe19e424..38f379ab4cf 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: mf_4.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index ccb327f45ec..b571ebefd1f 100644
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 731c02180d5..891d185f695 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: mg_8.c,v 1.45 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index ba10e53fd28..f8eccda1335 100644
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index b0322aea7a3..a42ed4ca357 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: minfo_14.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index 0774a55948a..fadcbccc7c8 100644
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 154218ba48e..8a77205b6e2 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: mr_9.c,v 1.44 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index 7b1dcb3ccfe..8bab005eeec 100644
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 9fd10ee07f3..652e3044467 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2012, 2015-2017  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.
  */
 
 /* $Id: mx_15.c,v 1.58 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index 5f8a0a853fb..0a2d58e1afa 100644
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index 611ff1981b2..c533226fd8a 100644
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007-2009, 2011-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h
index 18165aa7f23..8d67072226e 100644
--- a/lib/dns/rdata/generic/naptr_35.h
+++ b/lib/dns/rdata/generic/naptr_35.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011, 2012, 2016  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.
  */
 
 #ifndef GENERIC_NAPTR_35_H
diff --git a/lib/dns/rdata/generic/nid_104.c b/lib/dns/rdata/generic/nid_104.c
index 0d09d3e8391..deafe776d3d 100644
--- a/lib/dns/rdata/generic/nid_104.c
+++ b/lib/dns/rdata/generic/nid_104.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013-2017  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.
  */
 
 #ifndef RDATA_GENERIC_NID_104_C
diff --git a/lib/dns/rdata/generic/nid_104.h b/lib/dns/rdata/generic/nid_104.h
index c5e047e4c09..8c97ae7a5ae 100644
--- a/lib/dns/rdata/generic/nid_104.h
+++ b/lib/dns/rdata/generic/nid_104.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/ninfo_56.c b/lib/dns/rdata/generic/ninfo_56.c
index cefcc29cb78..3f018197b27 100644
--- a/lib/dns/rdata/generic/ninfo_56.c
+++ b/lib/dns/rdata/generic/ninfo_56.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef RDATA_GENERIC_NINFO_56_C
diff --git a/lib/dns/rdata/generic/ninfo_56.h b/lib/dns/rdata/generic/ninfo_56.h
index 28ee856aa51..68e9212ae13 100644
--- a/lib/dns/rdata/generic/ninfo_56.h
+++ b/lib/dns/rdata/generic/ninfo_56.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 3f58bcb674d..dc9c752edd2 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: ns_2.c,v 1.48 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h
index 13e0e0e3572..f55fcb8265c 100644
--- a/lib/dns/rdata/generic/ns_2.h
+++ b/lib/dns/rdata/generic/ns_2.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index 8d9d5e94b03..e2b6645d949 100644
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2009, 2011, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/nsec3_50.h b/lib/dns/rdata/generic/nsec3_50.h
index da923006547..3dee38847a3 100644
--- a/lib/dns/rdata/generic/nsec3_50.h
+++ b/lib/dns/rdata/generic/nsec3_50.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2011, 2012, 2016  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.
  */
 
 
diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c
index 50b255eb092..f708ebdb76c 100644
--- a/lib/dns/rdata/generic/nsec3param_51.c
+++ b/lib/dns/rdata/generic/nsec3param_51.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2009, 2015-2017  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.
  */
 
 /* $Id: nsec3param_51.c,v 1.7 2009/12/04 21:09:34 marka Exp $ */
diff --git a/lib/dns/rdata/generic/nsec3param_51.h b/lib/dns/rdata/generic/nsec3param_51.h
index d9c6096991a..df772b12a28 100644
--- a/lib/dns/rdata/generic/nsec3param_51.h
+++ b/lib/dns/rdata/generic/nsec3param_51.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2016  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.
  */
 
 
diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index 55a5ff31ae2..0390cc0e68f 100644
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003, 2004, 2007-2009, 2011, 2015, 2016  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.
  */
 
 /* $Id: nsec_47.c,v 1.15 2011/01/13 04:59:26 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/nsec_47.h b/lib/dns/rdata/generic/nsec_47.h
index 7c71fe8fd77..43930e0b07f 100644
--- a/lib/dns/rdata/generic/nsec_47.h
+++ b/lib/dns/rdata/generic/nsec_47.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2005, 2007, 2008, 2016  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.
  */
 
 #ifndef GENERIC_NSEC_47_H
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index 6370d485a79..d03fff44cf8 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2007, 2009, 2011, 2012, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h
index 350c6a43fb7..24b6dd57fc7 100644
--- a/lib/dns/rdata/generic/null_10.h
+++ b/lib/dns/rdata/generic/null_10.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index 0f9ca812c42..a155af2f22a 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 2015-2017  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.
  */
 
 /* $Id: nxt_30.c,v 1.65 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index 852d5659ee2..b907ad62da2 100644
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_NXT_30_H
diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c
index 63b6d26222e..70fc0b5ff0f 100644
--- a/lib/dns/rdata/generic/openpgpkey_61.c
+++ b/lib/dns/rdata/generic/openpgpkey_61.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 #ifndef RDATA_GENERIC_OPENPGPKEY_61_C
diff --git a/lib/dns/rdata/generic/openpgpkey_61.h b/lib/dns/rdata/generic/openpgpkey_61.h
index 805b7d0da6a..610f9b5a1af 100644
--- a/lib/dns/rdata/generic/openpgpkey_61.h
+++ b/lib/dns/rdata/generic/openpgpkey_61.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef GENERIC_OPENPGPKEY_61_H
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index a124c3dd736..9826b41266d 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2005, 2007, 2009, 2011-2017  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.
  */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index 37a82dbac8e..a7318df6102 100644
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_OPT_41_H
diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index 280ed32154e..94c62a39565 100644
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: proforma.c,v 1.38 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h
index 6f9300a7768..2a69fa01d88 100644
--- a/lib/dns/rdata/generic/proforma.h
+++ b/lib/dns/rdata/generic/proforma.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 94357601bfa..131ee90c0f0 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2009, 2015-2017  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.
  */
 
 /* $Id: ptr_12.c,v 1.45 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index 1b09622fed0..0d7e7129990 100644
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/rkey_57.c b/lib/dns/rdata/generic/rkey_57.c
index fa17c2cc98e..934af826640 100644
--- a/lib/dns/rdata/generic/rkey_57.c
+++ b/lib/dns/rdata/generic/rkey_57.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef RDATA_GENERIC_RKEY_57_C
diff --git a/lib/dns/rdata/generic/rkey_57.h b/lib/dns/rdata/generic/rkey_57.h
index f22dea89490..000a725bcc5 100644
--- a/lib/dns/rdata/generic/rkey_57.h
+++ b/lib/dns/rdata/generic/rkey_57.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef GENERIC_RKEY_57_H
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 1a3fc12a9a5..d0c67c55f5e 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: rp_17.c,v 1.44 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index 63ecf9cfcfd..4c7f2243be9 100644
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_RP_17_H
diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 2071b720fa7..1718fe4a2b1 100644
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2005, 2007, 2009, 2011-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/rrsig_46.h b/lib/dns/rdata/generic/rrsig_46.h
index f2904318d25..43a4c8f359c 100644
--- a/lib/dns/rdata/generic/rrsig_46.h
+++ b/lib/dns/rdata/generic/rrsig_46.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_DNSSIG_46_H
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 376bc73f61f..666af32ef19 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007, 2009, 2014-2017  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.
  */
 
 /* $Id: rt_21.c,v 1.48 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index 27c8dc8f4dd..b9c20a9308e 100644
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_RT_21_H
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 1e02ef1711d..eaa89cd1f0b 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 2011, 2012, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h
index 1909f287539..9aee9b9db72 100644
--- a/lib/dns/rdata/generic/sig_24.h
+++ b/lib/dns/rdata/generic/sig_24.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_SIG_24_H
diff --git a/lib/dns/rdata/generic/sink_40.c b/lib/dns/rdata/generic/sink_40.c
index d6c32a4a98f..fc469bc817f 100644
--- a/lib/dns/rdata/generic/sink_40.c
+++ b/lib/dns/rdata/generic/sink_40.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 #ifndef RDATA_GENERIC_SINK_40_C
diff --git a/lib/dns/rdata/generic/sink_40.h b/lib/dns/rdata/generic/sink_40.h
index f26e65ffd5d..55031a40a3e 100644
--- a/lib/dns/rdata/generic/sink_40.h
+++ b/lib/dns/rdata/generic/sink_40.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef GENERIC_SINK_40_H
diff --git a/lib/dns/rdata/generic/smimea_53.c b/lib/dns/rdata/generic/smimea_53.c
index 7f8b894873f..a7e7954a3e9 100644
--- a/lib/dns/rdata/generic/smimea_53.c
+++ b/lib/dns/rdata/generic/smimea_53.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef RDATA_GENERIC_SMIMEA_53_C
diff --git a/lib/dns/rdata/generic/smimea_53.h b/lib/dns/rdata/generic/smimea_53.h
index 1b7ab30a73e..cabec2be77b 100644
--- a/lib/dns/rdata/generic/smimea_53.h
+++ b/lib/dns/rdata/generic/smimea_53.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef GENERIC_SMIMEA_53_H
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index e0ced8a175b..25f5e100d13 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2007, 2009, 2011, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h
index 171567775a0..5d005572782 100644
--- a/lib/dns/rdata/generic/soa_6.h
+++ b/lib/dns/rdata/generic/soa_6.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c
index a883d4665d8..22b6a9e6a30 100644
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2005, 2007, 2009, 2014-2016  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.
  */
 
 /* $Id: spf_99.c,v 1.6 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h
index 51d60664e98..02df8cf4020 100644
--- a/lib/dns/rdata/generic/spf_99.h
+++ b/lib/dns/rdata/generic/spf_99.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2014, 2016  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.
  */
 
 #ifndef GENERIC_SPF_99_H
diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c
index c0d13bec7c6..b17a81f1432 100644
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003, 2004, 2006, 2007, 2009, 2011-2013, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/sshfp_44.h b/lib/dns/rdata/generic/sshfp_44.h
index 1f6c31578bc..f153600a8e4 100644
--- a/lib/dns/rdata/generic/sshfp_44.h
+++ b/lib/dns/rdata/generic/sshfp_44.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2007, 2016  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.
  */
 
 /* $Id: sshfp_44.h,v 1.8 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/ta_32768.c b/lib/dns/rdata/generic/ta_32768.c
index 691f97ec8ca..ac9ffaf3883 100644
--- a/lib/dns/rdata/generic/ta_32768.c
+++ b/lib/dns/rdata/generic/ta_32768.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 /* http://www.watson.org/~weiler/INI1999-19.pdf */
diff --git a/lib/dns/rdata/generic/ta_32768.h b/lib/dns/rdata/generic/ta_32768.h
index da64882b916..1bd7a286633 100644
--- a/lib/dns/rdata/generic/ta_32768.h
+++ b/lib/dns/rdata/generic/ta_32768.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef GENERIC_TA_32768_H
diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c
index 4cc16d2660e..fca274bfd4f 100644
--- a/lib/dns/rdata/generic/talink_58.c
+++ b/lib/dns/rdata/generic/talink_58.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef RDATA_GENERIC_TALINK_58_C
diff --git a/lib/dns/rdata/generic/talink_58.h b/lib/dns/rdata/generic/talink_58.h
index 597e226bc3a..03166a23622 100644
--- a/lib/dns/rdata/generic/talink_58.h
+++ b/lib/dns/rdata/generic/talink_58.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 /* http://www.iana.org/assignments/dns-parameters/TALINK/talink-completed-template */
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index 8e36b30d8dc..ddd234e95d5 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2004, 2007, 2009, 2011, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h
index bbd28621555..04e74b96bfb 100644
--- a/lib/dns/rdata/generic/tkey_249.h
+++ b/lib/dns/rdata/generic/tkey_249.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_TKEY_249_H
diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c
index 6c72619b3e0..1160aca897b 100644
--- a/lib/dns/rdata/generic/tlsa_52.c
+++ b/lib/dns/rdata/generic/tlsa_52.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2014-2017  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.
  */
 
 /* rfc6698.txt */
diff --git a/lib/dns/rdata/generic/tlsa_52.h b/lib/dns/rdata/generic/tlsa_52.h
index b06c3579540..f865d2b9e1f 100644
--- a/lib/dns/rdata/generic/tlsa_52.h
+++ b/lib/dns/rdata/generic/tlsa_52.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index 98913ccb5ac..ecac8855855 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2007-2009, 2012, 2014-2016  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.
  */
 
 /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h
index 38563d98b06..dfeb8ed5417 100644
--- a/lib/dns/rdata/generic/txt_16.h
+++ b/lib/dns/rdata/generic/txt_16.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index cba8fe3ac57..871392b6bfc 100644
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: unspec_103.c,v 1.37 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h
index fbbb44da906..9fbed866e4b 100644
--- a/lib/dns/rdata/generic/unspec_103.h
+++ b/lib/dns/rdata/generic/unspec_103.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c
index c0c68d74156..fb635db6278 100644
--- a/lib/dns/rdata/generic/uri_256.c
+++ b/lib/dns/rdata/generic/uri_256.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/generic/uri_256.h b/lib/dns/rdata/generic/uri_256.h
index 0de058f2e05..8110d58d5ed 100644
--- a/lib/dns/rdata/generic/uri_256.h
+++ b/lib/dns/rdata/generic/uri_256.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 #ifndef GENERIC_URI_256_H
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index 10dc6492313..97bae8f687e 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2014-2016  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.
  */
 
 /* $Id: x25_19.c,v 1.41 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h
index f74931dc0a2..420fe40299d 100644
--- a/lib/dns/rdata/generic/x25_19.h
+++ b/lib/dns/rdata/generic/x25_19.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef GENERIC_X25_19_H
diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index c270e2f1af6..6887c81e492 100644
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2007, 2009, 2014-2016  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.
  */
 
 /* $Id: a_1.c,v 1.33 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h
index f5d67c15e1c..fb1ceaf1e8d 100644
--- a/lib/dns/rdata/hs_4/a_1.h
+++ b/lib/dns/rdata/hs_4/a_1.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index cfd4608a44c..b0b09ef3503 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2004, 2007, 2009, 2014-2017  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.
  */
 
 /* $Id: a6_38.c,v 1.56 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h
index 0932710f655..bbeb891709b 100644
--- a/lib/dns/rdata/in_1/a6_38.h
+++ b/lib/dns/rdata/in_1/a6_38.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef IN_1_A6_38_H
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index bf6896c3c00..89de1960545 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2007, 2009, 2014-2016  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.
  */
 
 /* $Id: a_1.c,v 1.55 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h
index dbdc544a329..e2418b010d2 100644
--- a/lib/dns/rdata/in_1/a_1.h
+++ b/lib/dns/rdata/in_1/a_1.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 12270c2f6bf..8ecde12bbe9 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2014-2016  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.
  */
 
 /* $Id: aaaa_28.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h
index be6ef7ed196..3607155c5a7 100644
--- a/lib/dns/rdata/in_1/aaaa_28.h
+++ b/lib/dns/rdata/in_1/aaaa_28.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef IN_1_AAAA_28_H
diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c
index 8bdd983c779..f71a33dd5f0 100644
--- a/lib/dns/rdata/in_1/apl_42.c
+++ b/lib/dns/rdata/in_1/apl_42.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007-2009, 2014-2016  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.
  */
 
 /* $Id: apl_42.c,v 1.16 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h
index 62c0d43964a..8520cdbc7d0 100644
--- a/lib/dns/rdata/in_1/apl_42.h
+++ b/lib/dns/rdata/in_1/apl_42.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index ab72b38017d..9f4e8728d21 100644
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 2009, 2011, 2012, 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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/in_1/dhcid_49.h b/lib/dns/rdata/in_1/dhcid_49.h
index f124fd69b93..8e3fc4bc31e 100644
--- a/lib/dns/rdata/in_1/dhcid_49.h
+++ b/lib/dns/rdata/in_1/dhcid_49.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 2016  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.
  */
 
 /* */
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index 7d5b990453f..96340de25cf 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007, 2009, 2015-2017  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.
  */
 
 /* $Id: kx_36.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h
index ed7c227fa5c..ba725f26ad2 100644
--- a/lib/dns/rdata/in_1/kx_36.h
+++ b/lib/dns/rdata/in_1/kx_36.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef IN_1_KX_36_H
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 3daff588b9f..0353f69a9a1 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: nsap-ptr_23.c,v 1.40 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h
index c6a2aaf0514..7e05201d45d 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.h
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef IN_1_NSAP_PTR_23_H
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 1cb634ca4cf..dfc78a6acf6 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2013, 2015-2017  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.
  */
 
 /* $Id: nsap_22.c,v 1.44 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h
index 9f92ecd26b5..23c99e39153 100644
--- a/lib/dns/rdata/in_1/nsap_22.h
+++ b/lib/dns/rdata/in_1/nsap_22.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef IN_1_NSAP_22_H
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 077c5786f3e..77f6b9fe36e 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007, 2009, 2015-2017  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.
  */
 
 /* $Id: px_26.c,v 1.45 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h
index 8ca02a63e5c..985532b7628 100644
--- a/lib/dns/rdata/in_1/px_26.h
+++ b/lib/dns/rdata/in_1/px_26.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef IN_1_PX_26_H
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 087d8e7f59f..d1adf0c6f03 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: srv_33.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h
index 1fcae13a4fc..46fb89c6696 100644
--- a/lib/dns/rdata/in_1/srv_33.h
+++ b/lib/dns/rdata/in_1/srv_33.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 #ifndef IN_1_SRV_33_H
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index d94395f9d77..3c603d96638 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2007, 2009, 2011-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h
index 551234a50f0..5ebe3e27f9e 100644
--- a/lib/dns/rdata/in_1/wks_11.h
+++ b/lib/dns/rdata/in_1/wks_11.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 #ifndef IN_1_WKS_11_H
diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h
index 7481f2d8b6b..4208772e6a0 100644
--- a/lib/dns/rdata/rdatastructpre.h
+++ b/lib/dns/rdata/rdatastructpre.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: rdatastructpre.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdata/rdatastructsuf.h b/lib/dns/rdata/rdatastructsuf.h
index cd0229f811d..3a15671ec09 100644
--- a/lib/dns/rdata/rdatastructsuf.h
+++ b/lib/dns/rdata/rdatastructsuf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: rdatastructsuf.h,v 1.10 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index ac064569a10..2e9752389d2 100644
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007, 2008, 2010-2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rdatalist_p.h b/lib/dns/rdatalist_p.h
index f95f6d0efee..969fe96b654 100644
--- a/lib/dns/rdatalist_p.h
+++ b/lib/dns/rdatalist_p.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2008, 2015, 2016  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.
  */
 
 /* $Id: rdatalist_p.h,v 1.11 2008/09/25 04:02:38 tbox Exp $ */
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index fa0540d8445..d2cb0f91f79 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2012, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c
index cd99ab01917..4c8177a6980 100644
--- a/lib/dns/rdatasetiter.c
+++ b/lib/dns/rdatasetiter.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: rdatasetiter.c,v 1.16 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index cfeaf2e2e6f..6ce2122c557 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/request.c b/lib/dns/request.c
index 0c1df422e16..4d9b989135e 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 7ba2310a7ac..a6e6f9dafc7 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /*! \file */
diff --git a/lib/dns/result.c b/lib/dns/result.c
index e3e39a8953d..e7507c53ff1 100644
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2005, 2007-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index 8cc736df58b..4427d050b5d 100644
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2008, 2010, 2012-2017  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.
  */
 
 /* $Id: rootns.c,v 1.40.476.1 2012/02/07 00:44:14 each Exp $ */
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 3ac83bfe12f..97c0a1b7a87 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 /*! \file */
diff --git a/lib/dns/rriterator.c b/lib/dns/rriterator.c
index 4054885ac35..694cc0cbde0 100644
--- a/lib/dns/rriterator.c
+++ b/lib/dns/rriterator.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011, 2012, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index 0d4e3e8a002..a6616c55502 100644
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012-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.
  */
 
 /*! \file */
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index f415bad2b83..21648e672d6 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 42cfbbda5b1..e1cf07bcee3 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -4,6 +4,9 @@
  * 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.
  */
 
 /*
diff --git a/lib/dns/soa.c b/lib/dns/soa.c
index 5f3c2199670..6a11c69b856 100644
--- a/lib/dns/soa.c
+++ b/lib/dns/soa.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2016  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.
  */
 
 /* $Id: soa.c,v 1.12 2009/09/10 02:18:40 each Exp $ */
diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index de718a94ca9..a1b8cab4412 100644
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006-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.
  */
 
 /*! \file
diff --git a/lib/dns/spnego.h b/lib/dns/spnego.h
index 65b0a6e39a6..1c057b33162 100644
--- a/lib/dns/spnego.h
+++ b/lib/dns/spnego.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 2016  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.
  */
 
 /* $Id: spnego.h,v 1.4 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/spnego_asn1.c b/lib/dns/spnego_asn1.c
index 4a5091fddcd..73180d0c49d 100644
--- a/lib/dns/spnego_asn1.c
+++ b/lib/dns/spnego_asn1.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 2012, 2013, 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.
  */
 
 /* $Id: spnego_asn1.c,v 1.4 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/spnego_asn1.pl b/lib/dns/spnego_asn1.pl
index c92fe6cb656..b8bc9a12e82 100644
--- a/lib/dns/spnego_asn1.pl
+++ b/lib/dns/spnego_asn1.pl
@@ -1,10 +1,13 @@
 #!/bin/bin/perl -w
 #
-# Copyright (C) 2006, 2007, 2012, 2016  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.
 
 # $Id: spnego_asn1.pl,v 1.4 2007/06/19 23:47:16 tbox Exp $
 
diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c
index 0dcc2446c96..ed671871166 100644
--- a/lib/dns/ssu.c
+++ b/lib/dns/ssu.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2008, 2010, 2011, 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.
  */
 
 /*! \file */
diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c
index 344c3110073..6ecf13dcbd4 100644
--- a/lib/dns/ssu_external.c
+++ b/lib/dns/ssu_external.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2013, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/stats.c b/lib/dns/stats.c
index a4ee43216f5..7cda902fa94 100644
--- a/lib/dns/stats.c
+++ b/lib/dns/stats.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2012, 2016  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.
  */
 
 /* $Id: stats.c,v 1.18 2009/01/27 23:47:54 tbox Exp $ */
diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index 3e30c106aec..050e6a01283 100644
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 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.
  */
 
 /* $Id: tcpmsg.c,v 1.31 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 8ac2f9a9132..ade4912fa39 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2011-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c
index 41b878e333f..99ff5c8c746 100644
--- a/lib/dns/tests/acl_test.c
+++ b/lib/dns/tests/acl_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
index 03ffc308233..551e09cc5f2 100644
--- a/lib/dns/tests/db_test.c
+++ b/lib/dns/tests/db_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/dbdiff_test.c b/lib/dns/tests/dbdiff_test.c
index bdfc5db7739..1acda0eded8 100644
--- a/lib/dns/tests/dbdiff_test.c
+++ b/lib/dns/tests/dbdiff_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c
index c435083fb8c..f0bab60ce7c 100644
--- a/lib/dns/tests/dbiterator_test.c
+++ b/lib/dns/tests/dbiterator_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c
index ecd99a6cd47..d49a220b07f 100644
--- a/lib/dns/tests/dbversion_test.c
+++ b/lib/dns/tests/dbversion_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2014-2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c
index 036d27a7610..03929631142 100644
--- a/lib/dns/tests/dh_test.c
+++ b/lib/dns/tests/dh_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/dispatch_test.c b/lib/dns/tests/dispatch_test.c
index 193b29f4d40..d344c78d366 100644
--- a/lib/dns/tests/dispatch_test.c
+++ b/lib/dns/tests/dispatch_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c
index 9ceee80ac41..9f9f09c297c 100644
--- a/lib/dns/tests/dnstap_test.c
+++ b/lib/dns/tests/dnstap_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 4b6079269fb..861cebb02bd 100644
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h
index f7368b88e40..3329ff5cb00 100644
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/dstrandom_test.c b/lib/dns/tests/dstrandom_test.c
index 3b517cfff1d..58577153e6a 100644
--- a/lib/dns/tests/dstrandom_test.c
+++ b/lib/dns/tests/dstrandom_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c
index 7b653bbc629..4053d6e1eff 100644
--- a/lib/dns/tests/geoip_test.c
+++ b/lib/dns/tests/geoip_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/gost_test.c b/lib/dns/tests/gost_test.c
index 0bc296b9a0b..fe15626d2c8 100644
--- a/lib/dns/tests/gost_test.c
+++ b/lib/dns/tests/gost_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c
index a34c5d653d8..ae54f9e9a69 100644
--- a/lib/dns/tests/keytable_test.c
+++ b/lib/dns/tests/keytable_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 42c1c6d9f3f..3abb6782fa1 100644
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2013, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/mkraw.pl b/lib/dns/tests/mkraw.pl
index 0fa821071ea..23ee6f69a71 100644
--- a/lib/dns/tests/mkraw.pl
+++ b/lib/dns/tests/mkraw.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2011, 2012, 2016  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.
 
 # $Id$
 
diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c
index 9d67691239b..bab9d4a0d3c 100644
--- a/lib/dns/tests/name_test.c
+++ b/lib/dns/tests/name_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c
index 3ba48768c55..e0d802c3f21 100644
--- a/lib/dns/tests/nsec3_test.c
+++ b/lib/dns/tests/nsec3_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/peer_test.c b/lib/dns/tests/peer_test.c
index 9fe610f1444..48240c071e9 100644
--- a/lib/dns/tests/peer_test.c
+++ b/lib/dns/tests/peer_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/private_test.c b/lib/dns/tests/private_test.c
index 08664b69434..e4d9bebd4e9 100644
--- a/lib/dns/tests/private_test.c
+++ b/lib/dns/tests/private_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c
index b03535fca8f..337a558de86 100644
--- a/lib/dns/tests/rbt_serialize_test.c
+++ b/lib/dns/tests/rbt_serialize_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 /* $Id: rbt_test.c,v 1.1.14.8 2012/02/10 16:24:37 ckb Exp $ */
diff --git a/lib/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c
index c7c5ac4dbf7..32718f029ce 100644
--- a/lib/dns/tests/rbt_test.c
+++ b/lib/dns/tests/rbt_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012-2017  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.
  */
 
 /* $Id: rbt_test.c,v 1.1.14.8 2012/02/10 16:24:37 ckb Exp $ */
diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c
index 7a2f87af26d..02200a47f51 100644
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 2015-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/rdataset_test.c b/lib/dns/tests/rdataset_test.c
index 899a4657926..4cee39ed111 100644
--- a/lib/dns/tests/rdataset_test.c
+++ b/lib/dns/tests/rdataset_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/rdatasetstats_test.c b/lib/dns/tests/rdatasetstats_test.c
index 5d9389adb25..5672d95bed8 100644
--- a/lib/dns/tests/rdatasetstats_test.c
+++ b/lib/dns/tests/rdatasetstats_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c
index 1fc1f1139b9..a700b5e18f0 100644
--- a/lib/dns/tests/rsa_test.c
+++ b/lib/dns/tests/rsa_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/testdata/dbiterator/zone1.data b/lib/dns/tests/testdata/dbiterator/zone1.data
index f0c51fd285b..1c1853576e7 100644
--- a/lib/dns/tests/testdata/dbiterator/zone1.data
+++ b/lib/dns/tests/testdata/dbiterator/zone1.data
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/diff/zone1.data b/lib/dns/tests/testdata/diff/zone1.data
index 1e911cfc3b9..15585b0bb8a 100644
--- a/lib/dns/tests/testdata/diff/zone1.data
+++ b/lib/dns/tests/testdata/diff/zone1.data
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/diff/zone2.data b/lib/dns/tests/testdata/diff/zone2.data
index 37ae764f250..95bdf5d19a2 100644
--- a/lib/dns/tests/testdata/diff/zone2.data
+++ b/lib/dns/tests/testdata/diff/zone2.data
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/diff/zone3.data b/lib/dns/tests/testdata/diff/zone3.data
index 6206fecb70f..9ecf156d88e 100644
--- a/lib/dns/tests/testdata/diff/zone3.data
+++ b/lib/dns/tests/testdata/diff/zone3.data
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/nsec3/1024.db b/lib/dns/tests/testdata/nsec3/1024.db
index 6dae45e0e46..fe6dbb1f814 100644
--- a/lib/dns/tests/testdata/nsec3/1024.db
+++ b/lib/dns/tests/testdata/nsec3/1024.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/nsec3/2048.db b/lib/dns/tests/testdata/nsec3/2048.db
index ef20e3aa18f..cd52a6c26ef 100644
--- a/lib/dns/tests/testdata/nsec3/2048.db
+++ b/lib/dns/tests/testdata/nsec3/2048.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/nsec3/4096.db b/lib/dns/tests/testdata/nsec3/4096.db
index d9806a517e4..1996e02e57f 100644
--- a/lib/dns/tests/testdata/nsec3/4096.db
+++ b/lib/dns/tests/testdata/nsec3/4096.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/nsec3/min-1024.db b/lib/dns/tests/testdata/nsec3/min-1024.db
index f4a67c7da5c..310bc9ad545 100644
--- a/lib/dns/tests/testdata/nsec3/min-1024.db
+++ b/lib/dns/tests/testdata/nsec3/min-1024.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/nsec3/min-2048.db b/lib/dns/tests/testdata/nsec3/min-2048.db
index 611d8cf2345..fd5fb4e96ab 100644
--- a/lib/dns/tests/testdata/nsec3/min-2048.db
+++ b/lib/dns/tests/testdata/nsec3/min-2048.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/testdata/zt/zone1.db b/lib/dns/tests/testdata/zt/zone1.db
index 348915aa96b..1d3e7cbe42d 100644
--- a/lib/dns/tests/testdata/zt/zone1.db
+++ b/lib/dns/tests/testdata/zt/zone1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2011, 2012, 2016  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.
 
 ; $Id$
 
diff --git a/lib/dns/tests/time_test.c b/lib/dns/tests/time_test.c
index e7d1b5b4199..c2b6ed029ee 100644
--- a/lib/dns/tests/time_test.c
+++ b/lib/dns/tests/time_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c
index eaba3d2861f..490eb0b73e9 100644
--- a/lib/dns/tests/tsig_test.c
+++ b/lib/dns/tests/tsig_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tests/update_test.c b/lib/dns/tests/update_test.c
index 93f7fbf04bf..36605a15aef 100644
--- a/lib/dns/tests/update_test.c
+++ b/lib/dns/tests/update_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/zonemgr_test.c b/lib/dns/tests/zonemgr_test.c
index 4451361d37e..4cad7366a49 100644
--- a/lib/dns/tests/zonemgr_test.c
+++ b/lib/dns/tests/zonemgr_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2013, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/tests/zt_test.c b/lib/dns/tests/zt_test.c
index 58a05ccd573..57fc3010d14 100644
--- a/lib/dns/tests/zt_test.c
+++ b/lib/dns/tests/zt_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/time.c b/lib/dns/time.c
index b43b872da6b..180ae0dc5ec 100644
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2005, 2007, 2009-2012, 2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/timer.c b/lib/dns/timer.c
index 8bf9fd87498..340bfe18257 100644
--- a/lib/dns/timer.c
+++ b/lib/dns/timer.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: timer.c,v 1.7 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 12d0e46f041..598bd6218e8 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2016  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c
index d77c48cec26..bc69e968ea9 100644
--- a/lib/dns/tsec.c
+++ b/lib/dns/tsec.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2010, 2016, 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 9568ec736c3..0310958e1c9 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/tsig_p.h b/lib/dns/tsig_p.h
index 58a0084c2a5..5db7b095980 100644
--- a/lib/dns/tsig_p.h
+++ b/lib/dns/tsig_p.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef DNS_TSIG_P_H
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index 06239c4dd2d..1f75daf3336 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011-2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/update.c b/lib/dns/update.c
index 08a6575d199..c7e7be0db85 100644
--- a/lib/dns/update.c
+++ b/lib/dns/update.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 #include <config.h>
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 1c5ce1ef1d3..212524e9af7 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 #include <config.h>
diff --git a/lib/dns/version.c b/lib/dns/version.c
index 370c46ff582..24b6f199ad8 100644
--- a/lib/dns/version.c
+++ b/lib/dns/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2012, 2013, 2016  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.
  */
 
 /* $Id: version.c,v 1.15.1234.1 2012/02/11 22:37:57 each Exp $ */
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 5195734b715..96ea911fb8e 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2017  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.
  */
 
 /*! \file */
diff --git a/lib/dns/win32/DLLMain.c b/lib/dns/win32/DLLMain.c
index 756642cb20c..005df49d254 100644
--- a/lib/dns/win32/DLLMain.c
+++ b/lib/dns/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
diff --git a/lib/dns/win32/version.c b/lib/dns/win32/version.c
index 8ba76b637d6..10f1d1034f7 100644
--- a/lib/dns/win32/version.c
+++ b/lib/dns/win32/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2013, 2016  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.
  */
 
 /* $Id: version.c,v 1.6 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 74f303aea63..162987100e3 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2008, 2011-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 99feed21af3..e1375b4dbe9 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-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.
  */
 
 /*! \file */
diff --git a/lib/dns/zonekey.c b/lib/dns/zonekey.c
index f9323fe72d6..89efd39f69a 100644
--- a/lib/dns/zonekey.c
+++ b/lib/dns/zonekey.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2003-2005, 2007, 2016  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.
  */
 
 /* $Id: zonekey.c,v 1.9 2007/06/19 23:47:16 tbox Exp $ */
diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 9f24591c604..830deb51be8 100644
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2011-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index 411fdd334e8..8970aad0410 100644
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012, 2014-2017  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.
 
 # $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
 
diff --git a/lib/irs/context.c b/lib/irs/context.c
index 9b9617d2797..c7077f18f7d 100644
--- a/lib/irs/context.c
+++ b/lib/irs/context.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2014, 2016  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.
  */
 
 /* $Id: context.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/dnsconf.c b/lib/irs/dnsconf.c
index 6138b834477..182f4aa9a4e 100644
--- a/lib/irs/dnsconf.c
+++ b/lib/irs/dnsconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012, 2016  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.
  */
 
 /* $Id: dnsconf.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/gai_strerror.c b/lib/irs/gai_strerror.c
index 8cda3fb5081..d42b06e3ffe 100644
--- a/lib/irs/gai_strerror.c
+++ b/lib/irs/gai_strerror.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2014, 2016  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.
  */
 
 /* $Id: gai_strerror.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c
index b4556669698..b214599d070 100644
--- a/lib/irs/getaddrinfo.c
+++ b/lib/irs/getaddrinfo.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012-2017  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.
  */
 
 /* $Id: getaddrinfo.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c
index 6e26e278fd8..f81f93f319c 100644
--- a/lib/irs/getnameinfo.c
+++ b/lib/irs/getnameinfo.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011-2014, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/lib/irs/include/Makefile.in b/lib/irs/include/Makefile.in
index d5efc7c8f21..030539f95b7 100644
--- a/lib/irs/include/Makefile.in
+++ b/lib/irs/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
 
diff --git a/lib/irs/include/irs/Makefile.in b/lib/irs/include/irs/Makefile.in
index 4bb5b3d4b9d..af65f55dd40 100644
--- a/lib/irs/include/irs/Makefile.in
+++ b/lib/irs/include/irs/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012, 2014, 2016  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.
 
 # $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
 
diff --git a/lib/irs/include/irs/context.h b/lib/irs/include/irs/context.h
index e3ef51e5184..cc9a4d2f2a0 100644
--- a/lib/irs/include/irs/context.h
+++ b/lib/irs/include/irs/context.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: context.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/include/irs/dnsconf.h b/lib/irs/include/irs/dnsconf.h
index b2a5466096a..9013378a834 100644
--- a/lib/irs/include/irs/dnsconf.h
+++ b/lib/irs/include/irs/dnsconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: dnsconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in
index 23ccbf0fd38..556fe31427f 100644
--- a/lib/irs/include/irs/netdb.h.in
+++ b/lib/irs/include/irs/netdb.h.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016, 2017  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.
  */
 
 /* $Id: netdb.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/include/irs/platform.h.in b/lib/irs/include/irs/platform.h.in
index 879788be845..d71d20214ab 100644
--- a/lib/irs/include/irs/platform.h.in
+++ b/lib/irs/include/irs/platform.h.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: platform.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/include/irs/resconf.h b/lib/irs/include/irs/resconf.h
index de42c9ccbd2..a70fe9238cf 100644
--- a/lib/irs/include/irs/resconf.h
+++ b/lib/irs/include/irs/resconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2014, 2016  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.
  */
 
 /* $Id: resconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/include/irs/types.h b/lib/irs/include/irs/types.h
index cbe9ce89b77..60244e5f94c 100644
--- a/lib/irs/include/irs/types.h
+++ b/lib/irs/include/irs/types.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: types.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/include/irs/version.h b/lib/irs/include/irs/version.h
index 08db43c0579..641e5f1f73d 100644
--- a/lib/irs/include/irs/version.h
+++ b/lib/irs/include/irs/version.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: version.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c
index ae6d8de2e52..2bfd4ae6560 100644
--- a/lib/irs/resconf.c
+++ b/lib/irs/resconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 8a85312c7bd..788c30d1fd3 100644
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c
index 0f9350860d0..7f527a83cba 100644
--- a/lib/irs/tests/resconf_test.c
+++ b/lib/irs/tests/resconf_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/irs/tests/testdata/domain.conf b/lib/irs/tests/testdata/domain.conf
index 17e7a6abb40..6aef4738708 100644
--- a/lib/irs/tests/testdata/domain.conf
+++ b/lib/irs/tests/testdata/domain.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 domain example.com
diff --git a/lib/irs/tests/testdata/nameserver-v4.conf b/lib/irs/tests/testdata/nameserver-v4.conf
index b15b6819012..871d0114b9c 100644
--- a/lib/irs/tests/testdata/nameserver-v4.conf
+++ b/lib/irs/tests/testdata/nameserver-v4.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 nameserver 10.0.0.1
diff --git a/lib/irs/tests/testdata/nameserver-v6.conf b/lib/irs/tests/testdata/nameserver-v6.conf
index 29a4b468f3e..914746271d5 100644
--- a/lib/irs/tests/testdata/nameserver-v6.conf
+++ b/lib/irs/tests/testdata/nameserver-v6.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 nameserver 2001:DB8::1
diff --git a/lib/irs/tests/testdata/options-debug.conf b/lib/irs/tests/testdata/options-debug.conf
index 2c19bc3c233..b6e14c70816 100644
--- a/lib/irs/tests/testdata/options-debug.conf
+++ b/lib/irs/tests/testdata/options-debug.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 options debug
diff --git a/lib/irs/tests/testdata/options-ndots.conf b/lib/irs/tests/testdata/options-ndots.conf
index d8327bae4e3..2f143e11d73 100644
--- a/lib/irs/tests/testdata/options-ndots.conf
+++ b/lib/irs/tests/testdata/options-ndots.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 option ndots:2
diff --git a/lib/irs/tests/testdata/options-timeout.conf b/lib/irs/tests/testdata/options-timeout.conf
index da1b9d8b82c..e211bba160d 100644
--- a/lib/irs/tests/testdata/options-timeout.conf
+++ b/lib/irs/tests/testdata/options-timeout.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 options timeout:1
diff --git a/lib/irs/tests/testdata/options-unknown.conf b/lib/irs/tests/testdata/options-unknown.conf
index d0a06c075c1..f5df6bf389a 100644
--- a/lib/irs/tests/testdata/options-unknown.conf
+++ b/lib/irs/tests/testdata/options-unknown.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 options unknown
diff --git a/lib/irs/tests/testdata/options.conf b/lib/irs/tests/testdata/options.conf
index 969395dea40..0d4dfa00013 100644
--- a/lib/irs/tests/testdata/options.conf
+++ b/lib/irs/tests/testdata/options.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 options unknown debug timeout:1 ndots:2
diff --git a/lib/irs/tests/testdata/port.conf b/lib/irs/tests/testdata/port.conf
index 6812412ee1d..04ed3e7d9c0 100644
--- a/lib/irs/tests/testdata/port.conf
+++ b/lib/irs/tests/testdata/port.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 port 5300
diff --git a/lib/irs/tests/testdata/resolv.conf b/lib/irs/tests/testdata/resolv.conf
index cd443935c65..ddf93ff440d 100644
--- a/lib/irs/tests/testdata/resolv.conf
+++ b/lib/irs/tests/testdata/resolv.conf
@@ -1,8 +1,11 @@
-# Copyright (C) 2016  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.
 
 port 5300
 nameserver 10.0.0.1
diff --git a/lib/irs/tests/testdata/search.conf b/lib/irs/tests/testdata/search.conf
index bd967cf325b..5717006b24a 100644
--- a/lib/irs/tests/testdata/search.conf
+++ b/lib/irs/tests/testdata/search.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 search example.com example.net
diff --git a/lib/irs/tests/testdata/sortlist-v4.conf b/lib/irs/tests/testdata/sortlist-v4.conf
index 49c765118c2..e903e374c47 100644
--- a/lib/irs/tests/testdata/sortlist-v4.conf
+++ b/lib/irs/tests/testdata/sortlist-v4.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 sortlist 130.155.160.0/255.255.240.0 130.155.0.0
diff --git a/lib/irs/tests/testdata/timeout.conf b/lib/irs/tests/testdata/timeout.conf
index 3e50be72af3..2b87b2528a8 100644
--- a/lib/irs/tests/testdata/timeout.conf
+++ b/lib/irs/tests/testdata/timeout.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 timeout 10
diff --git a/lib/irs/tests/testdata/unknown.conf b/lib/irs/tests/testdata/unknown.conf
index c5d5530cfa1..bfb9d7fefd5 100644
--- a/lib/irs/tests/testdata/unknown.conf
+++ b/lib/irs/tests/testdata/unknown.conf
@@ -1,7 +1,10 @@
-# Copyright (C) 2016  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.
 
 unknown directive
diff --git a/lib/irs/version.c b/lib/irs/version.c
index c0e7b3c5304..c280e128063 100644
--- a/lib/irs/version.c
+++ b/lib/irs/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: version.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/irs/win32/DLLMain.c b/lib/irs/win32/DLLMain.c
index 89b8d489852..03246be49bc 100644
--- a/lib/irs/win32/DLLMain.c
+++ b/lib/irs/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/irs/win32/Makefile.in b/lib/irs/win32/Makefile.in
index ce5cf43a7e3..f352fcf04dd 100644
--- a/lib/irs/win32/Makefile.in
+++ b/lib/irs/win32/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 # $Id$
 
diff --git a/lib/irs/win32/include/Makefile.in b/lib/irs/win32/include/Makefile.in
index 17a9ebe7a97..e1a4542888e 100644
--- a/lib/irs/win32/include/Makefile.in
+++ b/lib/irs/win32/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 # $Id$
 
diff --git a/lib/irs/win32/include/irs/Makefile.in b/lib/irs/win32/include/irs/Makefile.in
index 8659bebdaf5..7adf79c3ca7 100644
--- a/lib/irs/win32/include/irs/Makefile.in
+++ b/lib/irs/win32/include/irs/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 # $Id$
 
diff --git a/lib/irs/win32/include/irs/netdb.h b/lib/irs/win32/include/irs/netdb.h
index efc88477ad4..3fe7d399e67 100644
--- a/lib/irs/win32/include/irs/netdb.h
+++ b/lib/irs/win32/include/irs/netdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/irs/win32/include/irs/platform.h b/lib/irs/win32/include/irs/platform.h
index b290db285bf..78c91ce1447 100644
--- a/lib/irs/win32/include/irs/platform.h
+++ b/lib/irs/win32/include/irs/platform.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*! \file */
diff --git a/lib/irs/win32/version.c b/lib/irs/win32/version.c
index 85932b207ac..893545f4457 100644
--- a/lib/irs/win32/version.c
+++ b/lib/irs/win32/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 608702f4d13..0c62a99c705 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/aes.c b/lib/isc/aes.c
index 2cdcd953cbd..b1ecdf47ffe 100644
--- a/lib/isc/aes.c
+++ b/lib/isc/aes.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/alpha/Makefile.in b/lib/isc/alpha/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/alpha/Makefile.in
+++ b/lib/isc/alpha/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/alpha/include/Makefile.in b/lib/isc/alpha/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/alpha/include/Makefile.in
+++ b/lib/isc/alpha/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/alpha/include/isc/Makefile.in b/lib/isc/alpha/include/isc/Makefile.in
index 0876355a269..f164aa3c68c 100644
--- a/lib/isc/alpha/include/isc/Makefile.in
+++ b/lib/isc/alpha/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/alpha/include/isc/atomic.h b/lib/isc/alpha/include/isc/atomic.h
index e99ab7faf1d..a01d39e3cb7 100644
--- a/lib/isc/alpha/include/isc/atomic.h
+++ b/lib/isc/alpha/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2009, 2016  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.
  */
 
 /* $Id: atomic.h,v 1.7 2009/04/08 06:48:23 tbox Exp $ */
diff --git a/lib/isc/app_api.c b/lib/isc/app_api.c
index c52c0c9183f..12dfa484297 100644
--- a/lib/isc/app_api.c
+++ b/lib/isc/app_api.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2013-2016  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.
  */
 
 /* $Id: app_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index 37e7bdac14f..db4a31ab538 100644
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1997-2001, 2004, 2005, 2007-2009, 2015, 2016  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.
  */
 
 /* $Id: assertions.c,v 1.26 2009/09/29 15:06:07 fdupont Exp $ */
diff --git a/lib/isc/backtrace-emptytbl.c b/lib/isc/backtrace-emptytbl.c
index dd0bd2acd99..d7dea914315 100644
--- a/lib/isc/backtrace-emptytbl.c
+++ b/lib/isc/backtrace-emptytbl.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: backtrace-emptytbl.c,v 1.3 2009/09/01 20:13:44 each Exp $ */
diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c
index 1f7cd570bd2..62c1d814458 100644
--- a/lib/isc/backtrace.c
+++ b/lib/isc/backtrace.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2013-2016  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.
  */
 
 /* $Id: backtrace.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/isc/base32.c b/lib/isc/base32.c
index b001df80c09..da0f82a5185 100644
--- a/lib/isc/base32.c
+++ b/lib/isc/base32.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2009, 2013-2016  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.
  */
 
 /* $Id: base32.c,v 1.6.698.1 2012/02/15 05:00:16 marka Exp $ */
diff --git a/lib/isc/base64.c b/lib/isc/base64.c
index 53bc9103462..ac4f031a774 100644
--- a/lib/isc/base64.c
+++ b/lib/isc/base64.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2013-2016  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.
  */
 
 /* $Id: base64.c,v 1.34 2009/10/21 23:48:05 tbox Exp $ */
diff --git a/lib/isc/bind9.c b/lib/isc/bind9.c
index 15a5c2a03de..868d1087f86 100644
--- a/lib/isc/bind9.c
+++ b/lib/isc/bind9.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /*! \file */
diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index 8c635da7855..3e24a27b273 100644
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004-2008, 2012, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c
index f25bd962ede..d259e8506b7 100644
--- a/lib/isc/bufferlist.c
+++ b/lib/isc/bufferlist.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: bufferlist.c,v 1.17 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c
index 7ea67913d3e..22bf58315d7 100644
--- a/lib/isc/commandline.c
+++ b/lib/isc/commandline.c
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 1999-2001, 2004, 2005, 2007, 2008, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2001, 2004, 2005, 2007, 2008, 2014-2016, 2018  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.
  */
 
 /*
diff --git a/lib/isc/counter.c b/lib/isc/counter.c
index 749dcba89a6..be7a62f7402 100644
--- a/lib/isc/counter.c
+++ b/lib/isc/counter.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*! \file */
diff --git a/lib/isc/crc64.c b/lib/isc/crc64.c
index 8e762cccaf8..43434ffd736 100644
--- a/lib/isc/crc64.c
+++ b/lib/isc/crc64.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 #include "config.h"
diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c
index 173bd681d23..57d0a545381 100644
--- a/lib/isc/entropy.c
+++ b/lib/isc/entropy.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2007, 2009, 2010, 2014-2017  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.
  */
 
 /* $Id: entropy.c,v 1.22 2010/08/10 23:48:19 tbox Exp $ */
diff --git a/lib/isc/error.c b/lib/isc/error.c
index f5f38552d2c..efc436a1b43 100644
--- a/lib/isc/error.c
+++ b/lib/isc/error.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2015, 2016  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.
  */
 
 /* $Id: error.c,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/event.c b/lib/isc/event.c
index e1175256f1a..b4ecee131be 100644
--- a/lib/isc/event.c
+++ b/lib/isc/event.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2014, 2016, 2017  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.
  */
 
 /* $Id: event.c,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/fsaccess.c b/lib/isc/fsaccess.c
index a674e21b801..525fb2d2a0c 100644
--- a/lib/isc/fsaccess.c
+++ b/lib/isc/fsaccess.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016, 2017  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.
  */
 
 /* $Id: fsaccess.c,v 1.10 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/hash.c b/lib/isc/hash.c
index 7f76020e17a..593c8e96712 100644
--- a/lib/isc/hash.c
+++ b/lib/isc/hash.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2007, 2009, 2013-2017  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.
  */
 
 /*! \file
diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index 878bfed1068..f694053dc77 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1997-2001, 2004-2007, 2010-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/hex.c b/lib/isc/hex.c
index dec60bd267b..351ca8ceb9e 100644
--- a/lib/isc/hex.c
+++ b/lib/isc/hex.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2005, 2007, 2008, 2013-2016  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.
  */
 
 /* $Id: hex.c,v 1.20 2008/09/25 04:02:39 tbox Exp $ */
diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 8f8e7390b9d..fb526b3b1ff 100644
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 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.
  */
 
 /*! \file
diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c
index 8486bcf783b..b919d2c158b 100644
--- a/lib/isc/hmacsha.c
+++ b/lib/isc/hmacsha.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005-2007, 2009, 2011-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.
  */
 
 /*
diff --git a/lib/isc/ht.c b/lib/isc/ht.c
index b9aaa689cf2..afb5fcbc683 100644
--- a/lib/isc/ht.c
+++ b/lib/isc/ht.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
index b8971a4a574..a5626874cf9 100644
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006-2008, 2010-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/ia64/Makefile.in b/lib/isc/ia64/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/ia64/Makefile.in
+++ b/lib/isc/ia64/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/ia64/include/Makefile.in b/lib/isc/ia64/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/ia64/include/Makefile.in
+++ b/lib/isc/ia64/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/ia64/include/isc/Makefile.in b/lib/isc/ia64/include/isc/Makefile.in
index 0876355a269..f164aa3c68c 100644
--- a/lib/isc/ia64/include/isc/Makefile.in
+++ b/lib/isc/ia64/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/ia64/include/isc/atomic.h b/lib/isc/ia64/include/isc/atomic.h
index e609f756528..000f6e92ecf 100644
--- a/lib/isc/ia64/include/isc/atomic.h
+++ b/lib/isc/ia64/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 2009, 2012, 2016  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.
  */
 
 /* $Id: atomic.h,v 1.7 2009/06/24 02:22:50 marka Exp $ */
diff --git a/lib/isc/include/Makefile.in b/lib/isc/include/Makefile.in
index 92aa125071d..b92f7081d6d 100644
--- a/lib/isc/include/Makefile.in
+++ b/lib/isc/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2014, 2016  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.
 
 # $Id: Makefile.in,v 1.13 2007/06/19 23:47:18 tbox Exp $
 
diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 95b8eaffaf0..11682cd06d6 100644
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2003-2009, 2012-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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/include/isc/aes.h b/lib/isc/include/isc/aes.h
index f355b5db5d0..57a1c1d3f12 100644
--- a/lib/isc/include/isc/aes.h
+++ b/lib/isc/include/isc/aes.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h
index 70826d1e313..c7a4dace697 100644
--- a/lib/isc/include/isc/app.h
+++ b/lib/isc/include/isc/app.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2013-2016  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.
  */
 
 /* $Id: app.h,v 1.11 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 18bf7faac30..9c2635fc1f1 100644
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1997-2001, 2004-2009, 2016, 2017  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.
  */
 
 /*
diff --git a/lib/isc/include/isc/backtrace.h b/lib/isc/include/isc/backtrace.h
index 4dad0773428..02d85a5f921 100644
--- a/lib/isc/include/isc/backtrace.h
+++ b/lib/isc/include/isc/backtrace.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: backtrace.h,v 1.2 2009/09/01 18:40:25 jinmei Exp $ */
diff --git a/lib/isc/include/isc/base32.h b/lib/isc/include/isc/base32.h
index 31b34473dd5..96fe2cef21f 100644
--- a/lib/isc/include/isc/base32.h
+++ b/lib/isc/include/isc/base32.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2014, 2016  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.
  */
 
 #ifndef ISC_BASE32_H
diff --git a/lib/isc/include/isc/base64.h b/lib/isc/include/isc/base64.h
index a0cd30afea3..c8660ab5d6d 100644
--- a/lib/isc/include/isc/base64.h
+++ b/lib/isc/include/isc/base64.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: base64.h,v 1.22 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/bind9.h b/lib/isc/include/isc/bind9.h
index 672b9f8c11e..b2492bdaa8f 100644
--- a/lib/isc/include/isc/bind9.h
+++ b/lib/isc/include/isc/bind9.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2013, 2016  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.
  */
 
 /* $Id: bind9.h,v 1.2 2009/12/05 23:31:41 each Exp $ */
diff --git a/lib/isc/include/isc/boolean.h b/lib/isc/include/isc/boolean.h
index 6cbe18e7ad8..ead4565e308 100644
--- a/lib/isc/include/isc/boolean.h
+++ b/lib/isc/include/isc/boolean.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: boolean.h,v 1.19 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index bf908b179e4..8eb7791a09f 100644
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004-2008, 2010, 2012, 2014, 2016, 2017  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.
  */
 
 #ifndef ISC_BUFFER_H
diff --git a/lib/isc/include/isc/bufferlist.h b/lib/isc/include/isc/bufferlist.h
index 62cf04a76e4..09208885f35 100644
--- a/lib/isc/include/isc/bufferlist.h
+++ b/lib/isc/include/isc/bufferlist.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: bufferlist.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index 821c507df6d..a51dc9a993c 100644
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/counter.h b/lib/isc/include/isc/counter.h
index de5a1fdfcf9..28d9c794c6e 100644
--- a/lib/isc/include/isc/counter.h
+++ b/lib/isc/include/isc/counter.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef ISC_COUNTER_H
diff --git a/lib/isc/include/isc/crc64.h b/lib/isc/include/isc/crc64.h
index a010c93207d..2371dfe5ec5 100644
--- a/lib/isc/include/isc/crc64.h
+++ b/lib/isc/include/isc/crc64.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 #ifndef ISC_CRC64_H
diff --git a/lib/isc/include/isc/deprecated.h b/lib/isc/include/isc/deprecated.h
index b82d92e5935..d485e20caf1 100644
--- a/lib/isc/include/isc/deprecated.h
+++ b/lib/isc/include/isc/deprecated.h
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 
diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h
index 0793c566aeb..2d373630aea 100644
--- a/lib/isc/include/isc/entropy.h
+++ b/lib/isc/include/isc/entropy.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2016, 2017  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.
  */
 
 #ifndef ISC_ENTROPY_H
diff --git a/lib/isc/include/isc/errno.h b/lib/isc/include/isc/errno.h
index 47ec90f553c..7777b8d30d2 100644
--- a/lib/isc/include/isc/errno.h
+++ b/lib/isc/include/isc/errno.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 #ifndef ISC_ERRNO_H
diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index f808f6d4efd..bd785403d71 100644
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004-2007, 2009, 2016, 2017  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.
  */
 
 /* $Id: error.h,v 1.22 2009/09/29 23:48:04 tbox Exp $ */
diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index f2003890272..0bc2c7c4c09 100644
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004-2007, 2014, 2016, 2017  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.
  */
 
 /* $Id: event.h,v 1.34 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/eventclass.h b/lib/isc/include/isc/eventclass.h
index 0e3352b5c22..b37750e5907 100644
--- a/lib/isc/include/isc/eventclass.h
+++ b/lib/isc/include/isc/eventclass.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016, 2017  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.
  */
 
 /* $Id: eventclass.h,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 370b60b1616..fc7a71f57ec 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2011, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h
index e47aa0c9adf..6778bc6854f 100644
--- a/lib/isc/include/isc/formatcheck.h
+++ b/lib/isc/include/isc/formatcheck.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: formatcheck.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h
index 873920aaecf..3d4ed7785aa 100644
--- a/lib/isc/include/isc/fsaccess.h
+++ b/lib/isc/include/isc/fsaccess.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: fsaccess.h,v 1.16 2009/01/17 23:47:43 tbox Exp $ */
diff --git a/lib/isc/include/isc/fuzz.h b/lib/isc/include/isc/fuzz.h
index 4ff33e3b882..48dabe947a3 100644
--- a/lib/isc/include/isc/fuzz.h
+++ b/lib/isc/include/isc/fuzz.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef ISC_FUZZ_H
diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h
index 12993dd79bf..e78a2155ab5 100644
--- a/lib/isc/include/isc/hash.h
+++ b/lib/isc/include/isc/hash.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2007, 2009, 2013-2017  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.
  */
 
 #ifndef ISC_HASH_H
diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index 3271406562a..589232ce030 100644
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1997-2001, 2004-2007, 2009, 2012, 2016  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.
  */
 
 /* $Id: heap.h,v 1.26 2009/01/17 23:47:43 tbox Exp $ */
diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h
index 97006355190..22999521c38 100644
--- a/lib/isc/include/isc/hex.h
+++ b/lib/isc/include/isc/hex.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2008, 2016  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.
  */
 
 /* $Id: hex.h,v 1.13 2008/09/25 04:02:39 tbox Exp $ */
diff --git a/lib/isc/include/isc/hmacmd5.h b/lib/isc/include/isc/hmacmd5.h
index 63305db0d3b..31195e3a0ba 100644
--- a/lib/isc/include/isc/hmacmd5.h
+++ b/lib/isc/include/isc/hmacmd5.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-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.
  */
 
 /* $Id: hmacmd5.h,v 1.14 2009/02/06 23:47:42 tbox Exp $ */
diff --git a/lib/isc/include/isc/hmacsha.h b/lib/isc/include/isc/hmacsha.h
index 8d17039ed7f..78588c32f09 100644
--- a/lib/isc/include/isc/hmacsha.h
+++ b/lib/isc/include/isc/hmacsha.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005-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.
  */
 
 /* $Id: hmacsha.h,v 1.9 2009/02/06 23:47:42 tbox Exp $ */
diff --git a/lib/isc/include/isc/ht.h b/lib/isc/include/isc/ht.h
index 0f9c2b79dc0..45a2f553942 100644
--- a/lib/isc/include/isc/ht.h
+++ b/lib/isc/include/isc/ht.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 /* ! \file */
diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h
index 402be558156..7d93c4ceecd 100644
--- a/lib/isc/include/isc/httpd.h
+++ b/lib/isc/include/isc/httpd.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006-2008, 2014, 2016  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.
  */
 
 /* $Id: httpd.h,v 1.9 2008/08/08 05:06:49 marka Exp $ */
diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h
index 12b1b876ef9..7f5d184244c 100644
--- a/lib/isc/include/isc/interfaceiter.h
+++ b/lib/isc/include/isc/interfaceiter.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: interfaceiter.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h
index 74f0979436a..52b60f63f07 100644
--- a/lib/isc/include/isc/ipv6.h
+++ b/lib/isc/include/isc/ipv6.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2016, 2017  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.
  */
 
 #ifndef ISC_IPV6_H
diff --git a/lib/isc/include/isc/iterated_hash.h b/lib/isc/include/isc/iterated_hash.h
index db5dad1c19d..0491d5ed462 100644
--- a/lib/isc/include/isc/iterated_hash.h
+++ b/lib/isc/include/isc/iterated_hash.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2014, 2016  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.
  */
 
 /* $Id: iterated_hash.h,v 1.3 2008/09/25 04:02:39 tbox Exp $ */
diff --git a/lib/isc/include/isc/json.h b/lib/isc/include/isc/json.h
index b4b10ff6985..52295e61994 100644
--- a/lib/isc/include/isc/json.h
+++ b/lib/isc/include/isc/json.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015, 2016  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.
  */
 
 #ifndef ISC_JSON_H
diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h
index 9882c3a1d49..cfae1f9b5a1 100644
--- a/lib/isc/include/isc/lang.h
+++ b/lib/isc/include/isc/lang.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: lang.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h
index 161d47337e6..51f23c1e417 100644
--- a/lib/isc/include/isc/lex.h
+++ b/lib/isc/include/isc/lex.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2005, 2007, 2008, 2015-2017  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.
  */
 
 /* $Id: lex.h,v 1.37 2008/05/30 23:47:01 tbox Exp $ */
diff --git a/lib/isc/include/isc/lfsr.h b/lib/isc/include/isc/lfsr.h
index f9d38b83663..d2d46874c2e 100644
--- a/lib/isc/include/isc/lfsr.h
+++ b/lib/isc/include/isc/lfsr.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: lfsr.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h
index 6a5dd147bac..e40552b75a8 100644
--- a/lib/isc/include/isc/lib.h
+++ b/lib/isc/include/isc/lib.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: lib.h,v 1.16 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isc/include/isc/likely.h b/lib/isc/include/isc/likely.h
index 14161a2d90d..8cc5b2eb4b7 100644
--- a/lib/isc/include/isc/likely.h
+++ b/lib/isc/include/isc/likely.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef ISC_LIKELY_H
diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index c3b162f3f80..6bbdd4c0849 100644
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1997-2002, 2004, 2006, 2007, 2011-2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 04c595393d6..8b3eee0b6c1 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009, 2014, 2016, 2017  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.
  */
 
 /* $Id: log.h,v 1.59 2009/02/16 02:01:16 marka Exp $ */
diff --git a/lib/isc/include/isc/magic.h b/lib/isc/include/isc/magic.h
index 9fc0b147400..fef2915b233 100644
--- a/lib/isc/include/isc/magic.h
+++ b/lib/isc/include/isc/magic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016, 2017  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.
  */
 
 /* $Id: magic.h,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
index 4d3f470a413..f5ab832d1c2 100644
--- a/lib/isc/include/isc/md5.h
+++ b/lib/isc/include/isc/md5.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2009, 2010, 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.
  */
 
 /* $Id: md5.h,v 1.20 2010/01/07 23:48:54 tbox Exp $ */
diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 3d396a4a149..d2f2fcf1c0d 100644
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1997-2001, 2004-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.
  */
 
 #ifndef ISC_MEM_H
diff --git a/lib/isc/include/isc/meminfo.h b/lib/isc/include/isc/meminfo.h
index 0460943c8ee..44c1323f52a 100644
--- a/lib/isc/include/isc/meminfo.h
+++ b/lib/isc/include/isc/meminfo.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #ifndef ISC_MEMINFO_H
diff --git a/lib/isc/include/isc/msgcat.h b/lib/isc/include/isc/msgcat.h
index 9633decf089..e51b9e4a009 100644
--- a/lib/isc/include/isc/msgcat.h
+++ b/lib/isc/include/isc/msgcat.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: msgcat.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/msgs.h b/lib/isc/include/isc/msgs.h
index 92dbfebd771..b737444a34f 100644
--- a/lib/isc/include/isc/msgs.h
+++ b/lib/isc/include/isc/msgs.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2009, 2016, 2017  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.
  */
 
 /* $Id: msgs.h,v 1.19 2009/10/01 23:48:08 tbox Exp $ */
diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h
index 893900fc4f9..c66b74d6679 100644
--- a/lib/isc/include/isc/mutexblock.h
+++ b/lib/isc/include/isc/mutexblock.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: mutexblock.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index 86cf6da2b48..b21845ab0b5 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004-2007, 2009, 2015-2017  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.
  */
 
 /* $Id: netaddr.h,v 1.37 2009/01/17 23:47:43 tbox Exp $ */
diff --git a/lib/isc/include/isc/netscope.h b/lib/isc/include/isc/netscope.h
index 5986239cff8..57f4b6f46ef 100644
--- a/lib/isc/include/isc/netscope.h
+++ b/lib/isc/include/isc/netscope.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: netscope.h,v 1.13 2009/06/25 23:48:02 tbox Exp $ */
diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h
index 8c52c381c81..e4eb485b385 100644
--- a/lib/isc/include/isc/os.h
+++ b/lib/isc/include/isc/os.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: os.h,v 1.12 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/parseint.h b/lib/isc/include/isc/parseint.h
index 9ef3514e63d..d4067ccc573 100644
--- a/lib/isc/include/isc/parseint.h
+++ b/lib/isc/include/isc/parseint.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2002, 2004-2007, 2016  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.
  */
 
 /* $Id: parseint.h,v 1.9 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index ef9b255e626..41613ec33c7 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2010, 2013-2017  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.
  */
 
 #ifndef ISC_PLATFORM_H
diff --git a/lib/isc/include/isc/pool.h b/lib/isc/include/isc/pool.h
index 3c589011e7b..a648312a677 100644
--- a/lib/isc/include/isc/pool.h
+++ b/lib/isc/include/isc/pool.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 #ifndef ISC_OBJPOOL_H
diff --git a/lib/isc/include/isc/portset.h b/lib/isc/include/isc/portset.h
index fd6aefb8bce..f5e6c739b1b 100644
--- a/lib/isc/include/isc/portset.h
+++ b/lib/isc/include/isc/portset.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2009, 2016  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.
  */
 
 /* $Id: portset.h,v 1.6 2009/06/25 05:28:34 marka Exp $ */
diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h
index 5eb61470217..303bd445b72 100644
--- a/lib/isc/include/isc/print.h
+++ b/lib/isc/include/isc/print.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2007, 2014-2016  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.
  */
 
 #ifndef ISC_PRINT_H
diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h
index 414ed5fe991..c5e797d487a 100644
--- a/lib/isc/include/isc/queue.h
+++ b/lib/isc/include/isc/queue.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index d36451a68f2..1c53ab301e8 100644
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: quota.h,v 1.16 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/radix.h b/lib/isc/include/isc/radix.h
index 2e5d6e7bc5e..131a865d5bb 100644
--- a/lib/isc/include/isc/radix.h
+++ b/lib/isc/include/isc/radix.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2007, 2008, 2013, 2014, 2016  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.
  */
 
 /*
diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h
index c60e56d2030..324e848d726 100644
--- a/lib/isc/include/isc/random.h
+++ b/lib/isc/include/isc/random.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2014, 2016, 2017  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.
  */
 
 #ifndef ISC_RANDOM_H
diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h
index 9cc4111142a..a6ae6faabeb 100644
--- a/lib/isc/include/isc/ratelimiter.h
+++ b/lib/isc/include/isc/ratelimiter.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2007, 2009, 2014, 2016  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.
  */
 
 /* $Id: ratelimiter.h,v 1.23 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index 705cf12f949..b099df52a93 100644
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2003-2007, 2009, 2016, 2017  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.
  */
 
 /* $Id: refcount.h,v 1.17 2009/09/29 23:48:04 tbox Exp $ */
diff --git a/lib/isc/include/isc/regex.h b/lib/isc/include/isc/regex.h
index b9915f00ef8..cab10c1fda7 100644
--- a/lib/isc/include/isc/regex.h
+++ b/lib/isc/include/isc/regex.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 #ifndef ISC_REGEX_H
diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h
index af379795c6f..d55b924d331 100644
--- a/lib/isc/include/isc/region.h
+++ b/lib/isc/include/isc/region.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004-2007, 2013, 2016  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.
  */
 
 /* $Id: region.h,v 1.25 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h
index 4c615d6dbd0..12e4402d4c8 100644
--- a/lib/isc/include/isc/resource.h
+++ b/lib/isc/include/isc/resource.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2008, 2016  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.
  */
 
 /* $Id: resource.h,v 1.13 2008/07/11 23:47:09 tbox Exp $ */
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index 42e58ce3ac0..9eb53d913cf 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2009, 2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h
index 08bfe32536d..c5781d7d5f1 100644
--- a/lib/isc/include/isc/resultclass.h
+++ b/lib/isc/include/isc/resultclass.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2014, 2016  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.
  */
 
 /* $Id: resultclass.h,v 1.20 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h
index 3cc29046ee6..68a2b9979af 100644
--- a/lib/isc/include/isc/rwlock.h
+++ b/lib/isc/include/isc/rwlock.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2007, 2016, 2017  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.
  */
 
 /* $Id: rwlock.h,v 1.28 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/safe.h b/lib/isc/include/isc/safe.h
index af2c4592079..1f8c9352e73 100644
--- a/lib/isc/include/isc/safe.h
+++ b/lib/isc/include/isc/safe.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h
index 4a9ced56c62..721c1fbf80e 100644
--- a/lib/isc/include/isc/serial.h
+++ b/lib/isc/include/isc/serial.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: serial.h,v 1.18 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/include/isc/sha1.h b/lib/isc/include/isc/sha1.h
index 4eb28f79e9c..97f3cf84e44 100644
--- a/lib/isc/include/isc/sha1.h
+++ b/lib/isc/include/isc/sha1.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-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.
  */
 
 #ifndef ISC_SHA1_H
diff --git a/lib/isc/include/isc/sha2.h b/lib/isc/include/isc/sha2.h
index 3c51820cb71..d7e967e0593 100644
--- a/lib/isc/include/isc/sha2.h
+++ b/lib/isc/include/isc/sha2.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005-2007, 2009, 2014, 2016, 2017  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.
  */
 
 /* $Id: sha2.h,v 1.12 2009/10/22 02:21:31 each Exp $ */
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 18cd06a048e..ce1fb5df615 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2007, 2009, 2012, 2015, 2016  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.
  */
 
 /* $Id: sockaddr.h,v 1.57 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index a980da5590a..a5033c3ede5 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004-2009, 2011-2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/stats.h b/lib/isc/include/isc/stats.h
index 48cfb4ec755..818031ea548 100644
--- a/lib/isc/include/isc/stats.h
+++ b/lib/isc/include/isc/stats.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h
index 671f76ce451..d167ab219c1 100644
--- a/lib/isc/include/isc/stdio.h
+++ b/lib/isc/include/isc/stdio.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2013, 2016  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.
  */
 
 /* $Id: stdio.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/stdlib.h b/lib/isc/include/isc/stdlib.h
index 2e633c29bf4..875491af600 100644
--- a/lib/isc/include/isc/stdlib.h
+++ b/lib/isc/include/isc/stdlib.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2007, 2016  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.
  */
 
 /* $Id: stdlib.h,v 1.8 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h
index 4ef3bc59af7..43e6af63e13 100644
--- a/lib/isc/include/isc/string.h
+++ b/lib/isc/include/isc/string.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2007, 2014, 2016  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.
  */
 
 /* $Id: string.h,v 1.23 2007/09/13 04:48:16 each Exp $ */
diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index e8fdd1f6833..cc0d8a92910 100644
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1996-2001, 2004-2007, 2009, 2011-2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 5aa3282f9b9..73089d000b7 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2007, 2009-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/taskpool.h b/lib/isc/include/isc/taskpool.h
index 2fd2f240f0f..957b215a6cd 100644
--- a/lib/isc/include/isc/taskpool.h
+++ b/lib/isc/include/isc/taskpool.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index 14f09f1d97d..19b8f1274a6 100644
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004-2009, 2012-2014, 2016  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.
  */
 
 /* $Id: timer.h,v 1.43 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isc/include/isc/tm.h b/lib/isc/include/isc/tm.h
index 8e4a59e96c0..b6f520cfd9f 100644
--- a/lib/isc/include/isc/tm.h
+++ b/lib/isc/include/isc/tm.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef ISC_TM_H
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 5bcd517629f..3793cb99c7b 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2012-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.
  */
 
 #ifndef ISC_TYPES_H
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 4796dba9e99..332dc0c2b9b 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004-2007, 2010-2012, 2015-2017  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.
  */
 
 #ifndef ISC_UTIL_H
diff --git a/lib/isc/include/isc/version.h b/lib/isc/include/isc/version.h
index 92c623fc48b..d92971c61e1 100644
--- a/lib/isc/include/isc/version.h
+++ b/lib/isc/include/isc/version.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: version.h,v 1.9 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/isc/xml.h b/lib/isc/include/isc/xml.h
index e51677bea3b..4df2bb70227 100644
--- a/lib/isc/include/isc/xml.h
+++ b/lib/isc/include/isc/xml.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2007, 2016  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.
  */
 
 /* $Id: xml.h,v 1.4 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/include/pk11/Makefile.in b/lib/isc/include/pk11/Makefile.in
index 6a4f051cf7d..041c53bd033 100644
--- a/lib/isc/include/pk11/Makefile.in
+++ b/lib/isc/include/pk11/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014-2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/include/pk11/README.site b/lib/isc/include/pk11/README.site
index 34e41df7bd3..30328f40778 100644
--- a/lib/isc/include/pk11/README.site
+++ b/lib/isc/include/pk11/README.site
@@ -1,9 +1,12 @@
-Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2016-2018  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.
+
 How to use site.h for the PKCS#11 provider of your HSM
 ------------------------------------------------------
 
diff --git a/lib/isc/include/pk11/constants.h b/lib/isc/include/pk11/constants.h
index c9c3cbb8528..720bca5da25 100644
--- a/lib/isc/include/pk11/constants.h
+++ b/lib/isc/include/pk11/constants.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/pk11/internal.h b/lib/isc/include/pk11/internal.h
index 7918964385d..90b8e7d369a 100644
--- a/lib/isc/include/pk11/internal.h
+++ b/lib/isc/include/pk11/internal.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/include/pk11/pk11.h b/lib/isc/include/pk11/pk11.h
index b0d587ec988..b7263398588 100644
--- a/lib/isc/include/pk11/pk11.h
+++ b/lib/isc/include/pk11/pk11.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef PK11_PK11_H
diff --git a/lib/isc/include/pk11/result.h b/lib/isc/include/pk11/result.h
index 6226c5f5ede..cce91503217 100644
--- a/lib/isc/include/pk11/result.h
+++ b/lib/isc/include/pk11/result.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #ifndef PK11_RESULT_H
diff --git a/lib/isc/include/pk11/site.h b/lib/isc/include/pk11/site.h
index b037383926a..1d97dbb0a19 100644
--- a/lib/isc/include/pk11/site.h
+++ b/lib/isc/include/pk11/site.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 /* The documentation about this file is in README.site */
diff --git a/lib/isc/include/pkcs11/Makefile.in b/lib/isc/include/pkcs11/Makefile.in
index f0c5b4205c3..ebaf7f7b207 100644
--- a/lib/isc/include/pkcs11/Makefile.in
+++ b/lib/isc/include/pkcs11/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014-2017  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.
 
 # $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
 
diff --git a/lib/isc/include/pkcs11/eddsa.h b/lib/isc/include/pkcs11/eddsa.h
index 9f82158aaba..c0b2e9cdab7 100644
--- a/lib/isc/include/pkcs11/eddsa.h
+++ b/lib/isc/include/pkcs11/eddsa.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef _EDDSA_H_
diff --git a/lib/isc/inet_aton.c b/lib/isc/inet_aton.c
index 8ed22d14a4b..02d451c26a7 100644
--- a/lib/isc/inet_aton.c
+++ b/lib/isc/inet_aton.c
@@ -1,9 +1,12 @@
 /*
- * Portions Copyright (C) 1996-2001, 2004, 2005, 2007, 2008, 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996-2001, 2004, 2005, 2007, 2008, 2012-2014, 2016-2018  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.
  */
 
 /*
diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c
index eeb236c5e77..68285447c42 100644
--- a/lib/isc/inet_ntop.c
+++ b/lib/isc/inet_ntop.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1996-2001, 2004, 2005, 2007, 2009, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c
index ba8770d2ce4..5b2eb9b512d 100644
--- a/lib/isc/inet_pton.c
+++ b/lib/isc/inet_pton.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1996-2005, 2007, 2013, 2014, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/iterated_hash.c b/lib/isc/iterated_hash.c
index 4e7501fd797..4848395ce7d 100644
--- a/lib/isc/iterated_hash.c
+++ b/lib/isc/iterated_hash.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2006, 2008, 2009, 2016  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.
  */
 
 /* $Id: iterated_hash.c,v 1.6 2009/02/18 23:47:48 tbox Exp $ */
diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index a1ef62b0fc5..ae8d453960a 100644
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2005, 2007, 2013-2017  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.
  */
 
 /* $Id: lex.c,v 1.86 2007/09/17 09:56:29 shane Exp $ */
diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c
index e4dd49cd607..31d140bb05d 100644
--- a/lib/isc/lfsr.c
+++ b/lib/isc/lfsr.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: lfsr.c,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index 9991093c2a1..f816d445a8d 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2013-2016  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.
  */
 
 /* $Id: lib.c,v 1.16 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/isc/log.c b/lib/isc/log.c
index c92b19f9d07..224e6653ce1 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2007, 2009, 2011-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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/md5.c b/lib/isc/md5.c
index 6644b25e83c..d384fea1004 100644
--- a/lib/isc/md5.c
+++ b/lib/isc/md5.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2014-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.
  */
 
 /* $Id: md5.c,v 1.16 2009/02/06 23:47:42 tbox Exp $ */
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index da1769c0918..21b7a0f07a0 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1997-2010, 2012-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.
  */
 
 /*! \file */
diff --git a/lib/isc/mips/Makefile.in b/lib/isc/mips/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/mips/Makefile.in
+++ b/lib/isc/mips/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/mips/include/Makefile.in b/lib/isc/mips/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/mips/include/Makefile.in
+++ b/lib/isc/mips/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/mips/include/isc/Makefile.in b/lib/isc/mips/include/isc/Makefile.in
index 0876355a269..f164aa3c68c 100644
--- a/lib/isc/mips/include/isc/Makefile.in
+++ b/lib/isc/mips/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/mips/include/isc/atomic.h b/lib/isc/mips/include/isc/atomic.h
index 1cc4793c62f..b905380dfdf 100644
--- a/lib/isc/mips/include/isc/atomic.h
+++ b/lib/isc/mips/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2016  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.
  */
 
 /* $Id: atomic.h,v 1.3 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c
index af74eaa20d4..d9d5e4b2ef6 100644
--- a/lib/isc/mutexblock.c
+++ b/lib/isc/mutexblock.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 483d240fbd5..6d4dd40245c 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2010-2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/netscope.c b/lib/isc/netscope.c
index aa7fc070513..39d86099037 100644
--- a/lib/isc/netscope.c
+++ b/lib/isc/netscope.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004-2007, 2016  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.
  */
 
 /*! \file */
diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in
index c35cf6e6d9f..9baf0751ce3 100644
--- a/lib/isc/nls/Makefile.in
+++ b/lib/isc/nls/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2009, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.17 2009/12/05 23:31:41 each Exp $
 
diff --git a/lib/isc/nls/msgcat.c b/lib/isc/nls/msgcat.c
index 7ba86e8353f..60b7aaee275 100644
--- a/lib/isc/nls/msgcat.c
+++ b/lib/isc/nls/msgcat.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: msgcat.c,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/noatomic/Makefile.in b/lib/isc/noatomic/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/noatomic/Makefile.in
+++ b/lib/isc/noatomic/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/noatomic/include/Makefile.in b/lib/isc/noatomic/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/noatomic/include/Makefile.in
+++ b/lib/isc/noatomic/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/noatomic/include/isc/Makefile.in b/lib/isc/noatomic/include/isc/Makefile.in
index 0876355a269..f164aa3c68c 100644
--- a/lib/isc/noatomic/include/isc/Makefile.in
+++ b/lib/isc/noatomic/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/noatomic/include/isc/atomic.h b/lib/isc/noatomic/include/isc/atomic.h
index f0796171c2f..4bbdc5822e3 100644
--- a/lib/isc/noatomic/include/isc/atomic.h
+++ b/lib/isc/noatomic/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2016  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.
  */
 
 /* $Id: atomic.h,v 1.4 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in
index 14985369658..a37a6e70022 100644
--- a/lib/isc/nothreads/Makefile.in
+++ b/lib/isc/nothreads/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2010, 2012, 2013, 2016  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.
 
 # $Id: Makefile.in,v 1.12 2010/06/09 23:50:58 tbox Exp $
 
diff --git a/lib/isc/nothreads/condition.c b/lib/isc/nothreads/condition.c
index 6b896fc5c3e..63e51ccad92 100644
--- a/lib/isc/nothreads/condition.c
+++ b/lib/isc/nothreads/condition.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2016  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.
  */
 
 /* $Id: condition.c,v 1.10 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/nothreads/include/Makefile.in b/lib/isc/nothreads/include/Makefile.in
index 75d24debedf..e29f6445eea 100644
--- a/lib/isc/nothreads/include/Makefile.in
+++ b/lib/isc/nothreads/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.5 2007/06/19 23:47:18 tbox Exp $
 
diff --git a/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in
index 7f09cebe4c4..fe9e8fd196b 100644
--- a/lib/isc/nothreads/include/isc/Makefile.in
+++ b/lib/isc/nothreads/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.7 2007/06/19 23:47:18 tbox Exp $
 
diff --git a/lib/isc/nothreads/include/isc/condition.h b/lib/isc/nothreads/include/isc/condition.h
index bd899138921..bc6d7f430f5 100644
--- a/lib/isc/nothreads/include/isc/condition.h
+++ b/lib/isc/nothreads/include/isc/condition.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: condition.h,v 1.6 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/nothreads/include/isc/mutex.h b/lib/isc/nothreads/include/isc/mutex.h
index f749b56bcf6..a9c55f6f7d7 100644
--- a/lib/isc/nothreads/include/isc/mutex.h
+++ b/lib/isc/nothreads/include/isc/mutex.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2015, 2016  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.
  */
 
 #ifndef ISC_MUTEX_H
diff --git a/lib/isc/nothreads/include/isc/once.h b/lib/isc/nothreads/include/isc/once.h
index a62fb9b7422..11eaed70249 100644
--- a/lib/isc/nothreads/include/isc/once.h
+++ b/lib/isc/nothreads/include/isc/once.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: once.h,v 1.6 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/nothreads/include/isc/thread.h b/lib/isc/nothreads/include/isc/thread.h
index c4ca050c434..18cd0d07fbf 100644
--- a/lib/isc/nothreads/include/isc/thread.h
+++ b/lib/isc/nothreads/include/isc/thread.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2017  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.
  */
 
 /* $Id: thread.h,v 1.6 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/nothreads/mutex.c b/lib/isc/nothreads/mutex.c
index eab19c804e4..200658fdab9 100644
--- a/lib/isc/nothreads/mutex.c
+++ b/lib/isc/nothreads/mutex.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2016  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.
  */
 
 /* $Id: mutex.c,v 1.10 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/nothreads/thread.c b/lib/isc/nothreads/thread.c
index 48e17c23a01..88c3e9ad1d8 100644
--- a/lib/isc/nothreads/thread.c
+++ b/lib/isc/nothreads/thread.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  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.
  */
 
 /* $Id: thread.c,v 1.5 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/parseint.c b/lib/isc/parseint.c
index 51354593433..3dac4308333 100644
--- a/lib/isc/parseint.c
+++ b/lib/isc/parseint.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-2005, 2007, 2012, 2016  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.
  */
 
 /* $Id: parseint.c,v 1.8 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index 57448855002..a0e5a7030c4 100644
--- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/pk11_result.c b/lib/isc/pk11_result.c
index 518d3d9d8dd..33143f89c2c 100644
--- a/lib/isc/pk11_result.c
+++ b/lib/isc/pk11_result.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/pool.c b/lib/isc/pool.c
index 05dc9161118..05d7754baf0 100644
--- a/lib/isc/pool.c
+++ b/lib/isc/pool.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/portset.c b/lib/isc/portset.c
index c7208548edf..5d75bc19ee3 100644
--- a/lib/isc/portset.c
+++ b/lib/isc/portset.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2008, 2016, 2017  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.
  */
 
 /* $Id: portset.c,v 1.4 2008/06/24 23:24:35 marka Exp $ */
diff --git a/lib/isc/powerpc/Makefile.in b/lib/isc/powerpc/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/powerpc/Makefile.in
+++ b/lib/isc/powerpc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/powerpc/include/Makefile.in b/lib/isc/powerpc/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/powerpc/include/Makefile.in
+++ b/lib/isc/powerpc/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/powerpc/include/isc/Makefile.in b/lib/isc/powerpc/include/isc/Makefile.in
index 0876355a269..f164aa3c68c 100644
--- a/lib/isc/powerpc/include/isc/Makefile.in
+++ b/lib/isc/powerpc/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/powerpc/include/isc/atomic.h b/lib/isc/powerpc/include/isc/atomic.h
index bc8ecdfb3db..24a68af396c 100644
--- a/lib/isc/powerpc/include/isc/atomic.h
+++ b/lib/isc/powerpc/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2009, 2011, 2012, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/print.c b/lib/isc/print.c
index 76f954b650e..55843c4d9dd 100644
--- a/lib/isc/print.c
+++ b/lib/isc/print.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2008, 2010, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in
index 1a716aceae0..ff328955bfc 100644
--- a/lib/isc/pthreads/Makefile.in
+++ b/lib/isc/pthreads/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2009, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.22 2009/12/05 23:31:41 each Exp $
 
diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c
index 34a77e08994..2ecbb823cb7 100644
--- a/lib/isc/pthreads/condition.c
+++ b/lib/isc/pthreads/condition.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2012, 2016  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.
  */
 
 /* $Id: condition.c,v 1.36 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/pthreads/include/Makefile.in b/lib/isc/pthreads/include/Makefile.in
index fbf1fc62874..2170c767c18 100644
--- a/lib/isc/pthreads/include/Makefile.in
+++ b/lib/isc/pthreads/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.14 2007/06/19 23:47:18 tbox Exp $
 
diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index cf308664c61..ab9de0d2cce 100644
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.16 2007/06/19 23:47:18 tbox Exp $
 
diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h
index 8763bd9b107..c6791324466 100644
--- a/lib/isc/pthreads/include/isc/condition.h
+++ b/lib/isc/pthreads/include/isc/condition.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: condition.h,v 1.26 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index 555d101f199..22e35b72549 100644
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: mutex.h,v 1.30 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/pthreads/include/isc/once.h b/lib/isc/pthreads/include/isc/once.h
index 67e9436d31e..39987055f28 100644
--- a/lib/isc/pthreads/include/isc/once.h
+++ b/lib/isc/pthreads/include/isc/once.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: once.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index 30b79c9d611..13e308ead08 100644
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2013, 2016, 2017  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.
  */
 
 /* $Id: thread.h,v 1.26 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
index ac39c7a6aa6..8bb9f7d6bab 100644
--- a/lib/isc/pthreads/mutex.c
+++ b/lib/isc/pthreads/mutex.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007, 2008, 2011, 2012, 2014-2016  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.
  */
 
 /* $Id: mutex.c,v 1.18 2011/01/04 23:47:14 tbox Exp $ */
diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index c07b35976da..32911a780a0 100644
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 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.
  */
 
 /* $Id: thread.c,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/quota.c b/lib/isc/quota.c
index 04a922eb35e..190186fd6e0 100644
--- a/lib/isc/quota.c
+++ b/lib/isc/quota.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: quota.c,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index 415a660dfd4..e51800a1e5a 100644
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2007-2009, 2011-2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/random.c b/lib/isc/random.c
index f0ff9cfbfb1..c6415789e89 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 2013, 2014, 2016, 2017  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.
  */
 
 /*%
diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c
index fb188842bec..742af12d999 100644
--- a/lib/isc/ratelimiter.c
+++ b/lib/isc/ratelimiter.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2012, 2014-2017  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.
  */
 
 /* $Id: ratelimiter.c,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/refcount.c b/lib/isc/refcount.c
index e5820f497ef..409809f2a4e 100644
--- a/lib/isc/refcount.c
+++ b/lib/isc/refcount.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2016, 2017  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.
  */
 
 /* $Id: refcount.c,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/regex.c b/lib/isc/regex.c
index 4eeab5f0e2e..bbe6ed40870 100644
--- a/lib/isc/regex.c
+++ b/lib/isc/regex.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2014.2015, 2015, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/region.c b/lib/isc/region.c
index 00bbdd9cf98..73644f71191 100644
--- a/lib/isc/region.c
+++ b/lib/isc/region.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: region.c,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/result.c b/lib/isc/result.c
index 702c5db7cc6..23ff2099ead 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2008, 2012, 2014-2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 030f3757437..b4b962c7f91 100644
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2011, 2012, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/safe.c b/lib/isc/safe.c
index aaf9cc93fe4..5c9e1e2d137 100644
--- a/lib/isc/safe.c
+++ b/lib/isc/safe.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/serial.c b/lib/isc/serial.c
index 327197e5eb7..fb6611f7a85 100644
--- a/lib/isc/serial.c
+++ b/lib/isc/serial.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: serial.c,v 1.12 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index fbc5c703809..3314c4ee296 100644
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2009, 2011, 2012, 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.
  */
 
 /*	$NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $	*/
diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c
index e67fcf887f2..50d87158ed7 100644
--- a/lib/isc/sha2.c
+++ b/lib/isc/sha2.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005-2007, 2009, 2011, 2012, 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.
  */
 
 /*	$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $	*/
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 04e2f7f63d8..5bd405016eb 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2007, 2010-2012, 2014-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c
index 78158c7426a..d6248c42f94 100644
--- a/lib/isc/socket_api.c
+++ b/lib/isc/socket_api.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2011-2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/sparc64/Makefile.in b/lib/isc/sparc64/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/sparc64/Makefile.in
+++ b/lib/isc/sparc64/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/sparc64/include/Makefile.in b/lib/isc/sparc64/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/sparc64/include/Makefile.in
+++ b/lib/isc/sparc64/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/sparc64/include/isc/Makefile.in b/lib/isc/sparc64/include/isc/Makefile.in
index 0eac5078481..3d49e79d827 100644
--- a/lib/isc/sparc64/include/isc/Makefile.in
+++ b/lib/isc/sparc64/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/sparc64/include/isc/atomic.h b/lib/isc/sparc64/include/isc/atomic.h
index c9e50fb0a2f..0aea98f91e1 100644
--- a/lib/isc/sparc64/include/isc/atomic.h
+++ b/lib/isc/sparc64/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2013, 2016  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.
  */
 
 /* $Id: atomic.h,v 1.5 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/stats.c b/lib/isc/stats.c
index 2a8b165ece2..a43eca22006 100644
--- a/lib/isc/stats.c
+++ b/lib/isc/stats.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/string.c b/lib/isc/string.c
index 2501d6c864b..eab78c20b03 100644
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2003-2007, 2011, 2012, 2014-2016  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.
  */
 
 /*
diff --git a/lib/isc/strtoul.c b/lib/isc/strtoul.c
index d376fdb52e3..293008112ce 100644
--- a/lib/isc/strtoul.c
+++ b/lib/isc/strtoul.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2005, 2007, 2014, 2016  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.
  */
 
 /*
diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index 9e8643fa361..0fcfb169377 100644
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1996-2001, 2004, 2005, 2007, 2011-2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 2fe636972fa..63e9154d4e3 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-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.
  */
 
 /*! \file
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index 7fc2547b5f3..c769f77d2d1 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011-2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 7714d797479..bd8626e7ed2 100644
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2011-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index d943ba7efbb..e407f77ea7f 100644
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/buffer_test.c b/lib/isc/tests/buffer_test.c
index 054e7fddc0e..0c17eb63afa 100644
--- a/lib/isc/tests/buffer_test.c
+++ b/lib/isc/tests/buffer_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/counter_test.c b/lib/isc/tests/counter_test.c
index 2daf6ec5261..d24557241cd 100644
--- a/lib/isc/tests/counter_test.c
+++ b/lib/isc/tests/counter_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c
index 253a857d6c5..e45bdd8035c 100644
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/file_test.c b/lib/isc/tests/file_test.c
index 3b5c54e49bc..3dadb52c5a2 100644
--- a/lib/isc/tests/file_test.c
+++ b/lib/isc/tests/file_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016, 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
index 5b8a374827a..18759903be1 100644
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 /* ! \file */
diff --git a/lib/isc/tests/heap_test.c b/lib/isc/tests/heap_test.c
index a34b5c46f2f..d6490aad333 100644
--- a/lib/isc/tests/heap_test.c
+++ b/lib/isc/tests/heap_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /* ! \file */
diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c
index 618f29ea7e1..c64b1edfede 100644
--- a/lib/isc/tests/ht_test.c
+++ b/lib/isc/tests/ht_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016, 2017  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.
  */
 
 /* ! \file */
diff --git a/lib/isc/tests/inet_ntop_test.c b/lib/isc/tests/inet_ntop_test.c
index 400e7a26089..2bfe9deb957 100644
--- a/lib/isc/tests/inet_ntop_test.c
+++ b/lib/isc/tests/inet_ntop_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c
index 03a31720b41..29c50d7e44f 100644
--- a/lib/isc/tests/isctest.c
+++ b/lib/isc/tests/isctest.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/isctest.h b/lib/isc/tests/isctest.h
index 96c49b93ebe..caf1c3c7492 100644
--- a/lib/isc/tests/isctest.h
+++ b/lib/isc/tests/isctest.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/lex_test.c b/lib/isc/tests/lex_test.c
index 3462a753880..1315022634d 100644
--- a/lib/isc/tests/lex_test.c
+++ b/lib/isc/tests/lex_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/mem_test.c b/lib/isc/tests/mem_test.c
index 0184d685768..f5515098183 100644
--- a/lib/isc/tests/mem_test.c
+++ b/lib/isc/tests/mem_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/netaddr_test.c b/lib/isc/tests/netaddr_test.c
index 767bb324734..ecd80f3c866 100644
--- a/lib/isc/tests/netaddr_test.c
+++ b/lib/isc/tests/netaddr_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 /* ! \file */
diff --git a/lib/isc/tests/parse_test.c b/lib/isc/tests/parse_test.c
index 898039a5a31..7f7f4ad3302 100644
--- a/lib/isc/tests/parse_test.c
+++ b/lib/isc/tests/parse_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/pool_test.c b/lib/isc/tests/pool_test.c
index 5d101c152e2..45ad3dee20a 100644
--- a/lib/isc/tests/pool_test.c
+++ b/lib/isc/tests/pool_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/print_test.c b/lib/isc/tests/print_test.c
index d6f3a38cf0e..dbbeb0f6199 100644
--- a/lib/isc/tests/print_test.c
+++ b/lib/isc/tests/print_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/queue_test.c b/lib/isc/tests/queue_test.c
index 6f228b632bb..388aa873b11 100644
--- a/lib/isc/tests/queue_test.c
+++ b/lib/isc/tests/queue_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/radix_test.c b/lib/isc/tests/radix_test.c
index 0c1331ae268..a89e6cc2939 100644
--- a/lib/isc/tests/radix_test.c
+++ b/lib/isc/tests/radix_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/random_test.c b/lib/isc/tests/random_test.c
index b75f9ab2cf2..5c8b051b0ab 100644
--- a/lib/isc/tests/random_test.c
+++ b/lib/isc/tests/random_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014-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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/regex_test.c b/lib/isc/tests/regex_test.c
index 7e3b7028851..b5e88b31f4e 100644
--- a/lib/isc/tests/regex_test.c
+++ b/lib/isc/tests/regex_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/result_test.c b/lib/isc/tests/result_test.c
index a2a9e67a143..cfaabb325f6 100644
--- a/lib/isc/tests/result_test.c
+++ b/lib/isc/tests/result_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c
index b1dca67e374..90d3ac578c6 100644
--- a/lib/isc/tests/safe_test.c
+++ b/lib/isc/tests/safe_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/sockaddr_test.c b/lib/isc/tests/sockaddr_test.c
index d5d73880716..98cb68d8fbf 100644
--- a/lib/isc/tests/sockaddr_test.c
+++ b/lib/isc/tests/sockaddr_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2012, 2015-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c
index df101c56992..750ad2d703b 100644
--- a/lib/isc/tests/socket_test.c
+++ b/lib/isc/tests/socket_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-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.
  */
 
 /*! \file */
diff --git a/lib/isc/tests/symtab_test.c b/lib/isc/tests/symtab_test.c
index 0032639b77a..db412136ab8 100644
--- a/lib/isc/tests/symtab_test.c
+++ b/lib/isc/tests/symtab_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011-2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c
index 657e3a6cc95..029009e0e90 100644
--- a/lib/isc/tests/task_test.c
+++ b/lib/isc/tests/task_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016, 2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/tests/taskpool_test.c b/lib/isc/tests/taskpool_test.c
index d4230843ebd..e019468d035 100644
--- a/lib/isc/tests/taskpool_test.c
+++ b/lib/isc/tests/taskpool_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/tests/time_test.c b/lib/isc/tests/time_test.c
index 984a83d0288..3dba8c3bf9d 100644
--- a/lib/isc/tests/time_test.c
+++ b/lib/isc/tests/time_test.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 490b32abfe4..91d2cd57ee3 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2005, 2007-2009, 2011-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/timer_p.h b/lib/isc/timer_p.h
index 6a6753860dd..9a37675134c 100644
--- a/lib/isc/timer_p.h
+++ b/lib/isc/timer_p.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2016, 2017  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.
  */
 
 #ifndef ISC_TIMER_P_H
diff --git a/lib/isc/tm.c b/lib/isc/tm.c
index f4f65b49bff..c39039663d3 100644
--- a/lib/isc/tm.c
+++ b/lib/isc/tm.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /*-
diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index 42299a76db0..bdd7bfd6509 100644
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2009, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index d1352fb4c57..118729e9ab4 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007-2009, 2013-2017  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.
  */
 
 /*! \file */
diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index a810bdac5f2..829ca7b2dcb 100644
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007-2009, 2011, 2012, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 5942031577e..847dacdf7c2 100644
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2008, 2012, 2016, 2017  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.
  */
 
 /* $Id: entropy.c,v 1.82 2008/12/01 23:47:45 tbox Exp $ */
diff --git a/lib/isc/unix/errno.c b/lib/isc/unix/errno.c
index c5f1c56736c..7104c26515d 100644
--- a/lib/isc/unix/errno.c
+++ b/lib/isc/unix/errno.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 /*! \file */
diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
index f69087b2cbd..e6c438d304e 100644
--- a/lib/isc/unix/errno2result.c
+++ b/lib/isc/unix/errno2result.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007, 2011-2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/unix/errno2result.h b/lib/isc/unix/errno2result.h
index 68d0756bac7..2fff9f29255 100644
--- a/lib/isc/unix/errno2result.h
+++ b/lib/isc/unix/errno2result.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2011, 2012, 2016  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.
  */
 
 #ifndef UNIX_ERRNO2RESULT_H
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index c7ea8c4d143..0f305b57a3a 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2011-2017  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.
  */
 
 /*
diff --git a/lib/isc/unix/fsaccess.c b/lib/isc/unix/fsaccess.c
index eba4094968f..abe568f506c 100644
--- a/lib/isc/unix/fsaccess.c
+++ b/lib/isc/unix/fsaccess.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: fsaccess.c,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c
index 7bfdaa5d67a..af6b971167e 100644
--- a/lib/isc/unix/ifiter_getifaddrs.c
+++ b/lib/isc/unix/ifiter_getifaddrs.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2003-2005, 2007-2009, 2014, 2016  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.
  */
 
 /* $Id: ifiter_getifaddrs.c,v 1.13 2009/09/24 23:48:13 tbox Exp $ */
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index cd1becd5c3f..6b6ab8ac34b 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2009, 2014-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.
  */
 
 /* $Id: ifiter_ioctl.c,v 1.62 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index 8365e49c53e..b0945cdd943 100644
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2014-2016  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.
  */
 
 /* $Id: ifiter_sysctl.c,v 1.25 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/unix/include/Makefile.in b/lib/isc/unix/include/Makefile.in
index 078ab1e3ff4..81703f09f76 100644
--- a/lib/isc/unix/include/Makefile.in
+++ b/lib/isc/unix/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2014, 2016  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.
 
 # $Id: Makefile.in,v 1.14 2007/06/19 23:47:18 tbox Exp $
 
diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 9f108665cf5..deff70ef573 100644
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012-2016  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.
 
 # $Id: Makefile.in,v 1.30 2007/06/19 23:47:19 tbox Exp $
 
diff --git a/lib/isc/unix/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h
index 87e9b0156a2..1d691be36f2 100644
--- a/lib/isc/unix/include/isc/dir.h
+++ b/lib/isc/unix/include/isc/dir.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: dir.h,v 1.21 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/int.h b/lib/isc/unix/include/isc/int.h
index 1b4a3181582..fdf4d18a2db 100644
--- a/lib/isc/unix/include/isc/int.h
+++ b/lib/isc/unix/include/isc/int.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 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.
  */
 
 /* $Id: int.h,v 1.16 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/keyboard.h b/lib/isc/unix/include/isc/keyboard.h
index 7147dbdacf7..c04e791c9c5 100644
--- a/lib/isc/unix/include/isc/keyboard.h
+++ b/lib/isc/unix/include/isc/keyboard.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: keyboard.h,v 1.11 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 66f59cfeb04..3dd792bef06 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2008, 2012-2014, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/unix/include/isc/netdb.h b/lib/isc/unix/include/isc/netdb.h
index a3e49607cb0..43f45c4d5f6 100644
--- a/lib/isc/unix/include/isc/netdb.h
+++ b/lib/isc/unix/include/isc/netdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: netdb.h,v 1.11 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h
index d63ae99f9f3..72e079635f5 100644
--- a/lib/isc/unix/include/isc/offset.h
+++ b/lib/isc/unix/include/isc/offset.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2008, 2016  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.
  */
 
 /* $Id: offset.h,v 1.17 2008/12/01 23:47:45 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/stat.h b/lib/isc/unix/include/isc/stat.h
index a4459f1b1ea..85957d25e3e 100644
--- a/lib/isc/unix/include/isc/stat.h
+++ b/lib/isc/unix/include/isc/stat.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2004, 2007, 2014, 2016  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.
  */
 
 /* $Id: stat.h,v 1.5 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h
index 8d97c603f92..cdefa95d805 100644
--- a/lib/isc/unix/include/isc/stdtime.h
+++ b/lib/isc/unix/include/isc/stdtime.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/unix/include/isc/strerror.h b/lib/isc/unix/include/isc/strerror.h
index d2a2d1b52eb..43578bb0679 100644
--- a/lib/isc/unix/include/isc/strerror.h
+++ b/lib/isc/unix/include/isc/strerror.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2008, 2016  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.
  */
 
 /* $Id: strerror.h,v 1.10 2008/12/01 23:47:45 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/syslog.h b/lib/isc/unix/include/isc/syslog.h
index c50a9269b39..667927f6da9 100644
--- a/lib/isc/unix/include/isc/syslog.h
+++ b/lib/isc/unix/include/isc/syslog.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: syslog.h,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index e088bd143c3..e12bc08e411 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004-2009, 2012, 2014-2017  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.
  */
 
 /* $Id: time.h,v 1.40 2009/01/05 23:47:54 tbox Exp $ */
diff --git a/lib/isc/unix/include/pkcs11/Makefile.in b/lib/isc/unix/include/pkcs11/Makefile.in
index bb31f49cf36..24470ed5c4f 100644
--- a/lib/isc/unix/include/pkcs11/Makefile.in
+++ b/lib/isc/unix/include/pkcs11/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 # $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $
 
diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index 330545ae0c8..6ab0eddee66 100644
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2008, 2014, 2016, 2017  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.
  */
 
 /* $Id: interfaceiter.c,v 1.45 2008/12/01 03:51:47 marka Exp $ */
diff --git a/lib/isc/unix/ipv6.c b/lib/isc/unix/ipv6.c
index dab261999e4..94cc187a8bb 100644
--- a/lib/isc/unix/ipv6.c
+++ b/lib/isc/unix/ipv6.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2016  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.
  */
 
 /* $Id: ipv6.c,v 1.14 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/unix/keyboard.c b/lib/isc/unix/keyboard.c
index a6b163f66a6..b95ae1086b2 100644
--- a/lib/isc/unix/keyboard.c
+++ b/lib/isc/unix/keyboard.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: keyboard.c,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/unix/meminfo.c b/lib/isc/unix/meminfo.c
index 7706841b8b4..f788c7855da 100644
--- a/lib/isc/unix/meminfo.c
+++ b/lib/isc/unix/meminfo.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index dcf6e9ff7b7..c7f24ad3f97 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2008, 2012-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c
index c8e90e420e0..dce2123656f 100644
--- a/lib/isc/unix/os.c
+++ b/lib/isc/unix/os.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: os.c,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/unix/pk11_api.c b/lib/isc/unix/pk11_api.c
index ca07a4c6626..7b23075ada3 100644
--- a/lib/isc/unix/pk11_api.c
+++ b/lib/isc/unix/pk11_api.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c
index e7837478efb..9975a541aec 100644
--- a/lib/isc/unix/resource.c
+++ b/lib/isc/unix/resource.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007-2009, 2016  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.
  */
 
 /* $Id: resource.c,v 1.23 2009/02/13 23:48:14 tbox Exp $ */
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 51478e0b75f..39cdd19d219 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-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.
  */
 
 /*! \file */
diff --git a/lib/isc/unix/socket_p.h b/lib/isc/unix/socket_p.h
index 4ff479e0e54..acd7297178a 100644
--- a/lib/isc/unix/socket_p.h
+++ b/lib/isc/unix/socket_p.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2016  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.
  */
 
 /* $Id: socket_p.h,v 1.15 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index 23e1d03afc1..40085670972 100644
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011-2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/unix/stdtime.c b/lib/isc/unix/stdtime.c
index c9e403a52aa..d7917ef3990 100644
--- a/lib/isc/unix/stdtime.c
+++ b/lib/isc/unix/stdtime.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: stdtime.c,v 1.19 2007/06/19 23:47:18 tbox Exp $ */
diff --git a/lib/isc/unix/strerror.c b/lib/isc/unix/strerror.c
index 056901a8745..2cbb6fe68ef 100644
--- a/lib/isc/unix/strerror.c
+++ b/lib/isc/unix/strerror.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2009, 2016  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.
  */
 
 /* $Id: strerror.c,v 1.10 2009/02/16 23:48:04 tbox Exp $ */
diff --git a/lib/isc/unix/syslog.c b/lib/isc/unix/syslog.c
index 65e91634cd1..bc845c6c1cf 100644
--- a/lib/isc/unix/syslog.c
+++ b/lib/isc/unix/syslog.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: syslog.c,v 1.8 2007/09/13 04:45:18 each Exp $ */
diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index eccae669f43..648324099b7 100644
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003-2008, 2011, 2012, 2014-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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/version.c b/lib/isc/version.c
index 87a2fbe9d0f..3bc2d7160d5 100644
--- a/lib/isc/version.c
+++ b/lib/isc/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.15 2007/06/19 23:47:17 tbox Exp $ */
diff --git a/lib/isc/win32/DLLMain.c b/lib/isc/win32/DLLMain.c
index 25d73ab5656..eb1342dd35c 100644
--- a/lib/isc/win32/DLLMain.c
+++ b/lib/isc/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: DLLMain.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index a8824b8eaab..19b46bdec4b 100644
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2009, 2012, 2014-2016  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c
index 5a6748019cc..5985e3ba915 100644
--- a/lib/isc/win32/app.c
+++ b/lib/isc/win32/app.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2009, 2013, 2014, 2016  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.
  */
 
 /* $Id: app.c,v 1.9 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index 696a20c2e17..7a38852a27a 100644
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2006, 2007, 2016  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.
  */
 
 /* $Id: condition.c,v 1.23 2007/06/18 23:47:49 tbox Exp $ */
diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index c0bb79bac89..3ebef960cbe 100644
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007-2009, 2011-2013, 2016, 2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/entropy.c b/lib/isc/win32/entropy.c
index 5b5bee7d687..26faf995957 100644
--- a/lib/isc/win32/entropy.c
+++ b/lib/isc/win32/entropy.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2007, 2009, 2013, 2016  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.
  */
 
 /* $Id: entropy.c,v 1.10 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/win32/errno.c b/lib/isc/win32/errno.c
index 5c454966f37..864be74764f 100644
--- a/lib/isc/win32/errno.c
+++ b/lib/isc/win32/errno.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2016  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.
  */
 
 /*! \file */
diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c
index 283a8181956..4026917f626 100644
--- a/lib/isc/win32/errno2result.c
+++ b/lib/isc/win32/errno2result.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007, 2008, 2013, 2016  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.
  */
 
 /* $Id: errno2result.c,v 1.17 2008/09/12 04:46:25 marka Exp $ */
diff --git a/lib/isc/win32/errno2result.h b/lib/isc/win32/errno2result.h
index bb783445296..ec1f73754d4 100644
--- a/lib/isc/win32/errno2result.h
+++ b/lib/isc/win32/errno2result.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: errno2result.h,v 1.10 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 39abcabfc7b..d532ce1125d 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2007, 2009, 2011-2017  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c
index de3e6c9e008..5944f543550 100644
--- a/lib/isc/win32/fsaccess.c
+++ b/lib/isc/win32/fsaccess.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2007, 2013, 2016, 2017  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.
  */
 
 /* $Id: fsaccess.c,v 1.15 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/include/Makefile.in b/lib/isc/win32/include/Makefile.in
index 2c76a9ef44f..291e81a6a0e 100644
--- a/lib/isc/win32/include/Makefile.in
+++ b/lib/isc/win32/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2014, 2016  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.
 
 # $Id: Makefile.in,v 1.9 2007/06/19 23:47:19 tbox Exp $
 
diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in
index d9fcce22a52..ee31fe8db3e 100644
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2012-2016  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.
 
 # $Id: Makefile.in,v 1.11 2007/06/19 23:47:20 tbox Exp $
 
diff --git a/lib/isc/win32/include/isc/atomic.h b/lib/isc/win32/include/isc/atomic.h
index 0b8cf748105..50e435a5c0b 100644
--- a/lib/isc/win32/include/isc/atomic.h
+++ b/lib/isc/win32/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2015, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/include/isc/bind_registry.h b/lib/isc/win32/include/isc/bind_registry.h
index d2d0fcd8831..e77eebe4984 100644
--- a/lib/isc/win32/include/isc/bind_registry.h
+++ b/lib/isc/win32/include/isc/bind_registry.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: bind_registry.h,v 1.8 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/bindevt.h b/lib/isc/win32/include/isc/bindevt.h
index ef01647c186..1b5aba8eefe 100644
--- a/lib/isc/win32/include/isc/bindevt.h
+++ b/lib/isc/win32/include/isc/bindevt.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: bindevt.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h
index 0f75f9de65e..d18ed9d5327 100644
--- a/lib/isc/win32/include/isc/condition.h
+++ b/lib/isc/win32/include/isc/condition.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: condition.h,v 1.17 2007/06/18 23:47:49 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/dir.h b/lib/isc/win32/include/isc/dir.h
index f55f85f0e36..d1b9203b103 100644
--- a/lib/isc/win32/include/isc/dir.h
+++ b/lib/isc/win32/include/isc/dir.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: dir.h,v 1.15 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/int.h b/lib/isc/win32/include/isc/int.h
index 4c1c4a43dcc..c71f8a46ba3 100644
--- a/lib/isc/win32/include/isc/int.h
+++ b/lib/isc/win32/include/isc/int.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: int.h,v 1.13 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index 2b56a0d2a61..014d4ecadfb 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/include/isc/keyboard.h b/lib/isc/win32/include/isc/keyboard.h
index 7707aa9e929..c387ff2fec4 100644
--- a/lib/isc/win32/include/isc/keyboard.h
+++ b/lib/isc/win32/include/isc/keyboard.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: keyboard.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h
index 18b87705e7d..dee5ac9c3ad 100644
--- a/lib/isc/win32/include/isc/mutex.h
+++ b/lib/isc/win32/include/isc/mutex.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007-2009, 2016  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.
  */
 
 /* $Id: mutex.h,v 1.22 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index db0b55afc20..38f25630fce 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2008, 2012, 2013, 2016, 2017  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.
  */
 
 #ifndef ISC_NET_H
diff --git a/lib/isc/win32/include/isc/netdb.h b/lib/isc/win32/include/isc/netdb.h
index 9e98c3cab81..4765937fe1e 100644
--- a/lib/isc/win32/include/isc/netdb.h
+++ b/lib/isc/win32/include/isc/netdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: netdb.h,v 1.9 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/ntgroups.h b/lib/isc/win32/include/isc/ntgroups.h
index 7a9e6e7cf79..e1be8c8ece0 100644
--- a/lib/isc/win32/include/isc/ntgroups.h
+++ b/lib/isc/win32/include/isc/ntgroups.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: ntgroups.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index 12b5a99614a..a0aa01d36ce 100644
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2009, 2015-2017  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.
  */
 
 /* $Id: ntpaths.h,v 1.20 2009/07/14 22:54:57 each Exp $ */
diff --git a/lib/isc/win32/include/isc/offset.h b/lib/isc/win32/include/isc/offset.h
index ef26ea96a9a..2206934b7f9 100644
--- a/lib/isc/win32/include/isc/offset.h
+++ b/lib/isc/win32/include/isc/offset.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: offset.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h
index 91fe9613f88..750dbfd1e48 100644
--- a/lib/isc/win32/include/isc/once.h
+++ b/lib/isc/win32/include/isc/once.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: once.h,v 1.9 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index 867718ef992..5ea3bfbe117 100644
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007-2009, 2013-2017  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.
  */
 
 /* $Id: platform.h,v 1.19 2009/09/29 23:48:04 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h
index 9acc1fbae4a..bc4195d2972 100644
--- a/lib/isc/win32/include/isc/stat.h
+++ b/lib/isc/win32/include/isc/stat.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2007, 2009, 2012, 2016  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.
  */
 
 /* $Id: stat.h,v 1.9 2009/10/01 23:48:08 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h
index d7dcdbde2c6..eccef90394a 100644
--- a/lib/isc/win32/include/isc/stdtime.h
+++ b/lib/isc/win32/include/isc/stdtime.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2011, 2012, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/include/isc/strerror.h b/lib/isc/win32/include/isc/strerror.h
index 4e05514970a..e94deab5fd8 100644
--- a/lib/isc/win32/include/isc/strerror.h
+++ b/lib/isc/win32/include/isc/strerror.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: strerror.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/syslog.h b/lib/isc/win32/include/isc/syslog.h
index ea48a498c80..95b699503e3 100644
--- a/lib/isc/win32/include/isc/syslog.h
+++ b/lib/isc/win32/include/isc/syslog.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: syslog.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index 59de705aaa8..e85085d0afb 100644
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2013, 2016, 2017  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.
  */
 
 /* $Id: thread.h,v 1.25 2009/09/29 04:37:08 marka Exp $ */
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index ae3dff06841..ba7ab559da6 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2006-2009, 2012, 2014-2017  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.
  */
 
 /* $Id: time.h,v 1.35 2009/01/05 23:47:54 tbox Exp $ */
diff --git a/lib/isc/win32/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h
index ba37264bc36..86b4c0c81b4 100644
--- a/lib/isc/win32/include/isc/win32os.h
+++ b/lib/isc/win32/include/isc/win32os.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2007, 2009, 2015, 2016  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.
  */
 
 /* $Id: win32os.h,v 1.7 2009/06/25 23:48:02 tbox Exp $ */
diff --git a/lib/isc/win32/include/pkcs11/Makefile.in b/lib/isc/win32/include/pkcs11/Makefile.in
index f03861aad13..111460f6c45 100644
--- a/lib/isc/win32/include/pkcs11/Makefile.in
+++ b/lib/isc/win32/include/pkcs11/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2014, 2016  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.
 
 # $Id$
 
diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index 8213eba0d4c..08f96f43d9a 100644
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007-2009, 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.
  */
 
 /* $Id: interfaceiter.c,v 1.15 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/win32/ipv6.c b/lib/isc/win32/ipv6.c
index 24072fdffa1..66284291c07 100644
--- a/lib/isc/win32/ipv6.c
+++ b/lib/isc/win32/ipv6.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: ipv6.c,v 1.8 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/keyboard.c b/lib/isc/win32/keyboard.c
index 0f7a8fcf0b1..0edec85c231 100644
--- a/lib/isc/win32/keyboard.c
+++ b/lib/isc/win32/keyboard.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: keyboard.c,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/libgen.h b/lib/isc/win32/libgen.h
index 8a0bee7258b..9f16865f85d 100644
--- a/lib/isc/win32/libgen.h
+++ b/lib/isc/win32/libgen.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: libgen.h,v 1.3 2009/07/17 23:47:41 tbox Exp $ */
diff --git a/lib/isc/win32/meminfo.c b/lib/isc/win32/meminfo.c
index f55f60f718f..644ba4e5e26 100644
--- a/lib/isc/win32/meminfo.c
+++ b/lib/isc/win32/meminfo.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015, 2016  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 85cb650d3f7..152d328c105 100644
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007-2009, 2011-2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/netdb.h b/lib/isc/win32/netdb.h
index 6eea5057cbf..f794aa66841 100644
--- a/lib/isc/win32/netdb.h
+++ b/lib/isc/win32/netdb.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2009, 2013, 2016  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.
  */
 
 /* $Id: netdb.h,v 1.9 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index 447dc8254f6..5ec5c292e78 100644
--- a/lib/isc/win32/ntgroups.c
+++ b/lib/isc/win32/ntgroups.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2006, 2007, 2009, 2013, 2016  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.
  */
 
 /* $Id: ntgroups.c,v 1.12 2009/09/29 23:48:04 tbox Exp $ */
diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c
index 864ee158a7a..15b93eae97d 100644
--- a/lib/isc/win32/ntpaths.c
+++ b/lib/isc/win32/ntpaths.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2009, 2014-2017  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.
  */
 
 /* $Id: ntpaths.c,v 1.15 2009/07/14 22:54:57 each Exp $ */
diff --git a/lib/isc/win32/once.c b/lib/isc/win32/once.c
index 4a4607a217a..7d4b7830683 100644
--- a/lib/isc/win32/once.c
+++ b/lib/isc/win32/once.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: once.c,v 1.12 2007/06/18 23:47:49 tbox Exp $ */
diff --git a/lib/isc/win32/os.c b/lib/isc/win32/os.c
index 9b73ca7706a..d50dc84cdb3 100644
--- a/lib/isc/win32/os.c
+++ b/lib/isc/win32/os.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2007, 2013, 2016  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.
  */
 
 /* $Id: os.c,v 1.8 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/pk11_api.c b/lib/isc/win32/pk11_api.c
index c01967a76c1..e444a6acc03 100644
--- a/lib/isc/win32/pk11_api.c
+++ b/lib/isc/win32/pk11_api.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/resource.c b/lib/isc/win32/resource.c
index 3202823e472..640d668de6b 100644
--- a/lib/isc/win32/resource.c
+++ b/lib/isc/win32/resource.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2008, 2016  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.
  */
 
 /* $Id: resource.c,v 1.10 2008/07/11 23:47:09 tbox Exp $ */
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 0fe6af2aa81..3e54988e94d 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 /* $Id$ */
diff --git a/lib/isc/win32/stdio.c b/lib/isc/win32/stdio.c
index a03a37ae486..7b3e570c1a2 100644
--- a/lib/isc/win32/stdio.c
+++ b/lib/isc/win32/stdio.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  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.
  */
 
 /* $Id: stdio.c,v 1.6 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/stdtime.c b/lib/isc/win32/stdtime.c
index 89a3e0b9c42..a4201b6ce92 100644
--- a/lib/isc/win32/stdtime.c
+++ b/lib/isc/win32/stdtime.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2013, 2016  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.
  */
 
 /* $Id: stdtime.c,v 1.12 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/strerror.c b/lib/isc/win32/strerror.c
index 76908448c05..137088a1d69 100644
--- a/lib/isc/win32/strerror.c
+++ b/lib/isc/win32/strerror.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2002, 2004, 2007, 2016  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.
  */
 
 /* $Id: strerror.c,v 1.8 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/syslog.c b/lib/isc/win32/syslog.c
index 706321ffcad..d2a1eaa6417 100644
--- a/lib/isc/win32/syslog.c
+++ b/lib/isc/win32/syslog.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001-2004, 2007, 2014, 2016  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.
  */
 
 /* $Id: syslog.c,v 1.10 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/syslog.h b/lib/isc/win32/syslog.h
index f80bb26ad09..cef1f0b3092 100644
--- a/lib/isc/win32/syslog.h
+++ b/lib/isc/win32/syslog.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2002, 2004, 2007, 2016  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.
  */
 
 /* $Id: syslog.h,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/thread.c b/lib/isc/win32/thread.c
index 6b656435ced..ebc2f2936f0 100644
--- a/lib/isc/win32/thread.c
+++ b/lib/isc/win32/thread.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016, 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index fa002939842..5f5c56c265a 100644
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2003, 2004, 2006-2009, 2012-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.
  */
 
 /* $Id: time.c,v 1.52 2009/08/14 07:51:08 marka Exp $ */
diff --git a/lib/isc/win32/unistd.h b/lib/isc/win32/unistd.h
index 1ae9e246ffd..a79e4fc42cc 100644
--- a/lib/isc/win32/unistd.h
+++ b/lib/isc/win32/unistd.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007-2009, 2016  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.
  */
 
 /* $Id: unistd.h,v 1.10 2009/07/17 23:47:41 tbox Exp $ */
diff --git a/lib/isc/win32/version.c b/lib/isc/win32/version.c
index b81b00cb0bc..d9abc7deae4 100644
--- a/lib/isc/win32/version.c
+++ b/lib/isc/win32/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
diff --git a/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c
index 161c304c1cb..9d4400c1dca 100644
--- a/lib/isc/win32/win32os.c
+++ b/lib/isc/win32/win32os.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004, 2007, 2013-2016  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.
  */
 
 #include <windows.h>
diff --git a/lib/isc/x86_32/Makefile.in b/lib/isc/x86_32/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/x86_32/Makefile.in
+++ b/lib/isc/x86_32/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/x86_32/include/Makefile.in b/lib/isc/x86_32/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/x86_32/include/Makefile.in
+++ b/lib/isc/x86_32/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/x86_32/include/isc/Makefile.in b/lib/isc/x86_32/include/isc/Makefile.in
index 0876355a269..f164aa3c68c 100644
--- a/lib/isc/x86_32/include/isc/Makefile.in
+++ b/lib/isc/x86_32/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/x86_32/include/isc/atomic.h b/lib/isc/x86_32/include/isc/atomic.h
index f21af22622c..9e1ba485757 100644
--- a/lib/isc/x86_32/include/isc/atomic.h
+++ b/lib/isc/x86_32/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2008, 2015-2017  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.
  */
 
 /* $Id: atomic.h,v 1.10 2008/01/24 23:47:00 tbox Exp $ */
diff --git a/lib/isc/x86_64/Makefile.in b/lib/isc/x86_64/Makefile.in
index a1cc0767b50..b5d0eed25f7 100644
--- a/lib/isc/x86_64/Makefile.in
+++ b/lib/isc/x86_64/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/x86_64/include/Makefile.in b/lib/isc/x86_64/include/Makefile.in
index a095b265d2a..344085ee9fa 100644
--- a/lib/isc/x86_64/include/Makefile.in
+++ b/lib/isc/x86_64/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
 
diff --git a/lib/isc/x86_64/include/isc/Makefile.in b/lib/isc/x86_64/include/isc/Makefile.in
index 8429c8c5008..2e04caf575b 100644
--- a/lib/isc/x86_64/include/isc/Makefile.in
+++ b/lib/isc/x86_64/include/isc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.2 2007/09/14 04:10:00 marka Exp $
 
diff --git a/lib/isc/x86_64/include/isc/atomic.h b/lib/isc/x86_64/include/isc/atomic.h
index 20e0a73c24d..d7a0de70b6f 100644
--- a/lib/isc/x86_64/include/isc/atomic.h
+++ b/lib/isc/x86_64/include/isc/atomic.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2005, 2007, 2008, 2015-2017  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.
  */
 
 /* $Id: atomic.h,v 1.6 2008/01/24 23:47:00 tbox Exp $ */
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 51f697934df..c34a685cf74 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2003, 2004, 2007, 2009, 2011, 2012, 2014-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c
index 006a42dc782..e98ec783b55 100644
--- a/lib/isccc/alist.c
+++ b/lib/isccc/alist.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2005, 2007, 2015, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 8757a298ad0..053d10308a5 100644
--- a/lib/isccc/base64.c
+++ b/lib/isccc/base64.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2005, 2007, 2013, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 c2dd57ff141..e801bf065b6 100644
--- a/lib/isccc/cc.c
+++ b/lib/isccc/cc.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001-2007, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001-2007, 2012-2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 0fd7652188e..30a9b7fb4b6 100644
--- a/lib/isccc/ccmsg.c
+++ b/lib/isccc/ccmsg.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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/Makefile.in b/lib/isccc/include/Makefile.in
index 498da748841..40fb8269dcb 100644
--- a/lib/isccc/include/Makefile.in
+++ b/lib/isccc/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.5 2007/06/19 23:47:22 tbox Exp $
 
diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index abad84efb9e..191a1d3a97f 100644
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2004, 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
 
diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h
index 6acfb143a62..ccd6be897b2 100644
--- a/lib/isccc/include/isccc/alist.h
+++ b/lib/isccc/include/isccc/alist.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 1324ef68d80..598f1a35649 100644
--- a/lib/isccc/include/isccc/base64.h
+++ b/lib/isccc/include/isccc/base64.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 4a91e014fb1..f6a32af991e 100644
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2013, 2014, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 322c903a019..0632daeee9d 100644
--- a/lib/isccc/include/isccc/ccmsg.h
+++ b/lib/isccc/include/isccc/ccmsg.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 e5659f5193f..61aa676cf9d 100644
--- a/lib/isccc/include/isccc/events.h
+++ b/lib/isccc/include/isccc/events.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 4f5d05f52b0..d9ee50e0754 100644
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 2f0e24ae181..788afe1fe35 100644
--- a/lib/isccc/include/isccc/result.h
+++ b/lib/isccc/include/isccc/result.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2003-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2003-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 4c1acb731d3..bcf31d6ac67 100644
--- a/lib/isccc/include/isccc/sexpr.h
+++ b/lib/isccc/include/isccc/sexpr.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 83b6e7c99a8..ef7824ae4ad 100644
--- a/lib/isccc/include/isccc/symtab.h
+++ b/lib/isccc/include/isccc/symtab.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 74b3c502718..8a0f4769a1a 100644
--- a/lib/isccc/include/isccc/symtype.h
+++ b/lib/isccc/include/isccc/symtype.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 f9e42948d7a..5589a02d564 100644
--- a/lib/isccc/include/isccc/types.h
+++ b/lib/isccc/include/isccc/types.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 ef2b56e5e51..c8ed1466d1e 100644
--- a/lib/isccc/include/isccc/util.h
+++ b/lib/isccc/include/isccc/util.h
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004-2007, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004-2007, 2014, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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/version.h b/lib/isccc/include/isccc/version.h
index beec05a01a0..4348c0688da 100644
--- a/lib/isccc/include/isccc/version.h
+++ b/lib/isccc/include/isccc/version.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: version.h,v 1.9 2007/06/19 23:47:22 tbox Exp $ */
diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index 5c8bc9a1383..8553170f74a 100644
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 cd80ed365a1..f3ea0fd632f 100644
--- a/lib/isccc/result.c
+++ b/lib/isccc/result.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2003-2005, 2007, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2003-2005, 2007, 2015, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 53c98ca154f..0f5b6d502fd 100644
--- a/lib/isccc/sexpr.c
+++ b/lib/isccc/sexpr.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2005, 2007, 2014-2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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 029744558e8..915fe5ad7d5 100644
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -1,11 +1,14 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2005, 2007, 2016, 2018  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/.
  *
- * Portions Copyright (C) 2001  Nominum, Inc.
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Portions Copyright (C) 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/version.c b/lib/isccc/version.c
index d7478ced7ce..2a0769c42ec 100644
--- a/lib/isccc/version.c
+++ b/lib/isccc/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
diff --git a/lib/isccc/win32/DLLMain.c b/lib/isccc/win32/DLLMain.c
index db1a0244e12..4c5374ffdec 100644
--- a/lib/isccc/win32/DLLMain.c
+++ b/lib/isccc/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:50 tbox Exp $ */
diff --git a/lib/isccc/win32/version.c b/lib/isccc/win32/version.c
index 52057b6a322..3fe9b4d5a8f 100644
--- a/lib/isccc/win32/version.c
+++ b/lib/isccc/win32/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 2932c68e085..4625fcd97b2 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001-2005, 2007, 2009, 2011-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 0e718873a76..e598e4d5ba2 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2002, 2004-2017  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.
  */
 
 #include <config.h>
diff --git a/lib/isccfg/dnsconf.c b/lib/isccfg/dnsconf.c
index 00f38b36010..1e6d71c450a 100644
--- a/lib/isccfg/dnsconf.c
+++ b/lib/isccfg/dnsconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: dnsconf.c,v 1.4 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isccfg/include/Makefile.in b/lib/isccfg/include/Makefile.in
index d7dcb1056f1..5b0653d63bb 100644
--- a/lib/isccfg/include/Makefile.in
+++ b/lib/isccfg/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
 
diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in
index d1c96c95e9d..11ac7615eb6 100644
--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2001, 2002, 2004, 2005, 2007, 2012, 2014-2016  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.
 
 # $Id: Makefile.in,v 1.12 2007/06/19 23:47:22 tbox Exp $
 
diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h
index 3cabcd15e3f..334d4109bf6 100644
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2010-2014, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 0bc9c14046b..f725dc9004a 100644
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-2002, 2004-2007, 2010, 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.
  */
 
 #ifndef ISCCFG_CFG_H
diff --git a/lib/isccfg/include/isccfg/dnsconf.h b/lib/isccfg/include/isccfg/dnsconf.h
index f4ff0dbc058..5c01f7472f5 100644
--- a/lib/isccfg/include/isccfg/dnsconf.h
+++ b/lib/isccfg/include/isccfg/dnsconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2016  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.
  */
 
 /* $Id: dnsconf.h,v 1.3 2009/09/02 23:48:03 tbox Exp $ */
diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 83732e94162..5ea062d92d8 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002-2011, 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.
  */
 
 #ifndef ISCCFG_GRAMMAR_H
diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h
index a4e605a52cb..7513122b8cc 100644
--- a/lib/isccfg/include/isccfg/log.h
+++ b/lib/isccfg/include/isccfg/log.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2009, 2016  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.
  */
 
 /* $Id: log.h,v 1.14 2009/01/18 23:48:14 tbox Exp $ */
diff --git a/lib/isccfg/include/isccfg/namedconf.h b/lib/isccfg/include/isccfg/namedconf.h
index c061103e26e..61464eb3246 100644
--- a/lib/isccfg/include/isccfg/namedconf.h
+++ b/lib/isccfg/include/isccfg/namedconf.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002, 2004-2007, 2009, 2010, 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.
  */
 
 /* $Id: namedconf.h,v 1.18 2010/08/11 18:14:20 each Exp $ */
diff --git a/lib/isccfg/include/isccfg/version.h b/lib/isccfg/include/isccfg/version.h
index e536fd1c95b..f02cb65a3d7 100644
--- a/lib/isccfg/include/isccfg/version.h
+++ b/lib/isccfg/include/isccfg/version.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: version.h,v 1.9 2007/06/19 23:47:22 tbox Exp $ */
diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c
index bed10eb0f5a..fbf93085fc9 100644
--- a/lib/isccfg/log.c
+++ b/lib/isccfg/log.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004-2007, 2016  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.
  */
 
 /* $Id: log.c,v 1.11 2007/06/19 23:47:22 tbox Exp $ */
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 3e22866bd9c..c3cab304e91 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2002-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.
  */
 
 /*! \file */
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 0df5ad58418..ef6a92da480 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000-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.
  */
 
 /*! \file */
diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index f0f0a6fab31..fbe3eca3d68 100644
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/tests/parser_test.c b/lib/isccfg/tests/parser_test.c
index d72c629fc5c..606bbeb26dc 100644
--- a/lib/isccfg/tests/parser_test.c
+++ b/lib/isccfg/tests/parser_test.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/lib/isccfg/version.c b/lib/isccfg/version.c
index 1116c77ac4d..393879a8b08 100644
--- a/lib/isccfg/version.c
+++ b/lib/isccfg/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
diff --git a/lib/isccfg/win32/DLLMain.c b/lib/isccfg/win32/DLLMain.c
index c59fd0cf7dc..db53ffa0e3d 100644
--- a/lib/isccfg/win32/DLLMain.c
+++ b/lib/isccfg/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:51 tbox Exp $ */
diff --git a/lib/isccfg/win32/version.c b/lib/isccfg/win32/version.c
index 3bdc5546f67..d44cf8f93bc 100644
--- a/lib/isccfg/win32/version.c
+++ b/lib/isccfg/win32/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: version.c,v 1.6 2007/06/19 23:47:22 tbox Exp $ */
diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index 211675ee53a..e81eeb33673 100644
--- a/lib/ns/Makefile.in
+++ b/lib/ns/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/ns/client.c b/lib/ns/client.c
index 3b7240b6bdc..fda05b89aae 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/lib/ns/hooks.h b/lib/ns/hooks.h
index a1d70d9da79..bde941405ac 100644
--- a/lib/ns/hooks.h
+++ b/lib/ns/hooks.h
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #ifndef NS_HOOKS_H
diff --git a/lib/ns/include/Makefile.in b/lib/ns/include/Makefile.in
index f3fea48f48d..f2ba1dafdbf 100644
--- a/lib/ns/include/Makefile.in
+++ b/lib/ns/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/ns/include/ns/Makefile.in b/lib/ns/include/ns/Makefile.in
index f20e26b36c8..9ccc6171db9 100644
--- a/lib/ns/include/ns/Makefile.in
+++ b/lib/ns/include/ns/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
index b39318409a4..21ed870a727 100644
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #ifndef NS_CLIENT_H
diff --git a/lib/ns/include/ns/interfacemgr.h b/lib/ns/include/ns/interfacemgr.h
index 7ff50f9e6ee..854ff26aed4 100644
--- a/lib/ns/include/ns/interfacemgr.h
+++ b/lib/ns/include/ns/interfacemgr.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_INTERFACEMGR_H
diff --git a/lib/ns/include/ns/lib.h b/lib/ns/include/ns/lib.h
index 6a9719853c7..7671117d235 100644
--- a/lib/ns/include/ns/lib.h
+++ b/lib/ns/include/ns/lib.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_LIB_H
diff --git a/lib/ns/include/ns/listenlist.h b/lib/ns/include/ns/listenlist.h
index d16a2fd1d26..03162221c51 100644
--- a/lib/ns/include/ns/listenlist.h
+++ b/lib/ns/include/ns/listenlist.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_LISTENLIST_H
diff --git a/lib/ns/include/ns/log.h b/lib/ns/include/ns/log.h
index d6997eb3e60..dd81f64a5b4 100644
--- a/lib/ns/include/ns/log.h
+++ b/lib/ns/include/ns/log.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_LOG_H
diff --git a/lib/ns/include/ns/notify.h b/lib/ns/include/ns/notify.h
index 19b4460cac9..a4b4971a971 100644
--- a/lib/ns/include/ns/notify.h
+++ b/lib/ns/include/ns/notify.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_NOTIFY_H
diff --git a/lib/ns/include/ns/query.h b/lib/ns/include/ns/query.h
index a81736497fb..87c0a638edb 100644
--- a/lib/ns/include/ns/query.h
+++ b/lib/ns/include/ns/query.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_QUERY_H
diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h
index b6548dfcc79..0b855707645 100644
--- a/lib/ns/include/ns/server.h
+++ b/lib/ns/include/ns/server.h
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #ifndef NS_SERVER_H
diff --git a/lib/ns/include/ns/sortlist.h b/lib/ns/include/ns/sortlist.h
index da30a3ee9ae..3eb3eea66bb 100644
--- a/lib/ns/include/ns/sortlist.h
+++ b/lib/ns/include/ns/sortlist.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_SORTLIST_H
diff --git a/lib/ns/include/ns/stats.h b/lib/ns/include/ns/stats.h
index 32d5672e9e3..4765cae2995 100644
--- a/lib/ns/include/ns/stats.h
+++ b/lib/ns/include/ns/stats.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_STATS_H
diff --git a/lib/ns/include/ns/types.h b/lib/ns/include/ns/types.h
index cc71d3d160e..06066e2942e 100644
--- a/lib/ns/include/ns/types.h
+++ b/lib/ns/include/ns/types.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_TYPES_H
diff --git a/lib/ns/include/ns/update.h b/lib/ns/include/ns/update.h
index 22a5d9898c8..5d6b225a8f8 100644
--- a/lib/ns/include/ns/update.h
+++ b/lib/ns/include/ns/update.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_UPDATE_H
diff --git a/lib/ns/include/ns/version.h b/lib/ns/include/ns/version.h
index 80750a9a7f3..bcb93319e28 100644
--- a/lib/ns/include/ns/version.h
+++ b/lib/ns/include/ns/version.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file include/ns/version.h */
diff --git a/lib/ns/include/ns/xfrout.h b/lib/ns/include/ns/xfrout.h
index 2a2d4eec742..1dd31d85496 100644
--- a/lib/ns/include/ns/xfrout.h
+++ b/lib/ns/include/ns/xfrout.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #ifndef NS_XFROUT_H
diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c
index 35d59c47d7b..ca53ec6650c 100644
--- a/lib/ns/interfacemgr.c
+++ b/lib/ns/interfacemgr.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/lib.c b/lib/ns/lib.c
index 3409bbed9c0..245966470df 100644
--- a/lib/ns/lib.c
+++ b/lib/ns/lib.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/listenlist.c b/lib/ns/listenlist.c
index 95735eb1d74..dca5fb9bc21 100644
--- a/lib/ns/listenlist.c
+++ b/lib/ns/listenlist.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/log.c b/lib/ns/log.c
index 1a7c989299e..636e457bc37 100644
--- a/lib/ns/log.c
+++ b/lib/ns/log.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/notify.c b/lib/ns/notify.c
index f5b3ec331fa..fa95d2ef520 100644
--- a/lib/ns/notify.c
+++ b/lib/ns/notify.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/lib/ns/query.c b/lib/ns/query.c
index e4d56917a9a..3aee26861b0 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*! \file */
diff --git a/lib/ns/server.c b/lib/ns/server.c
index 559704fec67..c8220592bdc 100644
--- a/lib/ns/server.c
+++ b/lib/ns/server.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/sortlist.c b/lib/ns/sortlist.c
index 445062f1cf4..c3cc2fc9ec3 100644
--- a/lib/ns/sortlist.c
+++ b/lib/ns/sortlist.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/stats.c b/lib/ns/stats.c
index 6dbe19959a0..d1fa7fe53ac 100644
--- a/lib/ns/stats.c
+++ b/lib/ns/stats.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index 8d3de55d2fa..afdc7621194 100644
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/ns/tests/listenlist_test.c b/lib/ns/tests/listenlist_test.c
index 79a4574b4f0..ac66018f360 100644
--- a/lib/ns/tests/listenlist_test.c
+++ b/lib/ns/tests/listenlist_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/tests/notify_test.c b/lib/ns/tests/notify_test.c
index 2e68781b001..5511346ba00 100644
--- a/lib/ns/tests/notify_test.c
+++ b/lib/ns/tests/notify_test.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c
index bc3ea5856f4..79d5f270955 100644
--- a/lib/ns/tests/nstest.c
+++ b/lib/ns/tests/nstest.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*! \file */
diff --git a/lib/ns/tests/nstest.h b/lib/ns/tests/nstest.h
index 5d74deaabb4..ad92b288d5f 100644
--- a/lib/ns/tests/nstest.h
+++ b/lib/ns/tests/nstest.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/tests/query_test.c b/lib/ns/tests/query_test.c
index f94cac632f7..9df07b3646b 100644
--- a/lib/ns/tests/query_test.c
+++ b/lib/ns/tests/query_test.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 /*! \file */
diff --git a/lib/ns/tests/testdata/notify/zone1.db b/lib/ns/tests/testdata/notify/zone1.db
index a3b4cab9c00..af887f6b31c 100644
--- a/lib/ns/tests/testdata/notify/zone1.db
+++ b/lib/ns/tests/testdata/notify/zone1.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 1000
 @		in	soa	localhost. postmaster.localhost. (
diff --git a/lib/ns/tests/testdata/query/foo.db b/lib/ns/tests/testdata/query/foo.db
index 20042a6e20a..1cf32733177 100644
--- a/lib/ns/tests/testdata/query/foo.db
+++ b/lib/ns/tests/testdata/query/foo.db
@@ -1,8 +1,11 @@
-; Copyright (C) 2017  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.
 
 $TTL 3600
 @		IN	SOA	localhost. postmaster.localhost. (
diff --git a/lib/ns/update.c b/lib/ns/update.c
index 0ba4cdff330..05bf794cf1b 100644
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -1,9 +1,12 @@
 /*
- * 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.
  */
 
 #include <config.h>
diff --git a/lib/ns/version.c b/lib/ns/version.c
index bf062335fda..7df021564c9 100644
--- a/lib/ns/version.c
+++ b/lib/ns/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/win32/DLLMain.c b/lib/ns/win32/DLLMain.c
index a350f1cba39..005df49d254 100644
--- a/lib/ns/win32/DLLMain.c
+++ b/lib/ns/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
diff --git a/lib/ns/win32/version.c b/lib/ns/win32/version.c
index 998116b8455..f506fa1ddb8 100644
--- a/lib/ns/win32/version.c
+++ b/lib/ns/win32/version.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 /*! \file */
diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c
index ccade448513..9884721aa75 100644
--- a/lib/ns/xfrout.c
+++ b/lib/ns/xfrout.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2017  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.
  */
 
 #include <config.h>
diff --git a/lib/samples/Makefile-postinstall.in b/lib/samples/Makefile-postinstall.in
index 565a85e627f..cf114da6a15 100644
--- a/lib/samples/Makefile-postinstall.in
+++ b/lib/samples/Makefile-postinstall.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012-2014, 2016, 2017  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.
 
 srcdir =	@srcdir@
 #prefix =	@prefix@
diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in
index e5377d8d3a4..7c8827ca253 100644
--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2009, 2012-2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c
index cff684c46ec..5cdcee52eaf 100644
--- a/lib/samples/nsprobe.c
+++ b/lib/samples/nsprobe.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009-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.
  */
 
 /* $Id$ */
diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c
index f0b959dd3f3..ff0946386e8 100644
--- a/lib/samples/resolve.c
+++ b/lib/samples/resolve.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012-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.
  */
 
 #include <config.h>
diff --git a/lib/samples/rootkey.sh b/lib/samples/rootkey.sh
index 8ee0e14a827..3dbfafdb252 100644
--- a/lib/samples/rootkey.sh
+++ b/lib/samples/rootkey.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2016  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.
 
 # Fetch a copy of a current root signing key; used for testing
 # DNSSEC validation in 'sample'.
diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c
index 2028c18a241..0db3344c1f5 100644
--- a/lib/samples/sample-async.c
+++ b/lib/samples/sample-async.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 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.
  */
 
 /* $Id: sample-async.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
diff --git a/lib/samples/sample-gai.c b/lib/samples/sample-gai.c
index 73e0c06ad46..bc9dcadff67 100644
--- a/lib/samples/sample-gai.c
+++ b/lib/samples/sample-gai.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2012-2016  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.
  */
 
 /* $Id: sample-gai.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */
diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c
index b46616c08c5..4c2267e1760 100644
--- a/lib/samples/sample-request.c
+++ b/lib/samples/sample-request.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 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.
  */
 
 /* $Id: sample-request.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c
index 8e303cd19d1..cb97ef21a6e 100644
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2009, 2010, 2012-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.
  */
 
 /* $Id: sample-update.c,v 1.10 2010/12/09 00:54:34 marka Exp $ */
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 8fb65855122..eddf6a527f7 100644
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2003, 2004, 2007, 2009, 2012, 2016, 2017  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.
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/tests/include/Makefile.in b/lib/tests/include/Makefile.in
index e779c47ef06..10d1c05cc1a 100644
--- a/lib/tests/include/Makefile.in
+++ b/lib/tests/include/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.11 2007/06/19 23:47:24 tbox Exp $
 
diff --git a/lib/tests/include/tests/Makefile.in b/lib/tests/include/tests/Makefile.in
index fa7ae570675..bdae8c8d5a2 100644
--- a/lib/tests/include/tests/Makefile.in
+++ b/lib/tests/include/tests/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2015, 2016  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.
 
 # $Id: Makefile.in,v 1.9 2007/06/19 23:47:24 tbox Exp $
 
diff --git a/lib/tests/include/tests/t_api.h b/lib/tests/include/tests/t_api.h
index d8190654669..b33608a8dc1 100644
--- a/lib/tests/include/tests/t_api.h
+++ b/lib/tests/include/tests/t_api.h
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2010, 2013, 2014, 2016, 2017  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.
  */
 
 /* $Id: t_api.h,v 1.24 2010/06/08 23:50:24 tbox Exp $ */
diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 20b1fd38b0a..70a219579e8 100644
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 1999-2005, 2007-2010, 2013, 2014, 2016, 2017  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.
  */
 
 /* $Id: t_api.c,v 1.68 2010/12/21 04:20:23 marka Exp $ */
diff --git a/lib/tests/win32/DLLMain.c b/lib/tests/win32/DLLMain.c
index 710a1bc7f1a..03246be49bc 100644
--- a/lib/tests/win32/DLLMain.c
+++ b/lib/tests/win32/DLLMain.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2013, 2016  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.
  */
 
 /* $Id$ */
diff --git a/lib/win32/bindevt/bindevt.c b/lib/win32/bindevt/bindevt.c
index 2c8362a41e6..0fe686898ec 100644
--- a/lib/win32/bindevt/bindevt.c
+++ b/lib/win32/bindevt/bindevt.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  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.
  */
 
 /* $Id: bindevt.c,v 1.5 2007/06/19 23:47:24 tbox Exp $ */
diff --git a/lib/win32/bindevt/bindevt.mc b/lib/win32/bindevt/bindevt.mc
index 6ebfae15b58..be88219b99a 100644
--- a/lib/win32/bindevt/bindevt.mc
+++ b/lib/win32/bindevt/bindevt.mc
@@ -1,8 +1,11 @@
-; Copyright (C) 2001, 2004, 2007, 2016  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.
 
 ; $Id: bindevt.mc,v 1.4 2007/06/19 23:47:24 tbox Exp $
 
diff --git a/make/Makefile.in b/make/Makefile.in
index 06aa48b711e..a6f72130266 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id: Makefile.in,v 1.16 2007/06/19 23:47:24 tbox Exp $
 
diff --git a/make/includes.in b/make/includes.in
index d1ba4bc3776..51a00f4d9e2 100644
--- a/make/includes.in
+++ b/make/includes.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1999-2001, 2004, 2005, 2007, 2012, 2014, 2016, 2017  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.
 
 # Search for machine-generated header files in the build tree,
 # and for normal headers in the source tree (${top_srcdir}).
diff --git a/make/rules.in b/make/rules.in
index de60a110993..a1886d14f93 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,8 +1,11 @@
-# Copyright (C) 1998-2009, 2011-2017  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.
 
 ###
 ### Common Makefile rules for BIND 9.
diff --git a/unit/Makefile.in b/unit/Makefile.in
index dc3c3692eef..cc19c720740 100644
--- a/unit/Makefile.in
+++ b/unit/Makefile.in
@@ -1,8 +1,11 @@
-# Copyright (C) 2011, 2012, 2017  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.
 
 # $Id$
 
diff --git a/util/altbuild.sh b/util/altbuild.sh
index 3972bdbfb70..889b6901f95 100644
--- a/util/altbuild.sh
+++ b/util/altbuild.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002, 2004, 2007, 2008, 2012, 2016, 2017  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.
 
 # $Id$
 
diff --git a/util/bindkeys.pl b/util/bindkeys.pl
index 0cd16a23cd2..b149da01653 100755
--- a/util/bindkeys.pl
+++ b/util/bindkeys.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2009-2012, 2014, 2016, 2017  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.
 
 # $Id: bindkeys.pl,v 1.7 2011/01/04 23:47:13 tbox Exp $
 
diff --git a/util/branchsync.sh b/util/branchsync.sh
index 4c9f57a60e9..bef142b64ab 100644
--- a/util/branchsync.sh
+++ b/util/branchsync.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2016  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.
 
 # branchsync:
 # pull in changes from a main BIND 9 release branch to a subscription
diff --git a/util/check-categories.sh b/util/check-categories.sh
index 38313849afc..dff066796d5 100644
--- a/util/check-categories.sh
+++ b/util/check-categories.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2015-2017  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.
 
 list1=`grep LOGCATEGORY lib/*/include/*/*.h bin/named/include/named/*.h |
 grep "#define.*(&" |
diff --git a/util/check-changes b/util/check-changes
index 3a26847db4a..705cf1c835a 100644
--- a/util/check-changes
+++ b/util/check-changes
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2002, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/check-includes.pl b/util/check-includes.pl
index 4667c4a0f4f..82ac6de82d0 100644
--- a/util/check-includes.pl
+++ b/util/check-includes.pl
@@ -1,10 +1,13 @@
 #! /usr/bin/perl -ws
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016, 2017  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.
 
 # Rudimentary, primarily for use by the developers.
 # This just evolved with no serious attempt at making it
diff --git a/util/check-instincludes.sh b/util/check-instincludes.sh
index bc7f23ac25f..f445641c772 100644
--- a/util/check-instincludes.sh
+++ b/util/check-instincludes.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/check-pullups.pl b/util/check-pullups.pl
index ebcc8fa7564..a66a663d41c 100644
--- a/util/check-pullups.pl
+++ b/util/check-pullups.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2001-2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/check-sources.pl b/util/check-sources.pl
index 5ce03b6f28f..8891293bff2 100644
--- a/util/check-sources.pl
+++ b/util/check-sources.pl
@@ -1,10 +1,13 @@
 #! /usr/bin/perl -ws
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2013, 2016  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.
 
 # $Id$
 
diff --git a/util/checklibs.sh b/util/checklibs.sh
index b9bab6ded11..8d080cad244 100755
--- a/util/checklibs.sh
+++ b/util/checklibs.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  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.
 
 status=0
 
diff --git a/util/commit-arm.sh b/util/commit-arm.sh
index 418883b7308..762b1d5c4e3 100644
--- a/util/commit-arm.sh
+++ b/util/commit-arm.sh
@@ -1,8 +1,11 @@
-# Copyright (C) 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/copyrights b/util/copyrights
index 849cf10fd4f..4ad85285f73 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,81 +1,81 @@
-./.gitattributes				X	2015,2017
-./.gitignore					X	2012,2013,2014,2015,2016,2017
+./.gitattributes				X	2015,2017,2018
+./.gitignore					X	2012,2013,2014,2015,2016,2017,2018
 ./.gitlab-ci.yml				X	2018
-./Atffile					X	2011
+./Atffile					X	2011,2018
 ./CHANGES					X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./COPYRIGHT					X	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
-./HISTORY.md					MKD	2017
-./Kyuafile					X	2017
-./LICENSE					X	2016
-./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./OPTIONS					X	2017
-./OPTIONS.md					MKD	2017
+./HISTORY					X	2010,2013,2016,2017,2018
+./HISTORY.md					MKD	2017,2018
+./Kyuafile					X	2017,2018
+./LICENSE					X	2016,2018
+./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./OPTIONS					X	2017,2018
+./OPTIONS.md					MKD	2017,2018
 ./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./README.md					MKD	2017,2018
-./acconfig.h					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016
-./aclocal.m4					X	1999,2000,2001,2012,2014
-./autogen.sh					SH	2015,2016
-./bin/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2013,2014,2016
-./bin/check/.gitignore				X	2012
-./bin/check/Makefile.in				MAKE	2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2014,2015,2016,2017
-./bin/check/check-tool.c			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/check/check-tool.h			C	2000,2001,2002,2004,2005,2007,2010,2011,2013,2014,2016
+./acconfig.h					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016,2018
+./aclocal.m4					X	1999,2000,2001,2012,2014,2018
+./autogen.sh					SH	2015,2016,2018
+./bin/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2013,2014,2016,2018
+./bin/check/.gitignore				X	2012,2018
+./bin/check/Makefile.in				MAKE	2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2014,2015,2016,2017,2018
+./bin/check/check-tool.c			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/check/check-tool.h			C	2000,2001,2002,2004,2005,2007,2010,2011,2013,2014,2016,2018
 ./bin/check/named-checkconf.8			MAN	DOCBOOK
-./bin/check/named-checkconf.c			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/check/named-checkconf.docbook		SGML	2000,2001,2002,2004,2005,2007,2009,2014,2015,2016
+./bin/check/named-checkconf.c			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/check/named-checkconf.docbook		SGML	2000,2001,2002,2004,2005,2007,2009,2014,2015,2016,2018
 ./bin/check/named-checkconf.html		HTML	DOCBOOK
 ./bin/check/named-checkzone.8			MAN	DOCBOOK
-./bin/check/named-checkzone.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
-./bin/check/named-checkzone.docbook		SGML	2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016
+./bin/check/named-checkzone.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
+./bin/check/named-checkzone.docbook		SGML	2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2018
 ./bin/check/named-checkzone.html		HTML	DOCBOOK
-./bin/check/win32/checkconf.vcxproj.filters.in	X	2013,2015
-./bin/check/win32/checkconf.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/check/win32/checkconf.vcxproj.user	X	2013
-./bin/check/win32/checktool.vcxproj.filters.in	X	2013,2015
-./bin/check/win32/checktool.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/check/win32/checktool.vcxproj.user	X	2013
-./bin/check/win32/checkzone.vcxproj.filters.in	X	2013,2015
-./bin/check/win32/checkzone.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/check/win32/checkzone.vcxproj.user	X	2013
-./bin/confgen/.gitignore			X	2012,2014
-./bin/confgen/Makefile.in			MAKE	2009,2012,2014,2015,2016,2017
+./bin/check/win32/checkconf.vcxproj.filters.in	X	2013,2015,2018
+./bin/check/win32/checkconf.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/check/win32/checkconf.vcxproj.user	X	2013,2018
+./bin/check/win32/checktool.vcxproj.filters.in	X	2013,2015,2018
+./bin/check/win32/checktool.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/check/win32/checktool.vcxproj.user	X	2013,2018
+./bin/check/win32/checkzone.vcxproj.filters.in	X	2013,2015,2018
+./bin/check/win32/checkzone.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/check/win32/checkzone.vcxproj.user	X	2013,2018
+./bin/confgen/.gitignore			X	2012,2014,2018
+./bin/confgen/Makefile.in			MAKE	2009,2012,2014,2015,2016,2017,2018
 ./bin/confgen/ddns-confgen.8			MAN	DOCBOOK
-./bin/confgen/ddns-confgen.c			C	2009,2011,2014,2016
-./bin/confgen/ddns-confgen.docbook		SGML	2009,2014,2015,2016
+./bin/confgen/ddns-confgen.c			C	2009,2011,2014,2016,2018
+./bin/confgen/ddns-confgen.docbook		SGML	2009,2014,2015,2016,2018
 ./bin/confgen/ddns-confgen.html			HTML	DOCBOOK
-./bin/confgen/include/confgen/os.h		C	2009,2016
-./bin/confgen/keygen.c				C	2009,2012,2013,2014,2015,2016,2017
-./bin/confgen/keygen.h				C	2009,2016
+./bin/confgen/include/confgen/os.h		C	2009,2016,2018
+./bin/confgen/keygen.c				C	2009,2012,2013,2014,2015,2016,2017,2018
+./bin/confgen/keygen.h				C	2009,2016,2018
 ./bin/confgen/rndc-confgen.8			MAN	DOCBOOK
-./bin/confgen/rndc-confgen.c			C	2001,2003,2004,2005,2007,2008,2009,2011,2013,2014,2016,2017
-./bin/confgen/rndc-confgen.docbook		SGML	2001,2003,2004,2005,2007,2009,2013,2014,2015,2016,2017
+./bin/confgen/rndc-confgen.c			C	2001,2003,2004,2005,2007,2008,2009,2011,2013,2014,2016,2017,2018
+./bin/confgen/rndc-confgen.docbook		SGML	2001,2003,2004,2005,2007,2009,2013,2014,2015,2016,2017,2018
 ./bin/confgen/rndc-confgen.html			HTML	DOCBOOK
-./bin/confgen/unix/Makefile.in			MAKE	2009,2012,2016
-./bin/confgen/unix/os.c				C	2009,2016
-./bin/confgen/util.c				C	2009,2015,2016
-./bin/confgen/util.h				C	2009,2016
-./bin/confgen/win32/confgentool.vcxproj.filters.in	X	2013,2015
-./bin/confgen/win32/confgentool.vcxproj.in	X	2013,2015,2016,2017
-./bin/confgen/win32/confgentool.vcxproj.user	X	2013
-./bin/confgen/win32/ddnsconfgen.vcxproj.filters.in	X	2013,2015
-./bin/confgen/win32/ddnsconfgen.vcxproj.in	X	2013,2014,2015,2016,2017
-./bin/confgen/win32/ddnsconfgen.vcxproj.user	X	2013
-./bin/confgen/win32/os.c			C	2009,2016
-./bin/confgen/win32/rndcconfgen.vcxproj.filters.in	X	2013,2015
-./bin/confgen/win32/rndcconfgen.vcxproj.in	X	2013,2015,2016,2017
-./bin/confgen/win32/rndcconfgen.vcxproj.user	X	2013
-./bin/delv/.gitignore				X	2014
-./bin/delv/Makefile.in				MAKE	2014,2015,2016,2017
+./bin/confgen/unix/Makefile.in			MAKE	2009,2012,2016,2018
+./bin/confgen/unix/os.c				C	2009,2016,2018
+./bin/confgen/util.c				C	2009,2015,2016,2018
+./bin/confgen/util.h				C	2009,2016,2018
+./bin/confgen/win32/confgentool.vcxproj.filters.in	X	2013,2015,2018
+./bin/confgen/win32/confgentool.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/confgen/win32/confgentool.vcxproj.user	X	2013,2018
+./bin/confgen/win32/ddnsconfgen.vcxproj.filters.in	X	2013,2015,2018
+./bin/confgen/win32/ddnsconfgen.vcxproj.in	X	2013,2014,2015,2016,2017,2018
+./bin/confgen/win32/ddnsconfgen.vcxproj.user	X	2013,2018
+./bin/confgen/win32/os.c			C	2009,2016,2018
+./bin/confgen/win32/rndcconfgen.vcxproj.filters.in	X	2013,2015,2018
+./bin/confgen/win32/rndcconfgen.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/confgen/win32/rndcconfgen.vcxproj.user	X	2013,2018
+./bin/delv/.gitignore				X	2014,2018
+./bin/delv/Makefile.in				MAKE	2014,2015,2016,2017,2018
 ./bin/delv/delv.1				MAN	DOCBOOK
-./bin/delv/delv.c				C	2014,2015,2016,2017
-./bin/delv/delv.docbook				SGML	2014,2015,2016,2017
+./bin/delv/delv.c				C	2014,2015,2016,2017,2018
+./bin/delv/delv.docbook				SGML	2014,2015,2016,2017,2018
 ./bin/delv/delv.html				HTML	DOCBOOK
-./bin/delv/win32/delv.vcxproj.filters.in	X	2014,2015
-./bin/delv/win32/delv.vcxproj.in		X	2014,2015,2016,2017
-./bin/delv/win32/delv.vcxproj.user		X	2014
-./bin/dig/.gitignore				X	2012,2014
-./bin/dig/Makefile.in				MAKE	2000,2001,2002,2004,2005,2007,2009,2012,2013,2014,2015,2016,2017
+./bin/delv/win32/delv.vcxproj.filters.in	X	2014,2015,2018
+./bin/delv/win32/delv.vcxproj.in		X	2014,2015,2016,2017,2018
+./bin/delv/win32/delv.vcxproj.user		X	2014,2018
+./bin/dig/.gitignore				X	2012,2014,2018
+./bin/dig/Makefile.in				MAKE	2000,2001,2002,2004,2005,2007,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/dig.1					MAN	DOCBOOK
 ./bin/dig/dig.c					C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/dig.docbook				SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
@@ -83,537 +83,537 @@
 ./bin/dig/dighost.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/host.1				MAN	DOCBOOK
 ./bin/dig/host.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/dig/host.docbook				SGML	2000,2001,2002,2004,2005,2007,2008,2009,2014,2015,2016,2017
+./bin/dig/host.docbook				SGML	2000,2001,2002,2004,2005,2007,2008,2009,2014,2015,2016,2017,2018
 ./bin/dig/host.html				HTML	DOCBOOK
 ./bin/dig/include/dig/dig.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/nslookup.1				MAN	DOCBOOK
 ./bin/dig/nslookup.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/dig/nslookup.docbook			SGML	2004,2005,2006,2007,2010,2013,2014,2015,2016,2017
+./bin/dig/nslookup.docbook			SGML	2004,2005,2006,2007,2010,2013,2014,2015,2016,2017,2018
 ./bin/dig/nslookup.html				HTML	DOCBOOK
-./bin/dig/win32/dig.vcxproj.filters.in		X	2013,2015
-./bin/dig/win32/dig.vcxproj.in			X	2013,2014,2015,2016,2017
-./bin/dig/win32/dig.vcxproj.user		X	2013
-./bin/dig/win32/dighost.vcxproj.filters.in	X	2013,2015
-./bin/dig/win32/dighost.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dig/win32/dighost.vcxproj.user		X	2013
-./bin/dig/win32/host.vcxproj.filters.in		X	2013,2015
-./bin/dig/win32/host.vcxproj.in			X	2013,2014,2015,2016,2017
-./bin/dig/win32/host.vcxproj.user		X	2013
-./bin/dig/win32/nslookup.vcxproj.filters.in	X	2013,2015
-./bin/dig/win32/nslookup.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dig/win32/nslookup.vcxproj.user		X	2013
-./bin/dnssec/.gitignore				X	2012,2013,2017
-./bin/dnssec/Makefile.in			MAKE	2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017
+./bin/dig/win32/dig.vcxproj.filters.in		X	2013,2015,2018
+./bin/dig/win32/dig.vcxproj.in			X	2013,2014,2015,2016,2017,2018
+./bin/dig/win32/dig.vcxproj.user		X	2013,2018
+./bin/dig/win32/dighost.vcxproj.filters.in	X	2013,2015,2018
+./bin/dig/win32/dighost.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dig/win32/dighost.vcxproj.user		X	2013,2018
+./bin/dig/win32/host.vcxproj.filters.in		X	2013,2015,2018
+./bin/dig/win32/host.vcxproj.in			X	2013,2014,2015,2016,2017,2018
+./bin/dig/win32/host.vcxproj.user		X	2013,2018
+./bin/dig/win32/nslookup.vcxproj.filters.in	X	2013,2015,2018
+./bin/dig/win32/nslookup.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dig/win32/nslookup.vcxproj.user		X	2013,2018
+./bin/dnssec/.gitignore				X	2012,2013,2017,2018
+./bin/dnssec/Makefile.in			MAKE	2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-cds.8			MAN	DOCBOOK
 ./bin/dnssec/dnssec-cds.c			C	2017,2018
 ./bin/dnssec/dnssec-cds.docbook			SGML	2017,2018
 ./bin/dnssec/dnssec-cds.html			HTML	DOCBOOK
 ./bin/dnssec/dnssec-dsfromkey.8			MAN	DOCBOOK
-./bin/dnssec/dnssec-dsfromkey.c			C	2008,2009,2010,2011,2012,2014,2015,2016,2017
-./bin/dnssec/dnssec-dsfromkey.docbook		SGML	2008,2009,2010,2011,2012,2014,2015,2016
+./bin/dnssec/dnssec-dsfromkey.c			C	2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
+./bin/dnssec/dnssec-dsfromkey.docbook		SGML	2008,2009,2010,2011,2012,2014,2015,2016,2018
 ./bin/dnssec/dnssec-dsfromkey.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-importkey.8			MAN	DOCBOOK
-./bin/dnssec/dnssec-importkey.c			C	2013,2014,2015,2016,2017
-./bin/dnssec/dnssec-importkey.docbook		SGML	2013,2014,2015,2016
+./bin/dnssec/dnssec-importkey.c			C	2013,2014,2015,2016,2017,2018
+./bin/dnssec/dnssec-importkey.docbook		SGML	2013,2014,2015,2016,2018
 ./bin/dnssec/dnssec-importkey.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-keyfromlabel.8		MAN	DOCBOOK
 ./bin/dnssec/dnssec-keyfromlabel.c		C	2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
-./bin/dnssec/dnssec-keyfromlabel.docbook	SGML	2008,2009,2010,2011,2012,2014,2015,2016,2017
+./bin/dnssec/dnssec-keyfromlabel.docbook	SGML	2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-keyfromlabel.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-keygen.8			MAN	DOCBOOK
 ./bin/dnssec/dnssec-keygen.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-keygen.docbook		SGML	2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-keygen.html			HTML	DOCBOOK
 ./bin/dnssec/dnssec-revoke.8			MAN	DOCBOOK
-./bin/dnssec/dnssec-revoke.c			C	2009,2010,2011,2012,2014,2015,2016,2017
-./bin/dnssec/dnssec-revoke.docbook		SGML	2009,2011,2014,2015,2016
+./bin/dnssec/dnssec-revoke.c			C	2009,2010,2011,2012,2014,2015,2016,2017,2018
+./bin/dnssec/dnssec-revoke.docbook		SGML	2009,2011,2014,2015,2016,2018
 ./bin/dnssec/dnssec-revoke.html			HTML	DOCBOOK
 ./bin/dnssec/dnssec-settime.8			MAN	DOCBOOK
-./bin/dnssec/dnssec-settime.c			C	2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/dnssec/dnssec-settime.docbook		SGML	2009,2010,2011,2014,2015,2016,2017
+./bin/dnssec/dnssec-settime.c			C	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/dnssec/dnssec-settime.docbook		SGML	2009,2010,2011,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-settime.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-signzone.8			MAN	DOCBOOK
 ./bin/dnssec/dnssec-signzone.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/dnssec/dnssec-signzone.docbook		SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
+./bin/dnssec/dnssec-signzone.docbook		SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-signzone.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-verify.8			MAN	DOCBOOK
-./bin/dnssec/dnssec-verify.c			C	2012,2014,2015,2016,2017
-./bin/dnssec/dnssec-verify.docbook		SGML	2012,2014,2015,2016
+./bin/dnssec/dnssec-verify.c			C	2012,2014,2015,2016,2017,2018
+./bin/dnssec/dnssec-verify.docbook		SGML	2012,2014,2015,2016,2018
 ./bin/dnssec/dnssec-verify.html			HTML	DOCBOOK
 ./bin/dnssec/dnssectool.c			C	2000,2001,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/dnssec/dnssectool.h			C	2000,2001,2003,2004,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017
-./bin/dnssec/win32/dnssectool.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/dnssectool.vcxproj.in	X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/dnssectool.vcxproj.user	X	2013
-./bin/dnssec/win32/dsfromkey.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/dsfromkey.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/dsfromkey.vcxproj.user	X	2013
-./bin/dnssec/win32/importkey.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/importkey.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/importkey.vcxproj.user	X	2013
-./bin/dnssec/win32/keyfromlabel.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/keyfromlabel.vcxproj.in	X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/keyfromlabel.vcxproj.user	X	2013
-./bin/dnssec/win32/keygen.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/keygen.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/keygen.vcxproj.user		X	2013
-./bin/dnssec/win32/revoke.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/revoke.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/revoke.vcxproj.user		X	2013
-./bin/dnssec/win32/settime.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/settime.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/settime.vcxproj.user		X	2013
-./bin/dnssec/win32/signzone.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/signzone.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/signzone.vcxproj.user	X	2013
-./bin/dnssec/win32/verify.vcxproj.filters.in	X	2013,2015
-./bin/dnssec/win32/verify.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/dnssec/win32/verify.vcxproj.user		X	2013
-./bin/named/.gitignore				X	2012,2014,2017
-./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/named/bind9.xsl				SGML	2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
-./bin/named/bind9.xsl.h				X	2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./bin/named/builtin.c				C	2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/named/config.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/dnssec/dnssectool.h			C	2000,2001,2003,2004,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
+./bin/dnssec/win32/dnssectool.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/dnssectool.vcxproj.in	X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/dnssectool.vcxproj.user	X	2013,2018
+./bin/dnssec/win32/dsfromkey.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/dsfromkey.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/dsfromkey.vcxproj.user	X	2013,2018
+./bin/dnssec/win32/importkey.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/importkey.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/importkey.vcxproj.user	X	2013,2018
+./bin/dnssec/win32/keyfromlabel.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/keyfromlabel.vcxproj.in	X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/keyfromlabel.vcxproj.user	X	2013,2018
+./bin/dnssec/win32/keygen.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/keygen.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/keygen.vcxproj.user		X	2013,2018
+./bin/dnssec/win32/revoke.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/revoke.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/revoke.vcxproj.user		X	2013,2018
+./bin/dnssec/win32/settime.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/settime.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/settime.vcxproj.user		X	2013,2018
+./bin/dnssec/win32/signzone.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/signzone.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/signzone.vcxproj.user	X	2013,2018
+./bin/dnssec/win32/verify.vcxproj.filters.in	X	2013,2015,2018
+./bin/dnssec/win32/verify.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/dnssec/win32/verify.vcxproj.user		X	2013,2018
+./bin/named/.gitignore				X	2012,2014,2017,2018
+./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/named/bind9.xsl				SGML	2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
+./bin/named/bind9.xsl.h				X	2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/named/builtin.c				C	2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/named/config.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/control.c				C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/named/controlconf.c			C	2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016,2017
-./bin/named/convertxsl.pl			PERL	2006,2007,2008,2012,2014,2016
-./bin/named/fuzz.c				C	2016,2017
-./bin/named/geoip.c				C	2013,2014,2016,2017
-./bin/named/include/.gitignore			X	2012,2014
-./bin/named/include/dlz/dlz_dlopen_driver.h	C	2011,2016
-./bin/named/include/named/builtin.h		C	2001,2004,2005,2007,2016,2017
-./bin/named/include/named/config.h		C	2001,2002,2004,2005,2006,2007,2009,2013,2016,2017
-./bin/named/include/named/control.h		C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2014,2015,2016,2017
-./bin/named/include/named/fuzz.h		C	2016,2017
-./bin/named/include/named/geoip.h		C	2013,2016,2017
-./bin/named/include/named/globals.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/named/include/named/log.h			C	1999,2000,2001,2002,2004,2005,2007,2009,2015,2016,2017
-./bin/named/include/named/logconf.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2017
-./bin/named/include/named/main.h		C	1999,2000,2001,2002,2004,2005,2007,2009,2013,2015,2016,2017
-./bin/named/include/named/server.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/named/include/named/smf_globals.h		C	2017
-./bin/named/include/named/statschannel.h	C	2008,2016,2017
-./bin/named/include/named/tkeyconf.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2017
-./bin/named/include/named/tsigconf.h		C	1999,2000,2001,2004,2005,2006,2007,2009,2016,2017
-./bin/named/include/named/types.h		C	1999,2000,2001,2004,2005,2006,2007,2008,2009,2015,2016,2017
-./bin/named/include/named/zoneconf.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2010,2011,2015,2016,2017
-./bin/named/log.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2013,2014,2016,2017
-./bin/named/logconf.c				C	1999,2000,2001,2004,2005,2006,2007,2011,2013,2014,2015,2016,2017
+./bin/named/controlconf.c			C	2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/named/convertxsl.pl			PERL	2006,2007,2008,2012,2014,2016,2018
+./bin/named/fuzz.c				C	2016,2017,2018
+./bin/named/geoip.c				C	2013,2014,2016,2017,2018
+./bin/named/include/.gitignore			X	2012,2014,2018
+./bin/named/include/dlz/dlz_dlopen_driver.h	C	2011,2016,2018
+./bin/named/include/named/builtin.h		C	2001,2004,2005,2007,2016,2017,2018
+./bin/named/include/named/config.h		C	2001,2002,2004,2005,2006,2007,2009,2013,2016,2017,2018
+./bin/named/include/named/control.h		C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2014,2015,2016,2017,2018
+./bin/named/include/named/fuzz.h		C	2016,2017,2018
+./bin/named/include/named/geoip.h		C	2013,2016,2017,2018
+./bin/named/include/named/globals.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/named/include/named/log.h			C	1999,2000,2001,2002,2004,2005,2007,2009,2015,2016,2017,2018
+./bin/named/include/named/logconf.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2017,2018
+./bin/named/include/named/main.h		C	1999,2000,2001,2002,2004,2005,2007,2009,2013,2015,2016,2017,2018
+./bin/named/include/named/server.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/named/include/named/smf_globals.h		C	2017,2018
+./bin/named/include/named/statschannel.h	C	2008,2016,2017,2018
+./bin/named/include/named/tkeyconf.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2017,2018
+./bin/named/include/named/tsigconf.h		C	1999,2000,2001,2004,2005,2006,2007,2009,2016,2017,2018
+./bin/named/include/named/types.h		C	1999,2000,2001,2004,2005,2006,2007,2008,2009,2015,2016,2017,2018
+./bin/named/include/named/zoneconf.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2010,2011,2015,2016,2017,2018
+./bin/named/log.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2013,2014,2016,2017,2018
+./bin/named/logconf.c				C	1999,2000,2001,2004,2005,2006,2007,2011,2013,2014,2015,2016,2017,2018
 ./bin/named/main.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/named.8				MAN	DOCBOOK
 ./bin/named/named.conf.5			MAN	DOCBOOK
 ./bin/named/named.conf.docbook			SGML	2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/named.conf.html			HTML	DOCBOOK
-./bin/named/named.docbook			SGML	2000,2001,2003,2004,2005,2006,2007,2008,2009,2011,2013,2014,2015,2016,2017
+./bin/named/named.docbook			SGML	2000,2001,2003,2004,2005,2006,2007,2008,2009,2011,2013,2014,2015,2016,2017,2018
 ./bin/named/named.html				HTML	DOCBOOK
 ./bin/named/server.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/named/statschannel.c			C	2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/named/tkeyconf.c				C	1999,2000,2001,2004,2005,2006,2007,2009,2010,2012,2014,2016,2017
-./bin/named/tsigconf.c				C	1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2016,2017
-./bin/named/unix/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2011,2012,2016
-./bin/named/unix/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016,2017
-./bin/named/unix/include/named/os.h		C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2014,2016,2017
+./bin/named/statschannel.c			C	2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/named/tkeyconf.c				C	1999,2000,2001,2004,2005,2006,2007,2009,2010,2012,2014,2016,2017,2018
+./bin/named/tsigconf.c				C	1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2016,2017,2018
+./bin/named/unix/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2011,2012,2016,2018
+./bin/named/unix/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016,2017,2018
+./bin/named/unix/include/named/os.h		C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2014,2016,2017,2018
 ./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
-./bin/named/win32/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016
-./bin/named/win32/include/named/ntservice.h	C	1999,2000,2001,2002,2003,2004,2007,2016
-./bin/named/win32/include/named/os.h		C	1999,2000,2001,2002,2004,2007,2008,2009,2014,2016,2017
+./bin/named/win32/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016,2018
+./bin/named/win32/include/named/ntservice.h	C	1999,2000,2001,2002,2003,2004,2007,2016,2018
+./bin/named/win32/include/named/os.h		C	1999,2000,2001,2002,2004,2007,2008,2009,2014,2016,2017,2018
 ./bin/named/win32/named.vcxproj.filters.in	X	2013,2015,2016,2017,2018
 ./bin/named/win32/named.vcxproj.in		X	2013,2014,2015,2016,2017,2018
-./bin/named/win32/named.vcxproj.user		X	2013
-./bin/named/win32/ntservice.c			C	1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015,2016,2017
-./bin/named/win32/os.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017
+./bin/named/win32/named.vcxproj.user		X	2013,2018
+./bin/named/win32/ntservice.c			C	1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015,2016,2017,2018
+./bin/named/win32/os.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/zoneconf.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/nsupdate/.gitignore			X	2012
-./bin/nsupdate/Makefile.in			MAKE	2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
+./bin/nsupdate/.gitignore			X	2012,2018
+./bin/nsupdate/Makefile.in			MAKE	2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/nsupdate/nsupdate.1			MAN	DOCBOOK
 ./bin/nsupdate/nsupdate.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/nsupdate/nsupdate.docbook			SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017
+./bin/nsupdate/nsupdate.docbook			SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/nsupdate/nsupdate.html			HTML	DOCBOOK
-./bin/nsupdate/win32/nsupdate.vcxproj.filters.in	X	2013,2015
-./bin/nsupdate/win32/nsupdate.vcxproj.in	X	2013,2014,2015,2016,2017
-./bin/nsupdate/win32/nsupdate.vcxproj.user	X	2013
-./bin/pkcs11/.gitignore				X	2014
-./bin/pkcs11/Makefile.in			MAKE	2009,2012,2014,2015,2016,2017
-./bin/pkcs11/OLD-PKCS11-NOTES			X	2009
-./bin/pkcs11/openssl-0.9.8zh-patch		X	2015
-./bin/pkcs11/openssl-1.0.0t-patch		X	2015
-./bin/pkcs11/openssl-1.0.1t-patch		X	2016
-./bin/pkcs11/openssl-1.0.2h-patch		X	2016
+./bin/nsupdate/win32/nsupdate.vcxproj.filters.in	X	2013,2015,2018
+./bin/nsupdate/win32/nsupdate.vcxproj.in	X	2013,2014,2015,2016,2017,2018
+./bin/nsupdate/win32/nsupdate.vcxproj.user	X	2013,2018
+./bin/pkcs11/.gitignore				X	2014,2018
+./bin/pkcs11/Makefile.in			MAKE	2009,2012,2014,2015,2016,2017,2018
+./bin/pkcs11/OLD-PKCS11-NOTES			X	2009,2018
+./bin/pkcs11/openssl-0.9.8zh-patch		X	2015,2018
+./bin/pkcs11/openssl-1.0.0t-patch		X	2015,2018
+./bin/pkcs11/openssl-1.0.1t-patch		X	2016,2018
+./bin/pkcs11/openssl-1.0.2h-patch		X	2016,2018
 ./bin/pkcs11/pkcs11-destroy.8			MAN	DOCBOOK
 ./bin/pkcs11/pkcs11-destroy.c			X	2009,2010,2014,2015,2018
-./bin/pkcs11/pkcs11-destroy.docbook		SGML	2009,2014,2015,2016
+./bin/pkcs11/pkcs11-destroy.docbook		SGML	2009,2014,2015,2016,2018
 ./bin/pkcs11/pkcs11-destroy.html		HTML	DOCBOOK
 ./bin/pkcs11/pkcs11-keygen.8			MAN	DOCBOOK
-./bin/pkcs11/pkcs11-keygen.c			X	2009,2014,2015,2017
-./bin/pkcs11/pkcs11-keygen.docbook		SGML	2009,2014,2015,2016,2017
+./bin/pkcs11/pkcs11-keygen.c			X	2009,2014,2015,2017,2018
+./bin/pkcs11/pkcs11-keygen.docbook		SGML	2009,2014,2015,2016,2017,2018
 ./bin/pkcs11/pkcs11-keygen.html			HTML	DOCBOOK
 ./bin/pkcs11/pkcs11-list.8			MAN	DOCBOOK
 ./bin/pkcs11/pkcs11-list.c			C	2009,2014,2015,2016,2018
-./bin/pkcs11/pkcs11-list.docbook		SGML	2009,2014,2015,2016
+./bin/pkcs11/pkcs11-list.docbook		SGML	2009,2014,2015,2016,2018
 ./bin/pkcs11/pkcs11-list.html			HTML	DOCBOOK
 ./bin/pkcs11/pkcs11-tokens.8			MAN	DOCBOOK
-./bin/pkcs11/pkcs11-tokens.c			C	2014,2015,2016
-./bin/pkcs11/pkcs11-tokens.docbook		SGML	2014,2015,2016
+./bin/pkcs11/pkcs11-tokens.c			C	2014,2015,2016,2018
+./bin/pkcs11/pkcs11-tokens.docbook		SGML	2014,2015,2016,2018
 ./bin/pkcs11/pkcs11-tokens.html			HTML	DOCBOOK
-./bin/pkcs11/win32/pk11destroy.vcxproj.filters.in	X	2013,2014,2015
-./bin/pkcs11/win32/pk11destroy.vcxproj.in	X	2013,2014,2015,2016,2017
-./bin/pkcs11/win32/pk11destroy.vcxproj.user	X	2013
-./bin/pkcs11/win32/pk11keygen.vcxproj.filters.in	X	2013,2014,2015
-./bin/pkcs11/win32/pk11keygen.vcxproj.in	X	2013,2014,2015,2016,2017
-./bin/pkcs11/win32/pk11keygen.vcxproj.user	X	2013
-./bin/pkcs11/win32/pk11list.vcxproj.filters.in	X	2013,2014,2015
-./bin/pkcs11/win32/pk11list.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/pkcs11/win32/pk11list.vcxproj.user	X	2013
-./bin/pkcs11/win32/pk11tokens.vcxproj.filters.in	X	2014,2015
-./bin/pkcs11/win32/pk11tokens.vcxproj.in	X	2014,2015,2016,2017
-./bin/pkcs11/win32/pk11tokens.vcxproj.user	X	2014
-./bin/python/.gitignore				X	2012,2013,2016
-./bin/python/Makefile.in			MAKE	2012,2013,2014,2016,2017
+./bin/pkcs11/win32/pk11destroy.vcxproj.filters.in	X	2013,2014,2015,2018
+./bin/pkcs11/win32/pk11destroy.vcxproj.in	X	2013,2014,2015,2016,2017,2018
+./bin/pkcs11/win32/pk11destroy.vcxproj.user	X	2013,2018
+./bin/pkcs11/win32/pk11keygen.vcxproj.filters.in	X	2013,2014,2015,2018
+./bin/pkcs11/win32/pk11keygen.vcxproj.in	X	2013,2014,2015,2016,2017,2018
+./bin/pkcs11/win32/pk11keygen.vcxproj.user	X	2013,2018
+./bin/pkcs11/win32/pk11list.vcxproj.filters.in	X	2013,2014,2015,2018
+./bin/pkcs11/win32/pk11list.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/pkcs11/win32/pk11list.vcxproj.user	X	2013,2018
+./bin/pkcs11/win32/pk11tokens.vcxproj.filters.in	X	2014,2015,2018
+./bin/pkcs11/win32/pk11tokens.vcxproj.in	X	2014,2015,2016,2017,2018
+./bin/pkcs11/win32/pk11tokens.vcxproj.user	X	2014,2018
+./bin/python/.gitignore				X	2012,2013,2016,2018
+./bin/python/Makefile.in			MAKE	2012,2013,2014,2016,2017,2018
 ./bin/python/dnssec-checkds.8			MAN	DOCBOOK
-./bin/python/dnssec-checkds.docbook		SGML	2012,2013,2014,2015,2016,2017
+./bin/python/dnssec-checkds.docbook		SGML	2012,2013,2014,2015,2016,2017,2018
 ./bin/python/dnssec-checkds.html		HTML	DOCBOOK
-./bin/python/dnssec-checkds.py.in		PYTHON-BIN	2012,2013,2014,2015,2016,2017
+./bin/python/dnssec-checkds.py.in		PYTHON-BIN	2012,2013,2014,2015,2016,2017,2018
 ./bin/python/dnssec-coverage.8			MAN	DOCBOOK
-./bin/python/dnssec-coverage.docbook		SGML	2013,2014,2015,2016
+./bin/python/dnssec-coverage.docbook		SGML	2013,2014,2015,2016,2018
 ./bin/python/dnssec-coverage.html		HTML	DOCBOOK
-./bin/python/dnssec-coverage.py.in		PYTHON-BIN	2013,2014,2015,2016,2017
+./bin/python/dnssec-coverage.py.in		PYTHON-BIN	2013,2014,2015,2016,2017,2018
 ./bin/python/dnssec-keymgr.8			MAN	DOCBOOK
-./bin/python/dnssec-keymgr.docbook		SGML	2016,2017
+./bin/python/dnssec-keymgr.docbook		SGML	2016,2017,2018
 ./bin/python/dnssec-keymgr.html			HTML	DOCBOOK
-./bin/python/dnssec-keymgr.py.in		PYTHON-BIN	2016,2017
-./bin/python/isc/.gitignore			X	2016
-./bin/python/isc/Makefile.in			MAKE	2016
-./bin/python/isc/__init__.py.in			PYTHON	2016
-./bin/python/isc/checkds.py.in			PYTHON	2012,2013,2014,2015,2016,2017
-./bin/python/isc/coverage.py.in			PYTHON	2013,2014,2015,2016,2017
-./bin/python/isc/dnskey.py.in			PYTHON	2013,2014,2015,2016,2017
-./bin/python/isc/eventlist.py.in		PYTHON	2015,2016
-./bin/python/isc/keydict.py.in			PYTHON	2016
-./bin/python/isc/keyevent.py.in			PYTHON	2013,2014,2015,2016
-./bin/python/isc/keymgr.py.in			PYTHON	2016
-./bin/python/isc/keyseries.py.in		PYTHON	2016
-./bin/python/isc/keyzone.py.in			PYTHON	2013,2014,2015,2016
-./bin/python/isc/policy.py.in			PYTHON	2016,2017
-./bin/python/isc/rndc.py.in			PYTHON	2016
-./bin/python/isc/tests/.gitignore		X	2016
-./bin/python/isc/tests/Makefile.in		MAKE	2016
-./bin/python/isc/tests/dnskey_test.py.in	PYTHON	2016
-./bin/python/isc/tests/policy_test.py.in	PYTHON	2016,2017
-./bin/python/isc/tests/test-policies/01-keysize.pol	CONF-C	2016
-./bin/python/isc/tests/test-policies/02-prepublish.pol	CONF-C	2016
-./bin/python/isc/tests/test-policies/03-postpublish.pol	CONF-C	2016
-./bin/python/isc/tests/test-policies/04-combined-pre-post.pol	CONF-C	2016
-./bin/python/isc/tests/test-policies/05-numeric-zone.pol	CONF-C	2017
-./bin/python/isc/tests/testdata/Kexample.com.+007+35529.key	X	2016
-./bin/python/isc/tests/testdata/Kexample.com.+007+35529.private	X	2016
-./bin/python/isc/utils.py.in			PYTHON	2016
+./bin/python/dnssec-keymgr.py.in		PYTHON-BIN	2016,2017,2018
+./bin/python/isc/.gitignore			X	2016,2018
+./bin/python/isc/Makefile.in			MAKE	2016,2018
+./bin/python/isc/__init__.py.in			PYTHON	2016,2018
+./bin/python/isc/checkds.py.in			PYTHON	2012,2013,2014,2015,2016,2017,2018
+./bin/python/isc/coverage.py.in			PYTHON	2013,2014,2015,2016,2017,2018
+./bin/python/isc/dnskey.py.in			PYTHON	2013,2014,2015,2016,2017,2018
+./bin/python/isc/eventlist.py.in		PYTHON	2015,2016,2018
+./bin/python/isc/keydict.py.in			PYTHON	2016,2018
+./bin/python/isc/keyevent.py.in			PYTHON	2013,2014,2015,2016,2018
+./bin/python/isc/keymgr.py.in			PYTHON	2016,2018
+./bin/python/isc/keyseries.py.in		PYTHON	2016,2018
+./bin/python/isc/keyzone.py.in			PYTHON	2013,2014,2015,2016,2018
+./bin/python/isc/policy.py.in			PYTHON	2016,2017,2018
+./bin/python/isc/rndc.py.in			PYTHON	2016,2018
+./bin/python/isc/tests/.gitignore		X	2016,2018
+./bin/python/isc/tests/Makefile.in		MAKE	2016,2018
+./bin/python/isc/tests/dnskey_test.py.in	PYTHON	2016,2018
+./bin/python/isc/tests/policy_test.py.in	PYTHON	2016,2017,2018
+./bin/python/isc/tests/test-policies/01-keysize.pol	CONF-C	2016,2018
+./bin/python/isc/tests/test-policies/02-prepublish.pol	CONF-C	2016,2018
+./bin/python/isc/tests/test-policies/03-postpublish.pol	CONF-C	2016,2018
+./bin/python/isc/tests/test-policies/04-combined-pre-post.pol	CONF-C	2016,2018
+./bin/python/isc/tests/test-policies/05-numeric-zone.pol	CONF-C	2017,2018
+./bin/python/isc/tests/testdata/Kexample.com.+007+35529.key	X	2016,2018
+./bin/python/isc/tests/testdata/Kexample.com.+007+35529.private	X	2016,2018
+./bin/python/isc/utils.py.in			PYTHON	2016,2018
 ./bin/python/setup.py				PYTHON	2016,2018
-./bin/rndc/.gitignore				X	2012,2014
-./bin/rndc/Makefile.in				MAKE	2000,2001,2002,2004,2007,2009,2012,2014,2015,2016,2017
-./bin/rndc/include/rndc/os.h			C	2001,2004,2005,2007,2009,2016
+./bin/rndc/.gitignore				X	2012,2014,2018
+./bin/rndc/Makefile.in				MAKE	2000,2001,2002,2004,2007,2009,2012,2014,2015,2016,2017,2018
+./bin/rndc/include/rndc/os.h			C	2001,2004,2005,2007,2009,2016,2018
 ./bin/rndc/rndc.8				MAN	DOCBOOK
 ./bin/rndc/rndc.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/rndc/rndc.conf				CONF-C	2000,2001,2004,2007,2013,2014,2016
+./bin/rndc/rndc.conf				CONF-C	2000,2001,2004,2007,2013,2014,2016,2018
 ./bin/rndc/rndc.conf.5				MAN	DOCBOOK
-./bin/rndc/rndc.conf.docbook			SGML	2000,2001,2004,2005,2007,2013,2014,2015,2016
+./bin/rndc/rndc.conf.docbook			SGML	2000,2001,2004,2005,2007,2013,2014,2015,2016,2018
 ./bin/rndc/rndc.conf.html			HTML	DOCBOOK
 ./bin/rndc/rndc.docbook				SGML	2000,2001,2004,2005,2007,2013,2014,2015,2016,2017,2018
 ./bin/rndc/rndc.html				HTML	DOCBOOK
-./bin/rndc/util.c				C	2000,2001,2004,2005,2007,2015,2016
-./bin/rndc/util.h				C	2000,2001,2004,2005,2007,2009,2016
-./bin/rndc/win32/rndc.vcxproj.filters.in	X	2013,2015
-./bin/rndc/win32/rndc.vcxproj.in		X	2013,2015,2016,2017
-./bin/rndc/win32/rndc.vcxproj.user		X	2013
-./bin/rndc/win32/rndcutil.vcxproj.filters.in	X	2013,2015
-./bin/rndc/win32/rndcutil.vcxproj.in		X	2013,2015,2016,2017
-./bin/rndc/win32/rndcutil.vcxproj.user		X	2013
-./bin/tests/.gitignore				X	2012,2013,2017
-./bin/tests/Kchild.example.+003+04017.key	X	2000,2001
-./bin/tests/Kchild.example.+003+04017.private	X	2000,2001
-./bin/tests/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/adb_test.c				C	1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016
-./bin/tests/atomic/Makefile.in			MAKE	2011,2012,2014,2016,2017
-./bin/tests/atomic/t_atomic.c			C	2011,2013,2015,2016,2017
-./bin/tests/atomic/win32/t_atomic.vcxproj.filters.in	X	2013,2015
-./bin/tests/atomic/win32/t_atomic.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/atomic/win32/t_atomic.vcxproj.user	X	2013
-./bin/tests/b8t.mk				MAKE	1999,2000,2001,2004,2007,2012,2016
-./bin/tests/b9t.mk				MAKE	1999,2000,2001,2004,2007,2012,2016
-./bin/tests/backtrace_test.c			C	2009,2013,2015,2016
-./bin/tests/bigtest/README			TXT.BRIEF	2013,2016
-./bin/tests/bigtest/buildzones.sh		SH	2013,2016
-./bin/tests/bigtest/rndc.key			X	2013
-./bin/tests/bigtest/tests.sh			SH	2013,2016
-./bin/tests/bigtest/zones			X	2013
-./bin/tests/byaddr_test.c			C	2000,2001,2002,2004,2005,2007,2012,2015,2016
-./bin/tests/byname_test.c			C	2000,2001,2004,2005,2007,2009,2012,2015,2016,2017
+./bin/rndc/util.c				C	2000,2001,2004,2005,2007,2015,2016,2018
+./bin/rndc/util.h				C	2000,2001,2004,2005,2007,2009,2016,2018
+./bin/rndc/win32/rndc.vcxproj.filters.in	X	2013,2015,2018
+./bin/rndc/win32/rndc.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/rndc/win32/rndc.vcxproj.user		X	2013,2018
+./bin/rndc/win32/rndcutil.vcxproj.filters.in	X	2013,2015,2018
+./bin/rndc/win32/rndcutil.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/rndc/win32/rndcutil.vcxproj.user		X	2013,2018
+./bin/tests/.gitignore				X	2012,2013,2017,2018
+./bin/tests/Kchild.example.+003+04017.key	X	2000,2001,2018
+./bin/tests/Kchild.example.+003+04017.private	X	2000,2001,2018
+./bin/tests/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/adb_test.c				C	1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
+./bin/tests/atomic/Makefile.in			MAKE	2011,2012,2014,2016,2017,2018
+./bin/tests/atomic/t_atomic.c			C	2011,2013,2015,2016,2017,2018
+./bin/tests/atomic/win32/t_atomic.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/atomic/win32/t_atomic.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/atomic/win32/t_atomic.vcxproj.user	X	2013,2018
+./bin/tests/b8t.mk				MAKE	1999,2000,2001,2004,2007,2012,2016,2018
+./bin/tests/b9t.mk				MAKE	1999,2000,2001,2004,2007,2012,2016,2018
+./bin/tests/backtrace_test.c			C	2009,2013,2015,2016,2018
+./bin/tests/bigtest/README			TXT.BRIEF	2013,2016,2018
+./bin/tests/bigtest/buildzones.sh		SH	2013,2016,2018
+./bin/tests/bigtest/rndc.key			X	2013,2018
+./bin/tests/bigtest/tests.sh			SH	2013,2016,2018
+./bin/tests/bigtest/zones			X	2013,2018
+./bin/tests/byaddr_test.c			C	2000,2001,2002,2004,2005,2007,2012,2015,2016,2018
+./bin/tests/byname_test.c			C	2000,2001,2004,2005,2007,2009,2012,2015,2016,2017,2018
 ./bin/tests/cfg_test.c				C	2001,2002,2004,2005,2007,2009,2010,2011,2015,2016,2018
-./bin/tests/db/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2010,2012,2014,2016,2017
-./bin/tests/db/dns_db_class_1.data		X	1999,2000,2001
-./bin/tests/db/dns_db_class_data		X	1999,2000,2001
-./bin/tests/db/dns_db_closeversion_1.data	X	1999,2000,2001
-./bin/tests/db/dns_db_closeversion_1_data	X	1999,2000,2001
-./bin/tests/db/dns_db_closeversion_2.data	X	1999,2000,2001
-./bin/tests/db/dns_db_closeversion_2_data	X	1999,2000,2001
-./bin/tests/db/dns_db_currentversion.data	X	1999,2000,2001
-./bin/tests/db/dns_db_currentversion_data	X	1999,2000,2001
-./bin/tests/db/dns_db_expirenode.data		X	1999,2000,2001
-./bin/tests/db/dns_db_expirenode_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_1.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_10.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_10_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_1_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_2.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_2_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_3.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_3_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_4.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_4_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_5.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_5_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_6.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_6_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_7.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_7_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_8.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_8_data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_9.data		X	1999,2000,2001
-./bin/tests/db/dns_db_find_9_data		X	1999,2000,2001
-./bin/tests/db/dns_db_findnode_1.data		X	1999,2000,2001
-./bin/tests/db/dns_db_findnode_1_data		X	1999,2000,2001
-./bin/tests/db/dns_db_findnode_2.data		X	1999,2000,2001
-./bin/tests/db/dns_db_findnode_2_data		X	1999,2000,2001
-./bin/tests/db/dns_db_iscache_1.data		X	1999,2000,2001
-./bin/tests/db/dns_db_iscache_1_data		X	1999,2000,2001
-./bin/tests/db/dns_db_iscache_2.data		X	1999,2000,2001
-./bin/tests/db/dns_db_iscache_2_data		X	1999,2000,2001
-./bin/tests/db/dns_db_iszone_1.data		X	1999,2000,2001
-./bin/tests/db/dns_db_iszone_1_data		X	1999,2000,2001
-./bin/tests/db/dns_db_iszone_2.data		X	1999,2000,2001
-./bin/tests/db/dns_db_iszone_2_data		X	1999,2000,2001
-./bin/tests/db/dns_db_load_1.data		X	1999,2000,2001
-./bin/tests/db/dns_db_load_25.data		X	2000,2001
-./bin/tests/db/dns_db_load_data			X	1999,2000,2001
-./bin/tests/db/dns_db_load_soa_not_top		X	2000,2001
-./bin/tests/db/dns_db_newversion.data		X	1999,2000,2001
-./bin/tests/db/dns_db_newversion_data		X	1999,2000,2001
-./bin/tests/db/dns_db_origin_1.data		X	1999,2000,2001
-./bin/tests/db/dns_db_origin_data		X	1999,2000,2001
-./bin/tests/db/t_db.c				C	1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2017
-./bin/tests/db/win32/t_db.vcxproj.filters.in	X	2013,2015
-./bin/tests/db/win32/t_db.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/db/win32/t_db.vcxproj.user		X	2013
-./bin/tests/db_test.c				C	1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016,2017
-./bin/tests/dnssec-signzone/Kexample.com.+005+07065.key	X	2009
-./bin/tests/dnssec-signzone/Kexample.com.+005+07065.private	X	2009
-./bin/tests/dnssec-signzone/Kexample.com.+005+23362.key	X	2009
-./bin/tests/dnssec-signzone/Kexample.com.+005+23362.private	X	2009
-./bin/tests/dnssec-signzone/bogus-ksk.key	X	2009
-./bin/tests/dnssec-signzone/bogus-zsk.key	X	2009
-./bin/tests/dnssec-signzone/run-test.sh		SH	2009,2012,2016
-./bin/tests/dnssec-signzone/test1.zone		X	2009
-./bin/tests/dnssec-signzone/test2.zone		X	2009
-./bin/tests/dnssec-signzone/test3.zone		X	2009
-./bin/tests/dnssec-signzone/test4.zone		X	2009
-./bin/tests/dnssec-signzone/test5.zone		X	2009
-./bin/tests/dnssec-signzone/test6.zone		X	2009
-./bin/tests/dnssec-signzone/test7.zone		X	2009
-./bin/tests/dnssec-signzone/test8.zone		X	2009
-./bin/tests/dst/.gitignore			X	2012,2013
-./bin/tests/dst/Kdh.+002+18602.key.in		X	2001,2013
-./bin/tests/dst/Kdh.+002+18602.private.in	X	2001,2013
-./bin/tests/dst/Kdh.+002+48957.key.in		X	2001,2013
-./bin/tests/dst/Kdh.+002+48957.private.in	X	2001,2013
-./bin/tests/dst/Ktest.+001+00002.key.in		X	2001,2004,2013
-./bin/tests/dst/Ktest.+001+54622.key.in		X	1999,2000,2001,2004,2013
-./bin/tests/dst/Ktest.+001+54622.private.in	X	1999,2000,2001,2013
-./bin/tests/dst/Ktest.+003+23616.key.in		X	2001,2004,2013
-./bin/tests/dst/Ktest.+003+23616.private.in	X	2001,2013
-./bin/tests/dst/Ktest.+003+49667.key.in		X	2001,2004,2013
-./bin/tests/dst/Makefile.in			MAKE	1999,2000,2001,2002,2004,2006,2007,2008,2009,2010,2012,2013,2014,2016,2017
-./bin/tests/dst/dst_2_data.in			X	1999,2000,2001,2013
+./bin/tests/db/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2010,2012,2014,2016,2017,2018
+./bin/tests/db/dns_db_class_1.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_class_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_closeversion_1.data	X	1999,2000,2001,2018
+./bin/tests/db/dns_db_closeversion_1_data	X	1999,2000,2001,2018
+./bin/tests/db/dns_db_closeversion_2.data	X	1999,2000,2001,2018
+./bin/tests/db/dns_db_closeversion_2_data	X	1999,2000,2001,2018
+./bin/tests/db/dns_db_currentversion.data	X	1999,2000,2001,2018
+./bin/tests/db/dns_db_currentversion_data	X	1999,2000,2001,2018
+./bin/tests/db/dns_db_expirenode.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_expirenode_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_1.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_10.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_10_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_1_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_2.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_2_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_3.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_3_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_4.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_4_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_5.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_5_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_6.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_6_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_7.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_7_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_8.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_8_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_9.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_find_9_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_findnode_1.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_findnode_1_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_findnode_2.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_findnode_2_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iscache_1.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iscache_1_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iscache_2.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iscache_2_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iszone_1.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iszone_1_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iszone_2.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_iszone_2_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_load_1.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_load_25.data		X	2000,2001,2018
+./bin/tests/db/dns_db_load_data			X	1999,2000,2001,2018
+./bin/tests/db/dns_db_load_soa_not_top		X	2000,2001,2018
+./bin/tests/db/dns_db_newversion.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_newversion_data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_origin_1.data		X	1999,2000,2001,2018
+./bin/tests/db/dns_db_origin_data		X	1999,2000,2001,2018
+./bin/tests/db/t_db.c				C	1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2017,2018
+./bin/tests/db/win32/t_db.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/db/win32/t_db.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/db/win32/t_db.vcxproj.user		X	2013,2018
+./bin/tests/db_test.c				C	1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016,2017,2018
+./bin/tests/dnssec-signzone/Kexample.com.+005+07065.key	X	2009,2018
+./bin/tests/dnssec-signzone/Kexample.com.+005+07065.private	X	2009,2018
+./bin/tests/dnssec-signzone/Kexample.com.+005+23362.key	X	2009,2018
+./bin/tests/dnssec-signzone/Kexample.com.+005+23362.private	X	2009,2018
+./bin/tests/dnssec-signzone/bogus-ksk.key	X	2009,2018
+./bin/tests/dnssec-signzone/bogus-zsk.key	X	2009,2018
+./bin/tests/dnssec-signzone/run-test.sh		SH	2009,2012,2016,2018
+./bin/tests/dnssec-signzone/test1.zone		X	2009,2018
+./bin/tests/dnssec-signzone/test2.zone		X	2009,2018
+./bin/tests/dnssec-signzone/test3.zone		X	2009,2018
+./bin/tests/dnssec-signzone/test4.zone		X	2009,2018
+./bin/tests/dnssec-signzone/test5.zone		X	2009,2018
+./bin/tests/dnssec-signzone/test6.zone		X	2009,2018
+./bin/tests/dnssec-signzone/test7.zone		X	2009,2018
+./bin/tests/dnssec-signzone/test8.zone		X	2009,2018
+./bin/tests/dst/.gitignore			X	2012,2013,2018
+./bin/tests/dst/Kdh.+002+18602.key.in		X	2001,2013,2018
+./bin/tests/dst/Kdh.+002+18602.private.in	X	2001,2013,2018
+./bin/tests/dst/Kdh.+002+48957.key.in		X	2001,2013,2018
+./bin/tests/dst/Kdh.+002+48957.private.in	X	2001,2013,2018
+./bin/tests/dst/Ktest.+001+00002.key.in		X	2001,2004,2013,2018
+./bin/tests/dst/Ktest.+001+54622.key.in		X	1999,2000,2001,2004,2013,2018
+./bin/tests/dst/Ktest.+001+54622.private.in	X	1999,2000,2001,2013,2018
+./bin/tests/dst/Ktest.+003+23616.key.in		X	2001,2004,2013,2018
+./bin/tests/dst/Ktest.+003+23616.private.in	X	2001,2013,2018
+./bin/tests/dst/Ktest.+003+49667.key.in		X	2001,2004,2013,2018
+./bin/tests/dst/Makefile.in			MAKE	1999,2000,2001,2002,2004,2006,2007,2008,2009,2010,2012,2013,2014,2016,2017,2018
+./bin/tests/dst/dst_2_data.in			X	1999,2000,2001,2013,2018
 ./bin/tests/dst/dst_test.c			C	1999,2000,2001,2004,2005,2007,2009,2012,2014,2015,2016,2018
-./bin/tests/dst/gsstest.c			C	2006,2007,2009,2010,2011,2013,2014,2015,2016
-./bin/tests/dst/t2_data_1.in			X	1999,2000,2001,2013
-./bin/tests/dst/t2_data_2.in			X	1999,2000,2001,2013
-./bin/tests/dst/t2_dsasig.in			X	1999,2000,2001,2013
-./bin/tests/dst/t2_rsasig.in			X	1999,2000,2001,2013
-./bin/tests/dst/t_dst.c				C	1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2013,2014,2016,2017
-./bin/tests/dst/win32/REQUIRE_EXTENDED_DIR	X	2013
-./bin/tests/dst/win32/t_dst.vcxproj.filters.in	X	2013,2015
-./bin/tests/dst/win32/t_dst.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/dst/win32/t_dst.vcxproj.user	X	2013
+./bin/tests/dst/gsstest.c			C	2006,2007,2009,2010,2011,2013,2014,2015,2016,2018
+./bin/tests/dst/t2_data_1.in			X	1999,2000,2001,2013,2018
+./bin/tests/dst/t2_data_2.in			X	1999,2000,2001,2013,2018
+./bin/tests/dst/t2_dsasig.in			X	1999,2000,2001,2013,2018
+./bin/tests/dst/t2_rsasig.in			X	1999,2000,2001,2013,2018
+./bin/tests/dst/t_dst.c				C	1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/dst/win32/REQUIRE_EXTENDED_DIR	X	2013,2018
+./bin/tests/dst/win32/t_dst.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/dst/win32/t_dst.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/dst/win32/t_dst.vcxproj.user	X	2013,2018
 ./bin/tests/entropy2_test.c			C	2000,2001,2004,2005,2007,2015,2016,2018
 ./bin/tests/entropy_test.c			C	2000,2001,2004,2005,2007,2015,2016,2018
-./bin/tests/fromhex.pl				PERL	2015,2016
+./bin/tests/fromhex.pl				PERL	2015,2016,2018
 ./bin/tests/fsaccess_test.c			C	2000,2001,2004,2005,2007,2012,2015,2016,2018
-./bin/tests/hash_test.c				C	2000,2001,2004,2005,2006,2007,2014,2015,2016,2017
-./bin/tests/hashes/Makefile.in			MAKE	2010,2012,2014,2016,2017
-./bin/tests/hashes/t_hashes.c			C	2010,2013,2016
-./bin/tests/hashes/win32/t_hashes.vcxproj.filters.in	X	2013,2015
-./bin/tests/hashes/win32/t_hashes.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/hashes/win32/t_hashes.vcxproj.user	X	2013
-./bin/tests/headerdep_test.sh.in		SH	2000,2001,2004,2007,2012,2016
+./bin/tests/hash_test.c				C	2000,2001,2004,2005,2006,2007,2014,2015,2016,2017,2018
+./bin/tests/hashes/Makefile.in			MAKE	2010,2012,2014,2016,2017,2018
+./bin/tests/hashes/t_hashes.c			C	2010,2013,2016,2018
+./bin/tests/hashes/win32/t_hashes.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/hashes/win32/t_hashes.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/hashes/win32/t_hashes.vcxproj.user	X	2013,2018
+./bin/tests/headerdep_test.sh.in		SH	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/inter_test.c			C	2000,2001,2003,2004,2005,2007,2008,2015,2016,2018
-./bin/tests/keyboard_test.c			C	2000,2001,2004,2005,2007,2015,2016
-./bin/tests/lex_test.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016
-./bin/tests/lfsr_test.c				C	1999,2000,2001,2004,2005,2007,2015,2016
-./bin/tests/log_test.c				C	1999,2000,2001,2004,2007,2011,2014,2015,2016
-./bin/tests/makejournal.c			C	2013,2015,2016,2017
-./bin/tests/master/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
-./bin/tests/master/dns_master_load_10_data	X	2000,2001
-./bin/tests/master/dns_master_load_11_data	X	2000,2001
-./bin/tests/master/dns_master_load_1_data	X	1999,2000,2001
-./bin/tests/master/dns_master_load_2_data	X	1999,2000,2001
-./bin/tests/master/dns_master_load_3_data	X	1999,2000,2001
-./bin/tests/master/dns_master_load_4_data	X	1999,2000,2001
-./bin/tests/master/dns_master_load_5_data	X	1999,2000,2001
-./bin/tests/master/dns_master_load_6_data	X	1999,2000,2001
-./bin/tests/master/dns_master_load_7_data	X	1999,2000,2001
-./bin/tests/master/dns_master_load_8_data	X	2000,2001
-./bin/tests/master/dns_master_load_9_data	X	2000,2001
-./bin/tests/master/master1.data			X	1999,2000,2001
-./bin/tests/master/master10.data		X	2000,2001
-./bin/tests/master/master11.data		X	2000,2001
-./bin/tests/master/master2.data			X	1999,2000,2001
-./bin/tests/master/master3.data			X	1999,2000,2001
-./bin/tests/master/master4.data			X	1999,2000,2001
-./bin/tests/master/master5.data			X	1999,2000,2001
-./bin/tests/master/master6.data			X	1999,2000,2001,2003
-./bin/tests/master/master7.data			X	1999,2000,2001,2003
-./bin/tests/master/master8.data			X	2000,2001
-./bin/tests/master/master9.data			X	2000,2001
-./bin/tests/master/t_master.c			C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2013,2016,2017
-./bin/tests/master/win32/t_master.vcxproj.filters.in	X	2013,2015
-./bin/tests/master/win32/t_master.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/master/win32/t_master.vcxproj.user	X	2013
-./bin/tests/master_test.c			C	1999,2000,2001,2004,2007,2009,2015,2016,2017
-./bin/tests/mem/Makefile.in			MAKE	1998,1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2016,2017
+./bin/tests/keyboard_test.c			C	2000,2001,2004,2005,2007,2015,2016,2018
+./bin/tests/lex_test.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016,2018
+./bin/tests/lfsr_test.c				C	1999,2000,2001,2004,2005,2007,2015,2016,2018
+./bin/tests/log_test.c				C	1999,2000,2001,2004,2007,2011,2014,2015,2016,2018
+./bin/tests/makejournal.c			C	2013,2015,2016,2017,2018
+./bin/tests/master/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
+./bin/tests/master/dns_master_load_10_data	X	2000,2001,2018
+./bin/tests/master/dns_master_load_11_data	X	2000,2001,2018
+./bin/tests/master/dns_master_load_1_data	X	1999,2000,2001,2018
+./bin/tests/master/dns_master_load_2_data	X	1999,2000,2001,2018
+./bin/tests/master/dns_master_load_3_data	X	1999,2000,2001,2018
+./bin/tests/master/dns_master_load_4_data	X	1999,2000,2001,2018
+./bin/tests/master/dns_master_load_5_data	X	1999,2000,2001,2018
+./bin/tests/master/dns_master_load_6_data	X	1999,2000,2001,2018
+./bin/tests/master/dns_master_load_7_data	X	1999,2000,2001,2018
+./bin/tests/master/dns_master_load_8_data	X	2000,2001,2018
+./bin/tests/master/dns_master_load_9_data	X	2000,2001,2018
+./bin/tests/master/master1.data			X	1999,2000,2001,2018
+./bin/tests/master/master10.data		X	2000,2001,2018
+./bin/tests/master/master11.data		X	2000,2001,2018
+./bin/tests/master/master2.data			X	1999,2000,2001,2018
+./bin/tests/master/master3.data			X	1999,2000,2001,2018
+./bin/tests/master/master4.data			X	1999,2000,2001,2018
+./bin/tests/master/master5.data			X	1999,2000,2001,2018
+./bin/tests/master/master6.data			X	1999,2000,2001,2003,2018
+./bin/tests/master/master7.data			X	1999,2000,2001,2003,2018
+./bin/tests/master/master8.data			X	2000,2001,2018
+./bin/tests/master/master9.data			X	2000,2001,2018
+./bin/tests/master/t_master.c			C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2013,2016,2017,2018
+./bin/tests/master/win32/t_master.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/master/win32/t_master.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/master/win32/t_master.vcxproj.user	X	2013,2018
+./bin/tests/master_test.c			C	1999,2000,2001,2004,2007,2009,2015,2016,2017,2018
+./bin/tests/mem/Makefile.in			MAKE	1998,1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2016,2017,2018
 ./bin/tests/mem/t_mem.c				C	1999,2000,2001,2004,2007,2009,2013,2016,2018
-./bin/tests/mem/win32/t_mem.vcxproj.filters.in	X	2013,2015
-./bin/tests/mem/win32/t_mem.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/mem/win32/t_mem.vcxproj.user	X	2013
-./bin/tests/mempool_test.c			C	1999,2000,2001,2004,2007,2016
+./bin/tests/mem/win32/t_mem.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/mem/win32/t_mem.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/mem/win32/t_mem.vcxproj.user	X	2013,2018
+./bin/tests/mempool_test.c			C	1999,2000,2001,2004,2007,2016,2018
 ./bin/tests/name_test.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017,2018
-./bin/tests/named.conf				CONF-C	1999,2000,2001,2004,2007,2011,2015,2016
-./bin/tests/names/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
-./bin/tests/names/dns_name_compare_data		X	1999,2000,2001
-./bin/tests/names/dns_name_countlabels_data	X	1999,2000,2001,2003
-./bin/tests/names/dns_name_fromregion_data	X	1999,2000,2001,2003
-./bin/tests/names/dns_name_fromtext_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_1_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_2_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_3_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_4_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_5_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_6_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_7_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_8_data	X	1999,2000,2001,2006
-./bin/tests/names/dns_name_fullcompare_data	X	1999,2000,2001
-./bin/tests/names/dns_name_getlabel_data	X	1999,2000,2001
-./bin/tests/names/dns_name_getlabelsequence_data	X	1999,2000,2001
-./bin/tests/names/dns_name_hash_data		X	1999,2000,2001,2003,2012
-./bin/tests/names/dns_name_isabsolute_data	X	1999,2000,2001,2003
-./bin/tests/names/dns_name_issubdomain_data	X	1999,2000,2001
-./bin/tests/names/dns_name_rdatacompare_data	X	1999,2000,2001
-./bin/tests/names/dns_name_toregion_data	X	1999,2000,2001,2003
-./bin/tests/names/dns_name_totext_data		X	1999,2000,2001
-./bin/tests/names/dns_name_towire_1_data	X	1999,2000,2001
-./bin/tests/names/dns_name_towire_2_data	X	1999,2000,2001
-./bin/tests/names/t_names.c			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
-./bin/tests/names/win32/t_names.vcxproj.filters.in	X	2013,2015
-./bin/tests/names/win32/t_names.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/names/win32/t_names.vcxproj.user	X	2013
-./bin/tests/names/wire_test1.data		X	1999,2000,2001
-./bin/tests/names/wire_test2.data		X	1999,2000,2001
-./bin/tests/names/wire_test3_1.data		X	1999,2000,2001
-./bin/tests/names/wire_test3_2.data		X	1999,2000,2001
-./bin/tests/names/wire_test4.data		X	1999,2000,2001
-./bin/tests/names/wire_test5.data		X	1999,2000,2001
-./bin/tests/names/wire_test6.data		X	1999,2000,2001
-./bin/tests/names/wire_test7.data		X	1999,2000,2001
-./bin/tests/names/wire_test8.data		X	1999,2000,2001
-./bin/tests/ndc.conf				CONF-C	2000,2001,2004,2007,2016
-./bin/tests/ndc.conf-include			CONF-C	2001,2004,2007,2016
-./bin/tests/net/Makefile.in			MAKE	2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
-./bin/tests/net/driver.c			C	2000,2001,2004,2007,2015,2016,2017
-./bin/tests/net/driver.h			C	2000,2001,2004,2007,2016
-./bin/tests/net/netaddr_multicast.c		C	2000,2001,2004,2007,2015,2016
-./bin/tests/net/sockaddr_multicast.c		C	2000,2001,2004,2007,2016
-./bin/tests/net/testsuite.h			C	2000,2001,2004,2007,2016
-./bin/tests/nsecify.c				C	1999,2000,2001,2003,2004,2007,2008,2009,2011,2015,2016,2017
-./bin/tests/pkcs11/.gitignore			X	2014
-./bin/tests/pkcs11/Makefile.in			MAKE	2014,2016
-./bin/tests/pkcs11/README			X	2014,2016
-./bin/tests/pkcs11/benchmarks/Makefile.in	MAKE	2014,2016,2017
-./bin/tests/pkcs11/benchmarks/create.c		C	2014,2016
-./bin/tests/pkcs11/benchmarks/find.c		C	2014,2015,2016
-./bin/tests/pkcs11/benchmarks/genrsa.c		C	2014,2015,2016
-./bin/tests/pkcs11/benchmarks/login.c		C	2014,2015,2016
-./bin/tests/pkcs11/benchmarks/privrsa.c		C	2014,2016
-./bin/tests/pkcs11/benchmarks/pubrsa.c		C	2014,2016
-./bin/tests/pkcs11/benchmarks/random.c		C	2014,2015,2016
-./bin/tests/pkcs11/benchmarks/session.c		C	2014,2015,2016
-./bin/tests/pkcs11/benchmarks/sha1.c		C	2014,2015,2016
-./bin/tests/pkcs11/benchmarks/sign.c		C	2014,2015,2016
-./bin/tests/pkcs11/benchmarks/verify.c		C	2014,2015,2016
-./bin/tests/pkcs11/pkcs11-hmacmd5.c		C	2014,2015,2016
-./bin/tests/pkcs11/pkcs11-md5sum.c		C	2014,2015,2016
-./bin/tests/ratelimiter_test.c			C	1999,2000,2001,2004,2007,2015,2016
-./bin/tests/rbt/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
-./bin/tests/rbt/dns_rbt.data			X	1999,2000,2001
-./bin/tests/rbt/dns_rbt_addname_1_data		X	1999,2000,2001,2003
-./bin/tests/rbt/dns_rbt_addname_2_data		X	1999,2000,2001
-./bin/tests/rbt/dns_rbt_bitstring.data		X	1999,2000,2001,2003
-./bin/tests/rbt/dns_rbt_create_1_data		X	1999,2000,2001
-./bin/tests/rbt/dns_rbt_deletename_1_data	X	1999,2000,2001,2003
-./bin/tests/rbt/dns_rbt_deletename_2_data	X	1999,2000,2001,2003
-./bin/tests/rbt/dns_rbt_findname_1_data		X	1999,2000,2001,2003
-./bin/tests/rbt/dns_rbt_findname_2_data		X	1999,2000,2001,2003
-./bin/tests/rbt/dns_rbt_findname_3_data		X	1999,2000,2001,2003
-./bin/tests/rbt/dns_rbtnodechain_first_1.data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_first_2.data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_first_data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_init.data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_init_data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_last_1.data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_last_2.data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_last_data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_next.data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_next_data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_prev.data	X	1999,2000,2001
-./bin/tests/rbt/dns_rbtnodechain_prev_data	X	1999,2000,2001
+./bin/tests/named.conf				CONF-C	1999,2000,2001,2004,2007,2011,2015,2016,2018
+./bin/tests/names/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
+./bin/tests/names/dns_name_compare_data		X	1999,2000,2001,2018
+./bin/tests/names/dns_name_countlabels_data	X	1999,2000,2001,2003,2018
+./bin/tests/names/dns_name_fromregion_data	X	1999,2000,2001,2003,2018
+./bin/tests/names/dns_name_fromtext_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_1_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_2_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_3_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_4_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_5_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_6_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_7_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_fromwire_8_data	X	1999,2000,2001,2006,2018
+./bin/tests/names/dns_name_fullcompare_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_getlabel_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_getlabelsequence_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_hash_data		X	1999,2000,2001,2003,2012,2018
+./bin/tests/names/dns_name_isabsolute_data	X	1999,2000,2001,2003,2018
+./bin/tests/names/dns_name_issubdomain_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_rdatacompare_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_toregion_data	X	1999,2000,2001,2003,2018
+./bin/tests/names/dns_name_totext_data		X	1999,2000,2001,2018
+./bin/tests/names/dns_name_towire_1_data	X	1999,2000,2001,2018
+./bin/tests/names/dns_name_towire_2_data	X	1999,2000,2001,2018
+./bin/tests/names/t_names.c			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/names/win32/t_names.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/names/win32/t_names.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/names/win32/t_names.vcxproj.user	X	2013,2018
+./bin/tests/names/wire_test1.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test2.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test3_1.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test3_2.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test4.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test5.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test6.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test7.data		X	1999,2000,2001,2018
+./bin/tests/names/wire_test8.data		X	1999,2000,2001,2018
+./bin/tests/ndc.conf				CONF-C	2000,2001,2004,2007,2016,2018
+./bin/tests/ndc.conf-include			CONF-C	2001,2004,2007,2016,2018
+./bin/tests/net/Makefile.in			MAKE	2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
+./bin/tests/net/driver.c			C	2000,2001,2004,2007,2015,2016,2017,2018
+./bin/tests/net/driver.h			C	2000,2001,2004,2007,2016,2018
+./bin/tests/net/netaddr_multicast.c		C	2000,2001,2004,2007,2015,2016,2018
+./bin/tests/net/sockaddr_multicast.c		C	2000,2001,2004,2007,2016,2018
+./bin/tests/net/testsuite.h			C	2000,2001,2004,2007,2016,2018
+./bin/tests/nsecify.c				C	1999,2000,2001,2003,2004,2007,2008,2009,2011,2015,2016,2017,2018
+./bin/tests/pkcs11/.gitignore			X	2014,2018
+./bin/tests/pkcs11/Makefile.in			MAKE	2014,2016,2018
+./bin/tests/pkcs11/README			X	2014,2016,2018
+./bin/tests/pkcs11/benchmarks/Makefile.in	MAKE	2014,2016,2017,2018
+./bin/tests/pkcs11/benchmarks/create.c		C	2014,2016,2018
+./bin/tests/pkcs11/benchmarks/find.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/benchmarks/genrsa.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/benchmarks/login.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/benchmarks/privrsa.c		C	2014,2016,2018
+./bin/tests/pkcs11/benchmarks/pubrsa.c		C	2014,2016,2018
+./bin/tests/pkcs11/benchmarks/random.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/benchmarks/session.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/benchmarks/sha1.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/benchmarks/sign.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/benchmarks/verify.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/pkcs11-hmacmd5.c		C	2014,2015,2016,2018
+./bin/tests/pkcs11/pkcs11-md5sum.c		C	2014,2015,2016,2018
+./bin/tests/ratelimiter_test.c			C	1999,2000,2001,2004,2007,2015,2016,2018
+./bin/tests/rbt/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
+./bin/tests/rbt/dns_rbt.data			X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbt_addname_1_data		X	1999,2000,2001,2003,2018
+./bin/tests/rbt/dns_rbt_addname_2_data		X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbt_bitstring.data		X	1999,2000,2001,2003,2018
+./bin/tests/rbt/dns_rbt_create_1_data		X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbt_deletename_1_data	X	1999,2000,2001,2003,2018
+./bin/tests/rbt/dns_rbt_deletename_2_data	X	1999,2000,2001,2003,2018
+./bin/tests/rbt/dns_rbt_findname_1_data		X	1999,2000,2001,2003,2018
+./bin/tests/rbt/dns_rbt_findname_2_data		X	1999,2000,2001,2003,2018
+./bin/tests/rbt/dns_rbt_findname_3_data		X	1999,2000,2001,2003,2018
+./bin/tests/rbt/dns_rbtnodechain_first_1.data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_first_2.data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_first_data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_init.data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_init_data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_last_1.data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_last_2.data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_last_data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_next.data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_next_data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_prev.data	X	1999,2000,2001,2018
+./bin/tests/rbt/dns_rbtnodechain_prev_data	X	1999,2000,2001,2018
 ./bin/tests/rbt/t_rbt.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
-./bin/tests/rbt/win32/t_rbt.vcxproj.filters.in	X	2013,2015
-./bin/tests/rbt/win32/t_rbt.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/rbt/win32/t_rbt.vcxproj.user	X	2013
+./bin/tests/rbt/win32/t_rbt.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/rbt/win32/t_rbt.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/rbt/win32/t_rbt.vcxproj.user	X	2013,2018
 ./bin/tests/rbt_test.c				C	1999,2000,2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2018
-./bin/tests/rbt_test.out			X	1999,2000,2001
-./bin/tests/rbt_test.txt			SH	1999,2000,2001,2004,2007,2012,2016
-./bin/tests/resolv.conf.sample			CONF-SH	2000,2001,2004,2007,2012,2016
-./bin/tests/resolver/Makefile.in		MAKE	2011,2012,2014,2016,2017
-./bin/tests/resolver/t_resolver.c		C	2011,2012,2013,2014,2016
-./bin/tests/resolver/win32/t_resolver.vcxproj.filters.in	X	2013,2015
-./bin/tests/resolver/win32/t_resolver.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/resolver/win32/t_resolver.vcxproj.user	X	2013
+./bin/tests/rbt_test.out			X	1999,2000,2001,2018
+./bin/tests/rbt_test.txt			SH	1999,2000,2001,2004,2007,2012,2016,2018
+./bin/tests/resolv.conf.sample			CONF-SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/resolver/Makefile.in		MAKE	2011,2012,2014,2016,2017,2018
+./bin/tests/resolver/t_resolver.c		C	2011,2012,2013,2014,2016,2018
+./bin/tests/resolver/win32/t_resolver.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/resolver/win32/t_resolver.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/resolver/win32/t_resolver.vcxproj.user	X	2013,2018
 ./bin/tests/rwlock_test.c			C	1998,1999,2000,2001,2004,2005,2007,2013,2016,2017,2018
-./bin/tests/serial_test.c			C	1999,2000,2001,2003,2004,2007,2015,2016
+./bin/tests/serial_test.c			C	1999,2000,2001,2003,2004,2007,2015,2016,2018
 ./bin/tests/shutdown_test.c			C	1998,1999,2000,2001,2004,2007,2011,2013,2016,2017,2018
-./bin/tests/sig0_test.c				C	2000,2001,2004,2005,2007,2008,2009,2012,2015,2016
+./bin/tests/sig0_test.c				C	2000,2001,2004,2005,2007,2008,2009,2012,2015,2016,2018
 ./bin/tests/sock_test.c				C	1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/sockaddr/Makefile.in		MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
-./bin/tests/sockaddr/t_sockaddr.c		C	1999,2000,2001,2004,2007,2013,2016
-./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in	X	2013,2015
-./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user	X	2013
-./bin/tests/startperf/README			X	2011
-./bin/tests/startperf/clean.sh			SH	2011,2012,2016
-./bin/tests/startperf/makenames.pl		PERL	2011,2012,2016
-./bin/tests/startperf/mkzonefile.pl		PERL	2011,2012,2016
-./bin/tests/startperf/setup.sh			SH	2011,2012,2016
-./bin/tests/startperf/smallzone.db		ZONE	2011,2016
-./bin/tests/sym_test.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016
+./bin/tests/sockaddr/Makefile.in		MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
+./bin/tests/sockaddr/t_sockaddr.c		C	1999,2000,2001,2004,2007,2013,2016,2018
+./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user	X	2013,2018
+./bin/tests/startperf/README			X	2011,2018
+./bin/tests/startperf/clean.sh			SH	2011,2012,2016,2018
+./bin/tests/startperf/makenames.pl		PERL	2011,2012,2016,2018
+./bin/tests/startperf/mkzonefile.pl		PERL	2011,2012,2016,2018
+./bin/tests/startperf/setup.sh			SH	2011,2012,2016,2018
+./bin/tests/startperf/smallzone.db		ZONE	2011,2016,2018
+./bin/tests/sym_test.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016,2018
 ./bin/tests/system/.gitignore			X	2012,2016,2018
 ./bin/tests/system/Makefile.in			MAKE	2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/README			TXT.BRIEF	2000,2001,2004,2010,2011,2013,2015,2016,2017,2018
@@ -625,66 +625,66 @@
 ./bin/tests/system/acl/ns2/named5.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/acl/ns2/named6.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/acl/ns2/named7.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/acl/ns3/example.db		ZONE	2017
+./bin/tests/system/acl/ns3/example.db		ZONE	2017,2018
 ./bin/tests/system/acl/ns3/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/acl/ns4/example.db		ZONE	2017
-./bin/tests/system/acl/ns4/existing.db		ZONE	2017
+./bin/tests/system/acl/ns4/example.db		ZONE	2017,2018
+./bin/tests/system/acl/ns4/existing.db		ZONE	2017,2018
 ./bin/tests/system/acl/ns4/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/acl/setup.sh			SH	2008,2012,2014,2016,2018
 ./bin/tests/system/acl/tests.sh			SH	2008,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/additional/clean.sh		SH	2013,2014,2016,2017,2018
-./bin/tests/system/additional/ns1/mx.db		ZONE	2016
-./bin/tests/system/additional/ns1/named.args	X	2013,2014
+./bin/tests/system/additional/ns1/mx.db		ZONE	2016,2018
+./bin/tests/system/additional/ns1/named.args	X	2013,2014,2018
 ./bin/tests/system/additional/ns1/named1.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/additional/ns1/named2.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/additional/ns1/named3.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/additional/ns1/named4.conf.in	CONF-C	2016,2017,2018
-./bin/tests/system/additional/ns1/naptr.db	ZONE	2013,2016
-./bin/tests/system/additional/ns1/naptr2.db	ZONE	2013,2016
-./bin/tests/system/additional/ns1/nid.db	ZONE	2013,2016
-./bin/tests/system/additional/ns1/rt.db		ZONE	2013,2016
-./bin/tests/system/additional/ns1/rt2.db	ZONE	2013,2016
-./bin/tests/system/additional/ns1/srv.db	ZONE	2016
+./bin/tests/system/additional/ns1/naptr.db	ZONE	2013,2016,2018
+./bin/tests/system/additional/ns1/naptr2.db	ZONE	2013,2016,2018
+./bin/tests/system/additional/ns1/nid.db	ZONE	2013,2016,2018
+./bin/tests/system/additional/ns1/rt.db		ZONE	2013,2016,2018
+./bin/tests/system/additional/ns1/rt2.db	ZONE	2013,2016,2018
+./bin/tests/system/additional/ns1/srv.db	ZONE	2016,2018
 ./bin/tests/system/additional/ns3/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/additional/ns3/root.hint	ZONE	2017
+./bin/tests/system/additional/ns3/root.hint	ZONE	2017,2018
 ./bin/tests/system/additional/setup.sh		SH	2013,2016,2018
 ./bin/tests/system/additional/tests.sh		SH	2013,2016,2017,2018
 ./bin/tests/system/addzone/clean.sh		SH	2010,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/addzone/ns1/inlineslave.db	ZONE	2013,2016
+./bin/tests/system/addzone/ns1/inlineslave.db	ZONE	2013,2016,2018
 ./bin/tests/system/addzone/ns1/named.conf.in	CONF-C	2013,2016,2017,2018
-./bin/tests/system/addzone/ns1/redirect.db.1	ZONE	2017
-./bin/tests/system/addzone/ns1/redirect.db.2	ZONE	2017
+./bin/tests/system/addzone/ns1/redirect.db.1	ZONE	2017,2018
+./bin/tests/system/addzone/ns1/redirect.db.2	ZONE	2017,2018
 ./bin/tests/system/addzone/ns2/.gitignore	X	2018
-./bin/tests/system/addzone/ns2/added.db		ZONE	2010,2013,2016
-./bin/tests/system/addzone/ns2/default.nzf.in	X	2010
-./bin/tests/system/addzone/ns2/hints.db		ZONE	2016
-./bin/tests/system/addzone/ns2/inline.db	ZONE	2013,2016
+./bin/tests/system/addzone/ns2/added.db		ZONE	2010,2013,2016,2018
+./bin/tests/system/addzone/ns2/default.nzf.in	X	2010,2018
+./bin/tests/system/addzone/ns2/hints.db		ZONE	2016,2018
+./bin/tests/system/addzone/ns2/inline.db	ZONE	2013,2016,2018
 ./bin/tests/system/addzone/ns2/named1.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/addzone/ns2/named2.conf.in	CONF-C	2010,2011,2016,2018
 ./bin/tests/system/addzone/ns2/named3.conf.in	CONF-C	2017,2018
-./bin/tests/system/addzone/ns2/normal.db	ZONE	2010,2016
-./bin/tests/system/addzone/ns2/previous.db	ZONE	2010,2016
-./bin/tests/system/addzone/ns2/redirect.db.1	ZONE	2016,2017
-./bin/tests/system/addzone/ns2/redirect.db.2	ZONE	2016,2017
-./bin/tests/system/addzone/ns3/e.db		ZONE	2017
+./bin/tests/system/addzone/ns2/normal.db	ZONE	2010,2016,2018
+./bin/tests/system/addzone/ns2/previous.db	ZONE	2010,2016,2018
+./bin/tests/system/addzone/ns2/redirect.db.1	ZONE	2016,2017,2018
+./bin/tests/system/addzone/ns2/redirect.db.2	ZONE	2016,2017,2018
+./bin/tests/system/addzone/ns3/e.db		ZONE	2017,2018
 ./bin/tests/system/addzone/ns3/named1.conf.in	CONF-C	2017,2018
 ./bin/tests/system/addzone/ns3/named2.conf.in	CONF-C	2017,2018
-./bin/tests/system/addzone/ns3/redirect.db.1	ZONE	2017
-./bin/tests/system/addzone/ns3/redirect.db.2	ZONE	2017
+./bin/tests/system/addzone/ns3/redirect.db.1	ZONE	2017,2018
+./bin/tests/system/addzone/ns3/redirect.db.2	ZONE	2017,2018
 ./bin/tests/system/addzone/setup.sh		SH	2010,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/addzone/tests.sh		SH	2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/allow_query/.gitignore	X	2018
 ./bin/tests/system/allow_query/clean.sh		SH	2010,2012,2014,2015,2016,2018
-./bin/tests/system/allow_query/ns2/aclallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/acldisallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/aclnotallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/added.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/addrallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/addrdisallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/addrnotallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/any.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/keyallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/keydisallow.db	ZONE	2010,2016
+./bin/tests/system/allow_query/ns2/aclallow.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/acldisallow.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/aclnotallow.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/added.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/addrallow.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/addrdisallow.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/addrnotallow.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/any.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/keyallow.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/keydisallow.db	ZONE	2010,2016,2018
 ./bin/tests/system/allow_query/ns2/named01.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/allow_query/ns2/named02.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/allow_query/ns2/named03.conf.in	CONF-C	2010,2016,2018
@@ -717,9 +717,9 @@
 ./bin/tests/system/allow_query/ns2/named55.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/allow_query/ns2/named56.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/allow_query/ns2/named57.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/allow_query/ns2/none.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/normal.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/previous.db	ZONE	2010,2016
+./bin/tests/system/allow_query/ns2/none.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/normal.db	ZONE	2010,2016,2018
+./bin/tests/system/allow_query/ns2/previous.db	ZONE	2010,2016,2018
 ./bin/tests/system/allow_query/setup.sh		SH	2010,2012,2016,2018
 ./bin/tests/system/allow_query/tests.sh		SH	2010,2012,2013,2016,2018
 ./bin/tests/system/ans.pl			PERL	2011,2012,2014,2016,2017,2018
@@ -731,59 +731,59 @@
 ./bin/tests/system/auth/setup.sh		SH	2018
 ./bin/tests/system/auth/tests.sh		SH	2018
 ./bin/tests/system/autosign/clean.sh		SH	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/autosign/ns1/keygen.sh	SH	2009,2010,2011,2012,2014,2016,2017
+./bin/tests/system/autosign/ns1/keygen.sh	SH	2009,2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/autosign/ns1/named.conf.in	CONF-C	2009,2013,2016,2018
-./bin/tests/system/autosign/ns1/root.db.in	ZONE	2009,2010,2016
-./bin/tests/system/autosign/ns2/Xbar.+005+30676.key	X	2010
-./bin/tests/system/autosign/ns2/Xbar.+005+30676.private	X	2010
-./bin/tests/system/autosign/ns2/Xbar.+005+30804.key	X	2010
-./bin/tests/system/autosign/ns2/Xbar.+005+30804.private	X	2010
-./bin/tests/system/autosign/ns2/bar.db.in	ZONE	2010,2016
-./bin/tests/system/autosign/ns2/child.nsec3.example.db	ZONE	2009,2016
-./bin/tests/system/autosign/ns2/child.optout.example.db	ZONE	2009,2016
-./bin/tests/system/autosign/ns2/dst.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns2/example.db.in	ZONE	2009,2010,2016
-./bin/tests/system/autosign/ns2/insecure.secure.example.db	ZONE	2009,2016
-./bin/tests/system/autosign/ns2/keygen.sh	SH	2009,2010,2011,2012,2014,2015,2016,2017
+./bin/tests/system/autosign/ns1/root.db.in	ZONE	2009,2010,2016,2018
+./bin/tests/system/autosign/ns2/Xbar.+005+30676.key	X	2010,2018
+./bin/tests/system/autosign/ns2/Xbar.+005+30676.private	X	2010,2018
+./bin/tests/system/autosign/ns2/Xbar.+005+30804.key	X	2010,2018
+./bin/tests/system/autosign/ns2/Xbar.+005+30804.private	X	2010,2018
+./bin/tests/system/autosign/ns2/bar.db.in	ZONE	2010,2016,2018
+./bin/tests/system/autosign/ns2/child.nsec3.example.db	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns2/child.optout.example.db	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns2/dst.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns2/example.db.in	ZONE	2009,2010,2016,2018
+./bin/tests/system/autosign/ns2/insecure.secure.example.db	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns2/keygen.sh	SH	2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/autosign/ns2/named.conf.in	CONF-C	2009,2010,2011,2013,2016,2018
-./bin/tests/system/autosign/ns2/private.secure.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/.gitignore	X	2012
-./bin/tests/system/autosign/ns3/autonsec3.example.db.in	ZONE	2011,2016
-./bin/tests/system/autosign/ns3/delay.example.db	ZONE	2011,2016
-./bin/tests/system/autosign/ns3/inacksk2.example.db.in	ZONE	2017
-./bin/tests/system/autosign/ns3/inacksk3.example.db.in	ZONE	2017
-./bin/tests/system/autosign/ns3/inaczsk.example.db.in	ZONE	2011,2016
-./bin/tests/system/autosign/ns3/inaczsk2.example.db.in	ZONE	2017
-./bin/tests/system/autosign/ns3/inaczsk3.example.db.in	ZONE	2017
-./bin/tests/system/autosign/ns3/insecure.example.db	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/keygen.sh	SH	2009,2010,2011,2012,2014,2015,2016,2017
-./bin/tests/system/autosign/ns3/kskonly.example.db.in	ZONE	2017
+./bin/tests/system/autosign/ns2/private.secure.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/.gitignore	X	2012,2018
+./bin/tests/system/autosign/ns3/autonsec3.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/autosign/ns3/delay.example.db	ZONE	2011,2016,2018
+./bin/tests/system/autosign/ns3/inacksk2.example.db.in	ZONE	2017,2018
+./bin/tests/system/autosign/ns3/inacksk3.example.db.in	ZONE	2017,2018
+./bin/tests/system/autosign/ns3/inaczsk.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/autosign/ns3/inaczsk2.example.db.in	ZONE	2017,2018
+./bin/tests/system/autosign/ns3/inaczsk3.example.db.in	ZONE	2017,2018
+./bin/tests/system/autosign/ns3/insecure.example.db	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/keygen.sh	SH	2009,2010,2011,2012,2014,2015,2016,2017,2018
+./bin/tests/system/autosign/ns3/kskonly.example.db.in	ZONE	2017,2018
 ./bin/tests/system/autosign/ns3/named.conf.in	CONF-C	2009,2010,2011,2012,2013,2015,2016,2017,2018
-./bin/tests/system/autosign/ns3/nozsk.example.db.in	ZONE	2011,2016
-./bin/tests/system/autosign/ns3/nsec.example.db.in	ZONE	2010,2016
-./bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in	ZONE	2010,2016
-./bin/tests/system/autosign/ns3/nsec3.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/nsec3.optout.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/oldsigs.example.db.in	ZONE	2010,2016
-./bin/tests/system/autosign/ns3/optout.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/optout.nsec3.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/optout.optout.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/rsasha256.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/rsasha512.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in	ZONE	2010,2016
-./bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in	ZONE	2010,2016
-./bin/tests/system/autosign/ns3/secure.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/secure.nsec3.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/secure.optout.example.db.in	ZONE	2009,2016
-./bin/tests/system/autosign/ns3/sync.example.db.in	ZONE	2015,2016
-./bin/tests/system/autosign/ns3/ttl1.example.db.in	ZONE	2011,2016
-./bin/tests/system/autosign/ns3/ttl2.example.db.in	ZONE	2011,2016
-./bin/tests/system/autosign/ns3/ttl3.example.db.in	ZONE	2011,2016
-./bin/tests/system/autosign/ns3/ttl4.example.db.in	ZONE	2011,2016
+./bin/tests/system/autosign/ns3/nozsk.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/autosign/ns3/nsec.example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/autosign/ns3/nsec3.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/nsec3.optout.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/oldsigs.example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/autosign/ns3/optout.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/optout.nsec3.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/optout.optout.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/rsasha256.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/rsasha512.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/autosign/ns3/secure.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/secure.nsec3.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/secure.optout.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/autosign/ns3/sync.example.db.in	ZONE	2015,2016,2018
+./bin/tests/system/autosign/ns3/ttl1.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/autosign/ns3/ttl2.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/autosign/ns3/ttl3.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/autosign/ns3/ttl4.example.db.in	ZONE	2011,2016,2018
 ./bin/tests/system/autosign/ns4/named.conf.in	CONF-C	2009,2016,2017,2018
 ./bin/tests/system/autosign/ns5/named.conf.in	CONF-C	2009,2016,2017,2018
-./bin/tests/system/autosign/prereq.sh		SH	2009,2010,2012,2014,2016
+./bin/tests/system/autosign/prereq.sh		SH	2009,2010,2012,2014,2016,2018
 ./bin/tests/system/autosign/setup.sh		SH	2009,2010,2012,2014,2016,2017,2018
 ./bin/tests/system/autosign/tests.sh		SH	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/builtin/clean.sh		SH	2014,2016,2018
@@ -793,103 +793,103 @@
 ./bin/tests/system/builtin/setup.sh		SH	2018
 ./bin/tests/system/builtin/tests.sh		SH	2011,2012,2014,2015,2016,2018
 ./bin/tests/system/cacheclean/clean.sh		SH	2001,2004,2007,2011,2012,2014,2015,2016,2018
-./bin/tests/system/cacheclean/dig.batch		X	2001
-./bin/tests/system/cacheclean/knowngood.dig.out	X	2001
-./bin/tests/system/cacheclean/ns1/example.db	ZONE	2001,2004,2007,2012,2016
-./bin/tests/system/cacheclean/ns1/expire-test.db	ZONE	2014,2016
-./bin/tests/system/cacheclean/ns1/flushtest.db	ZONE	2011,2016
+./bin/tests/system/cacheclean/dig.batch		X	2001,2018
+./bin/tests/system/cacheclean/knowngood.dig.out	X	2001,2018
+./bin/tests/system/cacheclean/ns1/example.db	ZONE	2001,2004,2007,2012,2016,2018
+./bin/tests/system/cacheclean/ns1/expire-test.db	ZONE	2014,2016,2018
+./bin/tests/system/cacheclean/ns1/flushtest.db	ZONE	2011,2016,2018
 ./bin/tests/system/cacheclean/ns1/named.conf.in	CONF-C	2001,2004,2005,2007,2011,2014,2016,2017,2018
 ./bin/tests/system/cacheclean/ns2/named.conf.in	CONF-C	2001,2004,2005,2007,2011,2013,2014,2015,2016,2018
 ./bin/tests/system/cacheclean/setup.sh		SH	2018
 ./bin/tests/system/cacheclean/tests.sh		SH	2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/case/clean.sh		SH	2013,2014,2015,2016,2018
-./bin/tests/system/case/dynamic.good		X	2015
-./bin/tests/system/case/ns1/dynamic.db.in	ZONE	2015,2016
-./bin/tests/system/case/ns1/example.db		ZONE	2013,2016
+./bin/tests/system/case/dynamic.good		X	2015,2018
+./bin/tests/system/case/ns1/dynamic.db.in	ZONE	2015,2016,2018
+./bin/tests/system/case/ns1/example.db		ZONE	2013,2016,2018
 ./bin/tests/system/case/ns1/named.conf.in	CONF-C	2013,2015,2016,2017,2018
 ./bin/tests/system/case/ns2/named.conf.in	CONF-C	2014,2015,2016,2017,2018
-./bin/tests/system/case/postns1.good		X	2015
-./bin/tests/system/case/postupdate.good		X	2015
+./bin/tests/system/case/postns1.good		X	2015,2018
+./bin/tests/system/case/postupdate.good		X	2015,2018
 ./bin/tests/system/case/setup.sh		SH	2015,2016,2018
 ./bin/tests/system/case/tests.sh		SH	2013,2014,2015,2016,2018
 ./bin/tests/system/catz/.gitignore		X	2018
 ./bin/tests/system/catz/clean.sh		SH	2016,2018
-./bin/tests/system/catz/ns1/catalog.example.db.in	ZONE	2016
+./bin/tests/system/catz/ns1/catalog.example.db.in	ZONE	2016,2018
 ./bin/tests/system/catz/ns1/named.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/catz/ns2/named.conf.in	CONF-C	2016,2017,2018
-./bin/tests/system/catz/ns3/dom5.example.db	ZONE	2016
-./bin/tests/system/catz/ns3/dom6.example.db	ZONE	2016
+./bin/tests/system/catz/ns3/dom5.example.db	ZONE	2016,2018
+./bin/tests/system/catz/ns3/dom6.example.db	ZONE	2016,2018
 ./bin/tests/system/catz/ns3/named.conf.in	CONF-C	2016,2018
 ./bin/tests/system/catz/setup.sh		SH	2016,2018
 ./bin/tests/system/catz/tests.sh		SH	2016,2017,2018
-./bin/tests/system/cds/.gitignore		X	2017
-./bin/tests/system/cds/checkmtime.pl		PERL	2017
-./bin/tests/system/cds/checktime.pl		PERL	2017
-./bin/tests/system/cds/clean.sh			SH	2017
-./bin/tests/system/cds/mangle.pl		PERL	2017
-./bin/tests/system/cds/prereq.sh		SH	2017
-./bin/tests/system/cds/setup.sh			SH	2017
+./bin/tests/system/cds/.gitignore		X	2017,2018
+./bin/tests/system/cds/checkmtime.pl		PERL	2017,2018
+./bin/tests/system/cds/checktime.pl		PERL	2017,2018
+./bin/tests/system/cds/clean.sh			SH	2017,2018
+./bin/tests/system/cds/mangle.pl		PERL	2017,2018
+./bin/tests/system/cds/prereq.sh		SH	2017,2018
+./bin/tests/system/cds/setup.sh			SH	2017,2018
 ./bin/tests/system/cds/tests.sh			SH	2017,2018
-./bin/tests/system/chain/README			TXT.BRIEF	2017
+./bin/tests/system/chain/README			TXT.BRIEF	2017,2018
 ./bin/tests/system/chain/ans3/ans.pl		PERL	2017,2018
-./bin/tests/system/chain/ans4/.gitignore	X	2017
+./bin/tests/system/chain/ans4/.gitignore	X	2017,2018
 ./bin/tests/system/chain/ans4/README.anspy	TXT.BRIEF	2017,2018
 ./bin/tests/system/chain/ans4/ans.py		PYTHON	2017,2018
 ./bin/tests/system/chain/clean.sh		SH	2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/chain/ns1/named.conf.in	CONF-C	2011,2016,2017,2018
-./bin/tests/system/chain/ns1/root.db		ZONE	2011,2016,2017
-./bin/tests/system/chain/ns2/example.db		ZONE	2011,2016,2017
-./bin/tests/system/chain/ns2/generic.db		ZONE	2017
+./bin/tests/system/chain/ns1/root.db		ZONE	2011,2016,2017,2018
+./bin/tests/system/chain/ns2/example.db		ZONE	2011,2016,2017,2018
+./bin/tests/system/chain/ns2/generic.db		ZONE	2017,2018
 ./bin/tests/system/chain/ns2/named.conf.in	CONF-C	2011,2016,2017,2018
-./bin/tests/system/chain/ns2/sign.sh		SH	2017
-./bin/tests/system/chain/ns2/sub.db		ZONE	2017
+./bin/tests/system/chain/ns2/sign.sh		SH	2017,2018
+./bin/tests/system/chain/ns2/sub.db		ZONE	2017,2018
 ./bin/tests/system/chain/ns5/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/chain/ns5/sub.db		ZONE	2017
+./bin/tests/system/chain/ns5/sub.db		ZONE	2017,2018
 ./bin/tests/system/chain/ns7/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/chain/ns7/root.hint		ZONE	2017
+./bin/tests/system/chain/ns7/root.hint		ZONE	2017,2018
 ./bin/tests/system/chain/prereq.sh		SH	2017,2018
 ./bin/tests/system/chain/setup.sh		SH	2017,2018
 ./bin/tests/system/chain/tests.sh		SH	2011,2012,2016,2017,2018
-./bin/tests/system/checkconf/altdb.conf		CONF-C	2014,2016
-./bin/tests/system/checkconf/altdlz.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-acl.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-also-notify.conf	CONF-C	2012,2013,2016
-./bin/tests/system/checkconf/bad-catz-zone.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-dnssec.conf	CONF-C	2012,2013,2016
-./bin/tests/system/checkconf/bad-glue-cache-bogus.conf	CONF-C	2017
-./bin/tests/system/checkconf/bad-hint.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-inline-slave.conf	CONF-C	2013,2016
-./bin/tests/system/checkconf/bad-keep-response-order.conf	CONF-C	2015,2016
-./bin/tests/system/checkconf/bad-lifetime.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf	CONF-C	2017
-./bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf	CONF-C	2017
-./bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf	CONF-C	2017
-./bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf	CONF-C	2017
-./bin/tests/system/checkconf/bad-many.conf	CONF-C	2005,2012,2015,2016
-./bin/tests/system/checkconf/bad-master-request-ixfr.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-maxttlmap.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-noddns.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-options-also-notify.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-printtime.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-acl.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-all-per-second.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-errors-per-second.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-ipv4-prefix-length.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-ipv6-prefix-length.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-max-table-size.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-nodata-per-second.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-nxdomains-per-second.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-qps-scale.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-referrals-per-second.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-responses-per-second.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-slip.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rate-limit-window.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-rpz-zone.conf	CONF-C	2016
-./bin/tests/system/checkconf/bad-sharedwritable1.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-sharedwritable2.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/bad-sharedzone1.conf	CONF-C	2013,2016
-./bin/tests/system/checkconf/bad-sharedzone2.conf	CONF-C	2013,2016
-./bin/tests/system/checkconf/bad-tsig.conf	CONF-C	2012,2013,2016
+./bin/tests/system/checkconf/altdb.conf		CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/altdlz.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-acl.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-also-notify.conf	CONF-C	2012,2013,2016,2018
+./bin/tests/system/checkconf/bad-catz-zone.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-dnssec.conf	CONF-C	2012,2013,2016,2018
+./bin/tests/system/checkconf/bad-glue-cache-bogus.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/bad-hint.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-inline-slave.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/bad-keep-response-order.conf	CONF-C	2015,2016,2018
+./bin/tests/system/checkconf/bad-lifetime.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/bad-many.conf	CONF-C	2005,2012,2015,2016,2018
+./bin/tests/system/checkconf/bad-master-request-ixfr.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-maxttlmap.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-noddns.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-options-also-notify.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-printtime.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-acl.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-all-per-second.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-errors-per-second.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-ipv4-prefix-length.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-ipv6-prefix-length.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-max-table-size.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-nodata-per-second.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-nxdomains-per-second.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-qps-scale.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-referrals-per-second.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-responses-per-second.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-slip.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rate-limit-window.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-rpz-zone.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/bad-sharedwritable1.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-sharedwritable2.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-sharedzone1.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/bad-sharedzone2.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/bad-tsig.conf	CONF-C	2012,2013,2016,2018
 ./bin/tests/system/checkconf/bad-update-policy1.conf	CONF-C	2018
 ./bin/tests/system/checkconf/bad-update-policy2.conf	CONF-C	2018
 ./bin/tests/system/checkconf/bad-update-policy3.conf	CONF-C	2018
@@ -899,36 +899,36 @@
 ./bin/tests/system/checkconf/bad-update-policy7.conf	CONF-C	2018
 ./bin/tests/system/checkconf/bad-update-policy8.conf	CONF-C	2018
 ./bin/tests/system/checkconf/bad-update-policy9.conf	CONF-C	2018
-./bin/tests/system/checkconf/bad-view-also-notify.conf	CONF-C	2016
+./bin/tests/system/checkconf/bad-view-also-notify.conf	CONF-C	2016,2018
 ./bin/tests/system/checkconf/check-dlv-ksk-key.conf	CONF-C	2018
-./bin/tests/system/checkconf/check-dup-records-fail.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/check-dup-records.db	ZONE	2014,2016
-./bin/tests/system/checkconf/check-mx-cname-fail.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/check-mx-cname.db	ZONE	2014,2016
-./bin/tests/system/checkconf/check-mx-fail.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/check-mx.db	ZONE	2014,2016
-./bin/tests/system/checkconf/check-names-fail.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/check-names.db	ZONE	2014,2016
+./bin/tests/system/checkconf/check-dup-records-fail.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/check-dup-records.db	ZONE	2014,2016,2018
+./bin/tests/system/checkconf/check-mx-cname-fail.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/check-mx-cname.db	ZONE	2014,2016,2018
+./bin/tests/system/checkconf/check-mx-fail.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/check-mx.db	ZONE	2014,2016,2018
+./bin/tests/system/checkconf/check-names-fail.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/check-names.db	ZONE	2014,2016,2018
 ./bin/tests/system/checkconf/check-root-ksk-2010.conf	CONF-C	2018
 ./bin/tests/system/checkconf/check-root-ksk-2017.conf	CONF-C	2018
 ./bin/tests/system/checkconf/check-root-ksk-both.conf	CONF-C	2018
-./bin/tests/system/checkconf/check-srv-cname-fail.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/check-srv-cname.db	ZONE	2014,2016
-./bin/tests/system/checkconf/clean.sh		SH	2011,2012,2013,2014,2016
-./bin/tests/system/checkconf/dlz-bad.conf	CONF-C	2012,2013,2016
-./bin/tests/system/checkconf/dnssec.1		CONF-C	2011,2016
-./bin/tests/system/checkconf/dnssec.2		CONF-C	2011,2016
-./bin/tests/system/checkconf/dnssec.3		CONF-C	2011,2016,2017
-./bin/tests/system/checkconf/good-acl.conf	CONF-C	2016
-./bin/tests/system/checkconf/good-class.conf	CONF-C	2015,2016
-./bin/tests/system/checkconf/good-dlv-dlv.example.com.conf	CONF-C	2017
-./bin/tests/system/checkconf/good-glue-cache.conf	CONF-C	2017
-./bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf	CONF-C	2017
-./bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf	CONF-C	2017
-./bin/tests/system/checkconf/good-nested.conf	CONF-C	2015,2016
-./bin/tests/system/checkconf/good-options-also-notify.conf	CONF-C	2016
-./bin/tests/system/checkconf/good-printtime.conf	CONF-C	2016
-./bin/tests/system/checkconf/good-response-dot.conf	CONF-C	2017
+./bin/tests/system/checkconf/check-srv-cname-fail.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/check-srv-cname.db	ZONE	2014,2016,2018
+./bin/tests/system/checkconf/clean.sh		SH	2011,2012,2013,2014,2016,2018
+./bin/tests/system/checkconf/dlz-bad.conf	CONF-C	2012,2013,2016,2018
+./bin/tests/system/checkconf/dnssec.1		CONF-C	2011,2016,2018
+./bin/tests/system/checkconf/dnssec.2		CONF-C	2011,2016,2018
+./bin/tests/system/checkconf/dnssec.3		CONF-C	2011,2016,2017,2018
+./bin/tests/system/checkconf/good-acl.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/good-class.conf	CONF-C	2015,2016,2018
+./bin/tests/system/checkconf/good-dlv-dlv.example.com.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/good-glue-cache.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/good-nested.conf	CONF-C	2015,2016,2018
+./bin/tests/system/checkconf/good-options-also-notify.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/good-printtime.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/good-response-dot.conf	CONF-C	2017,2018
 ./bin/tests/system/checkconf/good-update-policy1.conf	CONF-C	2018
 ./bin/tests/system/checkconf/good-update-policy10.conf	CONF-C	2018
 ./bin/tests/system/checkconf/good-update-policy11.conf	CONF-C	2018
@@ -941,400 +941,400 @@
 ./bin/tests/system/checkconf/good-update-policy7.conf	CONF-C	2018
 ./bin/tests/system/checkconf/good-update-policy8.conf	CONF-C	2018
 ./bin/tests/system/checkconf/good-update-policy9.conf	CONF-C	2018
-./bin/tests/system/checkconf/good-view-also-notify.conf	CONF-C	2016
-./bin/tests/system/checkconf/good.conf		CONF-C	2005,2007,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/checkconf/good.zonelist	X	2016,2017
-./bin/tests/system/checkconf/hint-nofile.conf	CONF-C	2013,2016
-./bin/tests/system/checkconf/in-view-good.conf	CONF-C	2015,2016
-./bin/tests/system/checkconf/inline-bad.conf	CONF-C	2013,2016
-./bin/tests/system/checkconf/inline-good.conf	CONF-C	2013,2016
-./bin/tests/system/checkconf/inline-no.conf	CONF-C	2013,2016
-./bin/tests/system/checkconf/max-cache-size-good.conf	CONF-C	2015,2016
-./bin/tests/system/checkconf/max-ttl.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/maxttl-bad.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/maxttl-bad.db	ZONE	2014,2016
-./bin/tests/system/checkconf/maxttl.db		ZONE	2014,2016
-./bin/tests/system/checkconf/notify.conf	CONF-C	2014,2016
-./bin/tests/system/checkconf/portrange-good.conf	CONF-C	2015,2016
-./bin/tests/system/checkconf/range.conf		CONF-C	2013,2016
-./bin/tests/system/checkconf/shared.example.db	ZONE	2015,2016
+./bin/tests/system/checkconf/good-view-also-notify.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/good.conf		CONF-C	2005,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/checkconf/good.zonelist	X	2016,2017,2018
+./bin/tests/system/checkconf/hint-nofile.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/in-view-good.conf	CONF-C	2015,2016,2018
+./bin/tests/system/checkconf/inline-bad.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/inline-good.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/inline-no.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/max-cache-size-good.conf	CONF-C	2015,2016,2018
+./bin/tests/system/checkconf/max-ttl.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/maxttl-bad.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/maxttl-bad.db	ZONE	2014,2016,2018
+./bin/tests/system/checkconf/maxttl.db		ZONE	2014,2016,2018
+./bin/tests/system/checkconf/notify.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/portrange-good.conf	CONF-C	2015,2016,2018
+./bin/tests/system/checkconf/range.conf		CONF-C	2013,2016,2018
+./bin/tests/system/checkconf/shared.example.db	ZONE	2015,2016,2018
 ./bin/tests/system/checkconf/tests.sh		SH	2005,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/checkconf/view-class-any1.conf	CONF-C	2016
-./bin/tests/system/checkconf/view-class-any2.conf	CONF-C	2016
-./bin/tests/system/checkconf/view-class-in1.conf	CONF-C	2016
-./bin/tests/system/checkconf/view-class-in2.conf	CONF-C	2016
-./bin/tests/system/checkconf/warn-dlv-auto.conf	CONF-C	2017
-./bin/tests/system/checkconf/warn-dlv-dlv.isc.org.conf	CONF-C	2017
-./bin/tests/system/checkconf/warn-keydir.conf	CONF-C	2013,2016
-./bin/tests/system/checkds/clean.sh		SH	2012,2013,2014,2016,2017
-./bin/tests/system/checkds/dig.bat		BAT	2016
-./bin/tests/system/checkds/dig.pl		PERL	2014,2016,2017
-./bin/tests/system/checkds/dig.sh		SH	2012,2013,2016,2017
-./bin/tests/system/checkds/missing.example.dlv.example.dlv.db	X	2012
-./bin/tests/system/checkds/missing.example.dnskey.db	X	2012
-./bin/tests/system/checkds/missing.example.ds.db	X	2012
-./bin/tests/system/checkds/none.example.dlv.example.dlv.db	X	2012
-./bin/tests/system/checkds/none.example.dnskey.db	X	2012
-./bin/tests/system/checkds/none.example.ds.db	X	2012
-./bin/tests/system/checkds/ok.example.dlv.example.dlv.db	X	2012
-./bin/tests/system/checkds/ok.example.dnskey.db	X	2012
-./bin/tests/system/checkds/ok.example.ds.db	X	2012
-./bin/tests/system/checkds/prep.example.db	X	2017
-./bin/tests/system/checkds/prep.example.ds.db	X	2017
-./bin/tests/system/checkds/setup.sh		SH	2012,2013,2014,2016
+./bin/tests/system/checkconf/view-class-any1.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/view-class-any2.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/view-class-in1.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/view-class-in2.conf	CONF-C	2016,2018
+./bin/tests/system/checkconf/warn-dlv-auto.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/warn-dlv-dlv.isc.org.conf	CONF-C	2017,2018
+./bin/tests/system/checkconf/warn-keydir.conf	CONF-C	2013,2016,2018
+./bin/tests/system/checkds/clean.sh		SH	2012,2013,2014,2016,2017,2018
+./bin/tests/system/checkds/dig.bat		BAT	2016,2018
+./bin/tests/system/checkds/dig.pl		PERL	2014,2016,2017,2018
+./bin/tests/system/checkds/dig.sh		SH	2012,2013,2016,2017,2018
+./bin/tests/system/checkds/missing.example.dlv.example.dlv.db	X	2012,2018
+./bin/tests/system/checkds/missing.example.dnskey.db	X	2012,2018
+./bin/tests/system/checkds/missing.example.ds.db	X	2012,2018
+./bin/tests/system/checkds/none.example.dlv.example.dlv.db	X	2012,2018
+./bin/tests/system/checkds/none.example.dnskey.db	X	2012,2018
+./bin/tests/system/checkds/none.example.ds.db	X	2012,2018
+./bin/tests/system/checkds/ok.example.dlv.example.dlv.db	X	2012,2018
+./bin/tests/system/checkds/ok.example.dnskey.db	X	2012,2018
+./bin/tests/system/checkds/ok.example.ds.db	X	2012,2018
+./bin/tests/system/checkds/prep.example.db	X	2017,2018
+./bin/tests/system/checkds/prep.example.ds.db	X	2017,2018
+./bin/tests/system/checkds/setup.sh		SH	2012,2013,2014,2016,2018
 ./bin/tests/system/checkds/tests.sh		SH	2012,2013,2014,2016,2017,2018
-./bin/tests/system/checkds/wrong.example.dlv.example.dlv.db	X	2012
-./bin/tests/system/checkds/wrong.example.dnskey.db	X	2012
-./bin/tests/system/checkds/wrong.example.ds.db	X	2012
+./bin/tests/system/checkds/wrong.example.dlv.example.dlv.db	X	2012,2018
+./bin/tests/system/checkds/wrong.example.dnskey.db	X	2012,2018
+./bin/tests/system/checkds/wrong.example.ds.db	X	2012,2018
 ./bin/tests/system/checknames/clean.sh		SH	2004,2007,2012,2014,2015,2016,2018
-./bin/tests/system/checknames/ns1/fail.example.db.in	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns1/fail.update.db.in	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns1/ignore.example.db.in	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns1/ignore.update.db.in	ZONE	2004,2007,2016
+./bin/tests/system/checknames/ns1/fail.example.db.in	ZONE	2004,2007,2016,2018
+./bin/tests/system/checknames/ns1/fail.update.db.in	ZONE	2004,2007,2016,2018
+./bin/tests/system/checknames/ns1/ignore.example.db.in	ZONE	2004,2007,2016,2018
+./bin/tests/system/checknames/ns1/ignore.update.db.in	ZONE	2004,2007,2016,2018
 ./bin/tests/system/checknames/ns1/named.conf.in	CONF-C	2004,2005,2007,2016,2018
-./bin/tests/system/checknames/ns1/root.db	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns1/warn.example.db.in	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns1/warn.update.db.in	ZONE	2004,2007,2016
+./bin/tests/system/checknames/ns1/root.db	ZONE	2004,2007,2016,2018
+./bin/tests/system/checknames/ns1/warn.example.db.in	ZONE	2004,2007,2016,2018
+./bin/tests/system/checknames/ns1/warn.update.db.in	ZONE	2004,2007,2016,2018
 ./bin/tests/system/checknames/ns2/named.conf.in	CONF-C	2004,2007,2016,2017,2018
-./bin/tests/system/checknames/ns2/root.hints	ZONE	2004,2007,2016
+./bin/tests/system/checknames/ns2/root.hints	ZONE	2004,2007,2016,2018
 ./bin/tests/system/checknames/ns3/named.conf.in	CONF-C	2004,2007,2016,2017,2018
-./bin/tests/system/checknames/ns3/root.hints	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns4/master-ignore.update.db.in	ZONE	2014,2016
+./bin/tests/system/checknames/ns3/root.hints	ZONE	2004,2007,2016,2018
+./bin/tests/system/checknames/ns4/master-ignore.update.db.in	ZONE	2014,2016,2018
 ./bin/tests/system/checknames/ns4/named.conf.in	CONF-C	2014,2016,2017,2018
-./bin/tests/system/checknames/ns4/root.hints	ZONE	2014,2016
+./bin/tests/system/checknames/ns4/root.hints	ZONE	2014,2016,2018
 ./bin/tests/system/checknames/setup.sh		SH	2004,2007,2012,2014,2016,2018
 ./bin/tests/system/checknames/tests.sh		SH	2004,2007,2012,2013,2014,2015,2016,2018
-./bin/tests/system/checkzone/clean.sh		SH	2011,2012,2013,2014,2016
-./bin/tests/system/checkzone/setup.sh		SH	2014,2016
+./bin/tests/system/checkzone/clean.sh		SH	2011,2012,2013,2014,2016,2018
+./bin/tests/system/checkzone/setup.sh		SH	2014,2016,2018
 ./bin/tests/system/checkzone/tests.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/checkzone/zones/.gitattributes	X	2015
-./bin/tests/system/checkzone/zones/bad-badclass.raw	X	2015
-./bin/tests/system/checkzone/zones/bad-caa-rr.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db	ZONE	2015,2016
+./bin/tests/system/checkzone/zones/.gitattributes	X	2015,2018
+./bin/tests/system/checkzone/zones/bad-badclass.raw	X	2015,2018
+./bin/tests/system/checkzone/zones/bad-caa-rr.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db	ZONE	2015,2016,2018
 ./bin/tests/system/checkzone/zones/bad-generate-tkey.db	ZONE	2018
-./bin/tests/system/checkzone/zones/bad-nsap-empty.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/bad-nsap-odd-nibble.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/bad-nsec3-padded.db	ZONE	2014,2016
-./bin/tests/system/checkzone/zones/bad-nsec3owner-padded.db	ZONE	2014,2016
+./bin/tests/system/checkzone/zones/bad-nsap-empty.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/bad-nsap-odd-nibble.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/bad-nsec3-padded.db	ZONE	2014,2016,2018
+./bin/tests/system/checkzone/zones/bad-nsec3owner-padded.db	ZONE	2014,2016,2018
 ./bin/tests/system/checkzone/zones/bad-tkey.db	ZONE	2018
 ./bin/tests/system/checkzone/zones/bad-tsig.db	ZONE	2018
-./bin/tests/system/checkzone/zones/bad-unspec.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/bad1.db	ZONE	2013,2016
-./bin/tests/system/checkzone/zones/bad2.db	ZONE	2014,2016
-./bin/tests/system/checkzone/zones/bad3.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/bad4.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/badttl.db	ZONE	2014,2016
-./bin/tests/system/checkzone/zones/crashzone.db	ZONE	2016
-./bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db	ZONE	2017
-./bin/tests/system/checkzone/zones/good-dns-sd-reverse.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/good-gc-msdcs.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/good-nsap.db	ZONE	2015,2016
-./bin/tests/system/checkzone/zones/good-nsec3-nopadhash.db	ZONE	2014,2016
-./bin/tests/system/checkzone/zones/good-occulted-ns-by-dname.db	ZONE	2017
-./bin/tests/system/checkzone/zones/good-occulted-ns-by-ns.db	ZONE	2017
-./bin/tests/system/checkzone/zones/good1.db	ZONE	2011,2016
-./bin/tests/system/checkzone/zones/inherit.db	ZONE	2014,2016
-./bin/tests/system/checkzone/zones/nowarn.inherited.owner.db	ZONE	2014,2016
-./bin/tests/system/checkzone/zones/ns-address-below-dname.db	ZONE	2017
-./bin/tests/system/checkzone/zones/spf.db	ZONE	2013,2016
-./bin/tests/system/checkzone/zones/test1.db	ZONE	2013,2016
-./bin/tests/system/checkzone/zones/test2.db	ZONE	2013,2016
-./bin/tests/system/checkzone/zones/warn.inherit.origin.db	ZONE	2014,2016
-./bin/tests/system/checkzone/zones/warn.inherited.owner.db	ZONE	2014,2016
+./bin/tests/system/checkzone/zones/bad-unspec.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/bad1.db	ZONE	2013,2016,2018
+./bin/tests/system/checkzone/zones/bad2.db	ZONE	2014,2016,2018
+./bin/tests/system/checkzone/zones/bad3.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/bad4.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/badttl.db	ZONE	2014,2016,2018
+./bin/tests/system/checkzone/zones/crashzone.db	ZONE	2016,2018
+./bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db	ZONE	2017,2018
+./bin/tests/system/checkzone/zones/good-dns-sd-reverse.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/good-gc-msdcs.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/good-nsap.db	ZONE	2015,2016,2018
+./bin/tests/system/checkzone/zones/good-nsec3-nopadhash.db	ZONE	2014,2016,2018
+./bin/tests/system/checkzone/zones/good-occulted-ns-by-dname.db	ZONE	2017,2018
+./bin/tests/system/checkzone/zones/good-occulted-ns-by-ns.db	ZONE	2017,2018
+./bin/tests/system/checkzone/zones/good1.db	ZONE	2011,2016,2018
+./bin/tests/system/checkzone/zones/inherit.db	ZONE	2014,2016,2018
+./bin/tests/system/checkzone/zones/nowarn.inherited.owner.db	ZONE	2014,2016,2018
+./bin/tests/system/checkzone/zones/ns-address-below-dname.db	ZONE	2017,2018
+./bin/tests/system/checkzone/zones/spf.db	ZONE	2013,2016,2018
+./bin/tests/system/checkzone/zones/test1.db	ZONE	2013,2016,2018
+./bin/tests/system/checkzone/zones/test2.db	ZONE	2013,2016,2018
+./bin/tests/system/checkzone/zones/warn.inherit.origin.db	ZONE	2014,2016,2018
+./bin/tests/system/checkzone/zones/warn.inherited.owner.db	ZONE	2014,2016,2018
 ./bin/tests/system/clean.sh			SH	2015,2016,2018
 ./bin/tests/system/cleanall.sh			SH	2000,2001,2004,2007,2012,2014,2015,2016,2017,2018
-./bin/tests/system/cleanpkcs11.sh		SH	2010,2012,2014,2016
+./bin/tests/system/cleanpkcs11.sh		SH	2010,2012,2014,2016,2018
 ./bin/tests/system/common/controls.conf		CONF-C	2000,2001,2004,2007,2013,2016,2018
 ./bin/tests/system/common/controls.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/common/rndc.conf		CONF-C	2000,2001,2004,2007,2013,2016
-./bin/tests/system/common/rndc.key		CONF-C	2011,2013,2016
-./bin/tests/system/common/root.hint		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/common/rndc.conf		CONF-C	2000,2001,2004,2007,2013,2016,2018
+./bin/tests/system/common/rndc.key		CONF-C	2011,2013,2016,2018
+./bin/tests/system/common/root.hint		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/conf.sh.in			SH	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/conf.sh.win32		SH	2016,2017,2018
-./bin/tests/system/cookie/.gitignore		X	2014,2015
-./bin/tests/system/cookie/bad-cookie-badhex.conf	CONF-C	2014,2015,2016
-./bin/tests/system/cookie/bad-cookie-badsha1.conf	CONF-C	2017
-./bin/tests/system/cookie/bad-cookie-badsha256.conf	CONF-C	2017
-./bin/tests/system/cookie/bad-cookie-toolong.conf	CONF-C	2014,2015,2016
+./bin/tests/system/cookie/.gitignore		X	2014,2015,2018
+./bin/tests/system/cookie/bad-cookie-badhex.conf	CONF-C	2014,2015,2016,2018
+./bin/tests/system/cookie/bad-cookie-badsha1.conf	CONF-C	2017,2018
+./bin/tests/system/cookie/bad-cookie-badsha256.conf	CONF-C	2017,2018
+./bin/tests/system/cookie/bad-cookie-toolong.conf	CONF-C	2014,2015,2016,2018
 ./bin/tests/system/cookie/clean.sh		SH	2014,2015,2016,2018
-./bin/tests/system/cookie/good-cookie-sha1.conf	CONF-C	2017
-./bin/tests/system/cookie/good-cookie-sha256.conf	CONF-C	2017
-./bin/tests/system/cookie/ns1/example.db	ZONE	2014,2015,2016
+./bin/tests/system/cookie/good-cookie-sha1.conf	CONF-C	2017,2018
+./bin/tests/system/cookie/good-cookie-sha256.conf	CONF-C	2017,2018
+./bin/tests/system/cookie/ns1/example.db	ZONE	2014,2015,2016,2018
 ./bin/tests/system/cookie/ns1/named.conf.in	CONF-C	2014,2015,2016,2017,2018
-./bin/tests/system/cookie/ns1/root.hint		ZONE	2014,2015,2016
+./bin/tests/system/cookie/ns1/root.hint		ZONE	2014,2015,2016,2018
 ./bin/tests/system/cookie/ns2/named.conf.in	CONF-C	2014,2015,2016,2017,2018
-./bin/tests/system/cookie/ns2/root.db		ZONE	2014,2015,2016
+./bin/tests/system/cookie/ns2/root.db		ZONE	2014,2015,2016,2018
 ./bin/tests/system/cookie/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
-./bin/tests/system/cookie/ns3/root.hint		ZONE	2015,2016
+./bin/tests/system/cookie/ns3/root.hint		ZONE	2015,2016,2018
 ./bin/tests/system/cookie/ns4/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/cookie/ns4/root.hint		ZONE	2017
+./bin/tests/system/cookie/ns4/root.hint		ZONE	2017,2018
 ./bin/tests/system/cookie/ns5/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/cookie/ns5/root.hint		ZONE	2017
+./bin/tests/system/cookie/ns5/root.hint		ZONE	2017,2018
 ./bin/tests/system/cookie/ns6/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/cookie/ns6/root.hint		ZONE	2017
+./bin/tests/system/cookie/ns6/root.hint		ZONE	2017,2018
 ./bin/tests/system/cookie/setup.sh		SH	2018
 ./bin/tests/system/cookie/tests.sh		SH	2014,2015,2016,2017,2018
-./bin/tests/system/coverage/01-ksk-inactive/README	X	2013
-./bin/tests/system/coverage/01-ksk-inactive/expect	X	2013
-./bin/tests/system/coverage/02-zsk-inactive/README	X	2013
-./bin/tests/system/coverage/02-zsk-inactive/expect	X	2013
-./bin/tests/system/coverage/03-ksk-unpublished/README	X	2013
-./bin/tests/system/coverage/03-ksk-unpublished/expect	X	2013,2016
-./bin/tests/system/coverage/04-zsk-unpublished/README	X	2013
-./bin/tests/system/coverage/04-zsk-unpublished/expect	X	2013,2016
-./bin/tests/system/coverage/05-ksk-unpub-active/README	X	2013
-./bin/tests/system/coverage/05-ksk-unpub-active/expect	X	2013,2016
-./bin/tests/system/coverage/06-zsk-unpub-active/README	X	2013
-./bin/tests/system/coverage/06-zsk-unpub-active/expect	X	2013,2016
-./bin/tests/system/coverage/07-ksk-ttl/README	X	2013
-./bin/tests/system/coverage/07-ksk-ttl/expect	X	2013,2016
-./bin/tests/system/coverage/08-zsk-ttl/README	X	2013
-./bin/tests/system/coverage/08-zsk-ttl/expect	X	2013,2016
-./bin/tests/system/coverage/09-check-zsk/README	X	2014
-./bin/tests/system/coverage/09-check-zsk/expect	X	2014
-./bin/tests/system/coverage/10-check-ksk/README	X	2014
-./bin/tests/system/coverage/10-check-ksk/expect	X	2014
-./bin/tests/system/coverage/11-cutoff/README	X	2014
-./bin/tests/system/coverage/11-cutoff/expect	X	2014
-./bin/tests/system/coverage/clean.sh		SH	2013,2014,2016
+./bin/tests/system/coverage/01-ksk-inactive/README	X	2013,2018
+./bin/tests/system/coverage/01-ksk-inactive/expect	X	2013,2018
+./bin/tests/system/coverage/02-zsk-inactive/README	X	2013,2018
+./bin/tests/system/coverage/02-zsk-inactive/expect	X	2013,2018
+./bin/tests/system/coverage/03-ksk-unpublished/README	X	2013,2018
+./bin/tests/system/coverage/03-ksk-unpublished/expect	X	2013,2016,2018
+./bin/tests/system/coverage/04-zsk-unpublished/README	X	2013,2018
+./bin/tests/system/coverage/04-zsk-unpublished/expect	X	2013,2016,2018
+./bin/tests/system/coverage/05-ksk-unpub-active/README	X	2013,2018
+./bin/tests/system/coverage/05-ksk-unpub-active/expect	X	2013,2016,2018
+./bin/tests/system/coverage/06-zsk-unpub-active/README	X	2013,2018
+./bin/tests/system/coverage/06-zsk-unpub-active/expect	X	2013,2016,2018
+./bin/tests/system/coverage/07-ksk-ttl/README	X	2013,2018
+./bin/tests/system/coverage/07-ksk-ttl/expect	X	2013,2016,2018
+./bin/tests/system/coverage/08-zsk-ttl/README	X	2013,2018
+./bin/tests/system/coverage/08-zsk-ttl/expect	X	2013,2016,2018
+./bin/tests/system/coverage/09-check-zsk/README	X	2014,2018
+./bin/tests/system/coverage/09-check-zsk/expect	X	2014,2018
+./bin/tests/system/coverage/10-check-ksk/README	X	2014,2018
+./bin/tests/system/coverage/10-check-ksk/expect	X	2014,2018
+./bin/tests/system/coverage/11-cutoff/README	X	2014,2018
+./bin/tests/system/coverage/11-cutoff/expect	X	2014,2018
+./bin/tests/system/coverage/clean.sh		SH	2013,2014,2016,2018
 ./bin/tests/system/coverage/prereq.sh		SH	2014,2016,2018
-./bin/tests/system/coverage/setup.sh		SH	2013,2014,2016,2017
+./bin/tests/system/coverage/setup.sh		SH	2013,2014,2016,2017,2018
 ./bin/tests/system/coverage/tests.sh		SH	2013,2014,2016,2018
 ./bin/tests/system/database/clean.sh		SH	2011,2012,2014,2016,2018
 ./bin/tests/system/database/ns1/named1.conf.in	CONF-C	2011,2013,2016,2018
 ./bin/tests/system/database/ns1/named2.conf.in	CONF-C	2011,2013,2016,2018
 ./bin/tests/system/database/setup.sh		SH	2011,2012,2016,2018
 ./bin/tests/system/database/tests.sh		SH	2011,2012,2016,2018
-./bin/tests/system/delzone/clean.sh		SH	2016
-./bin/tests/system/delzone/ns1/inlineslave.db	ZONE	2016
-./bin/tests/system/delzone/ns1/named.conf	CONF-C	2016
-./bin/tests/system/delzone/ns2/added.db		ZONE	2016
-./bin/tests/system/delzone/ns2/named.args	X	2016
-./bin/tests/system/delzone/ns2/named.conf	CONF-C	2016
-./bin/tests/system/delzone/ns2/normal.db	ZONE	2016
-./bin/tests/system/delzone/setup.sh		SH	2016
-./bin/tests/system/delzone/tests.sh		SH	2016
-./bin/tests/system/dialup/ns1/example.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/dialup/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016
-./bin/tests/system/dialup/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/dialup/ns2/hint.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/dialup/ns2/named.conf	CONF-C	2000,2001,2004,2007,2016
-./bin/tests/system/dialup/ns3/hint.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/dialup/ns3/named.conf	CONF-C	2000,2001,2004,2007,2016
-./bin/tests/system/dialup/setup.sh		SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/dialup/tests.sh		SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/digcomp.pl			PERL	2000,2001,2004,2007,2012,2013,2016
-./bin/tests/system/digdelv/ans4/startme		X	2017
+./bin/tests/system/delzone/clean.sh		SH	2016,2018
+./bin/tests/system/delzone/ns1/inlineslave.db	ZONE	2016,2018
+./bin/tests/system/delzone/ns1/named.conf	CONF-C	2016,2018
+./bin/tests/system/delzone/ns2/added.db		ZONE	2016,2018
+./bin/tests/system/delzone/ns2/named.args	X	2016,2018
+./bin/tests/system/delzone/ns2/named.conf	CONF-C	2016,2018
+./bin/tests/system/delzone/ns2/normal.db	ZONE	2016,2018
+./bin/tests/system/delzone/setup.sh		SH	2016,2018
+./bin/tests/system/delzone/tests.sh		SH	2016,2018
+./bin/tests/system/dialup/ns1/example.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dialup/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dialup/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dialup/ns2/hint.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dialup/ns2/named.conf	CONF-C	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dialup/ns3/hint.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dialup/ns3/named.conf	CONF-C	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dialup/setup.sh		SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/dialup/tests.sh		SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/digcomp.pl			PERL	2000,2001,2004,2007,2012,2013,2016,2018
+./bin/tests/system/digdelv/ans4/startme		X	2017,2018
 ./bin/tests/system/digdelv/clean.sh		SH	2015,2016,2018
 ./bin/tests/system/digdelv/ns1/named.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/digdelv/ns1/root.db		ZONE	2015,2016
-./bin/tests/system/digdelv/ns2/example.db	ZONE	2015,2016
+./bin/tests/system/digdelv/ns1/root.db		ZONE	2015,2016,2018
+./bin/tests/system/digdelv/ns2/example.db	ZONE	2015,2016,2018
 ./bin/tests/system/digdelv/ns2/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/digdelv/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/digdelv/setup.sh		SH	2018
 ./bin/tests/system/digdelv/tests.sh		SH	2015,2016,2017,2018
-./bin/tests/system/ditch.pl			PERL	2015,2016
+./bin/tests/system/ditch.pl			PERL	2015,2016,2018
 ./bin/tests/system/dlv/clean.sh			SH	2004,2007,2010,2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/ns1/named.conf.in	CONF-C	2004,2007,2011,2016,2018
-./bin/tests/system/dlv/ns1/root.db.in		ZONE	2011,2016
-./bin/tests/system/dlv/ns1/rootservers.utld.db	ZONE	2004,2007,2016
+./bin/tests/system/dlv/ns1/root.db.in		ZONE	2011,2016,2018
+./bin/tests/system/dlv/ns1/rootservers.utld.db	ZONE	2004,2007,2016,2018
 ./bin/tests/system/dlv/ns1/sign.sh		SH	2011,2012,2014,2016,2018
-./bin/tests/system/dlv/ns2/druz.db.in		ZONE	2011,2016
-./bin/tests/system/dlv/ns2/hints		ZONE	2004,2007,2016
+./bin/tests/system/dlv/ns2/druz.db.in		ZONE	2011,2016,2018
+./bin/tests/system/dlv/ns2/hints		ZONE	2004,2007,2016,2018
 ./bin/tests/system/dlv/ns2/named.conf.in	CONF-C	2004,2007,2011,2016,2018
 ./bin/tests/system/dlv/ns2/sign.sh		SH	2011,2012,2014,2016,2018
-./bin/tests/system/dlv/ns2/utld.db		ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns3/child.db.in		ZONE	2004,2007,2010,2016
-./bin/tests/system/dlv/ns3/dlv.db.in		ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns3/hints		ZONE	2004,2007,2016
+./bin/tests/system/dlv/ns2/utld.db		ZONE	2004,2007,2016,2018
+./bin/tests/system/dlv/ns3/child.db.in		ZONE	2004,2007,2010,2016,2018
+./bin/tests/system/dlv/ns3/dlv.db.in		ZONE	2004,2007,2016,2018
+./bin/tests/system/dlv/ns3/hints		ZONE	2004,2007,2016,2018
 ./bin/tests/system/dlv/ns3/named.conf.in	CONF-C	2004,2007,2011,2016,2018
 ./bin/tests/system/dlv/ns3/sign.sh		SH	2004,2007,2009,2010,2011,2012,2014,2016,2018
-./bin/tests/system/dlv/ns4/child.db		ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns4/hints		ZONE	2004,2007,2016
+./bin/tests/system/dlv/ns4/child.db		ZONE	2004,2007,2016,2018
+./bin/tests/system/dlv/ns4/hints		ZONE	2004,2007,2016,2018
 ./bin/tests/system/dlv/ns4/named.conf.in	CONF-C	2004,2007,2016,2018
-./bin/tests/system/dlv/ns5/hints		ZONE	2004,2007,2016
+./bin/tests/system/dlv/ns5/hints		ZONE	2004,2007,2016,2018
 ./bin/tests/system/dlv/ns5/named.conf.in	CONF-C	2004,2006,2007,2011,2013,2016,2017,2018
-./bin/tests/system/dlv/ns5/rndc.conf		CONF-C	2004,2007,2013,2016
-./bin/tests/system/dlv/ns6/child.db.in		ZONE	2010,2016
-./bin/tests/system/dlv/ns6/hints		ZONE	2010,2016
+./bin/tests/system/dlv/ns5/rndc.conf		CONF-C	2004,2007,2013,2016,2018
+./bin/tests/system/dlv/ns6/child.db.in		ZONE	2010,2016,2018
+./bin/tests/system/dlv/ns6/hints		ZONE	2010,2016,2018
 ./bin/tests/system/dlv/ns6/named.conf.in	CONF-C	2010,2011,2016,2018
 ./bin/tests/system/dlv/ns6/sign.sh		SH	2010,2011,2012,2014,2016,2018
-./bin/tests/system/dlv/prereq.sh		SH	2014,2016
+./bin/tests/system/dlv/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/dlv/setup.sh			SH	2004,2007,2009,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/dlv/tests.sh			SH	2004,2007,2010,2011,2012,2016,2018
-./bin/tests/system/dlz/.gitignore		X	2012
+./bin/tests/system/dlz/.gitignore		X	2012,2018
 ./bin/tests/system/dlz/clean.sh			SH	2010,2012,2014,2016,2018
-./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=	TXT.BRIEF	2015,2016
-./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=	TXT.BRIEF	2015,2016
-./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=	TXT.BRIEF	2015,2016
-./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=	TXT.BRIEF	2010,2016
-./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=	TXT.BRIEF	2010,2016
-./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=	TXT.BRIEF	2010,2016
-./bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1	TXT.BRIEF	2010,2016
+./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=	TXT.BRIEF	2015,2016,2018
+./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=	TXT.BRIEF	2015,2016,2018
+./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=	TXT.BRIEF	2015,2016,2018
+./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=	TXT.BRIEF	2010,2016,2018
+./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=	TXT.BRIEF	2010,2016,2018
+./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=	TXT.BRIEF	2010,2016,2018
+./bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1	TXT.BRIEF	2010,2016,2018
 ./bin/tests/system/dlz/ns1/named.conf.in	CONF-C	2010,2012,2016,2018
 ./bin/tests/system/dlz/prereq.sh.in		SH	2011,2012,2016,2018
 ./bin/tests/system/dlz/setup.sh			SH	2018
 ./bin/tests/system/dlz/tests.sh			SH	2010,2011,2012,2013,2015,2016,2018
-./bin/tests/system/dlzexternal/Makefile.in	MAKE	2011,2012,2014,2015,2016,2017
+./bin/tests/system/dlzexternal/Makefile.in	MAKE	2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/dlzexternal/clean.sh		SH	2010,2012,2014,2015,2016,2018
-./bin/tests/system/dlzexternal/driver.c		C	2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/dlzexternal/driver.h		C	2011,2016
+./bin/tests/system/dlzexternal/driver.c		C	2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/dlzexternal/driver.h		C	2011,2016,2018
 ./bin/tests/system/dlzexternal/ns1/.gitignore	X	2012,2018
 ./bin/tests/system/dlzexternal/ns1/dlzs.conf.in	CONF-C	2018
 ./bin/tests/system/dlzexternal/ns1/named.conf.in	CONF-C	2011,2012,2013,2014,2016,2018
-./bin/tests/system/dlzexternal/ns1/root.db	ZONE	2014,2016
+./bin/tests/system/dlzexternal/ns1/root.db	ZONE	2014,2016,2018
 ./bin/tests/system/dlzexternal/prereq.sh	SH	2010,2011,2012,2014,2016,2018
 ./bin/tests/system/dlzexternal/setup.sh		SH	2010,2012,2014,2016,2017,2018
 ./bin/tests/system/dlzexternal/tests.sh		SH	2010,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/dns64/clean.sh		SH	2010,2012,2014,2015,2016,2018
-./bin/tests/system/dns64/conf/bad1.conf		CONF-C	2010,2016
-./bin/tests/system/dns64/conf/bad2.conf		CONF-C	2010,2016
-./bin/tests/system/dns64/conf/bad3.conf		CONF-C	2010,2016
-./bin/tests/system/dns64/conf/bad4.conf		CONF-C	2010,2016
-./bin/tests/system/dns64/conf/bad5.conf		CONF-C	2010,2016
-./bin/tests/system/dns64/conf/bad6.conf		CONF-C	2010,2016
-./bin/tests/system/dns64/conf/bad7.conf		CONF-C	2012,2016
-./bin/tests/system/dns64/conf/bad8.conf		CONF-C	2012,2016
-./bin/tests/system/dns64/conf/bad9.conf		CONF-C	2012,2016
-./bin/tests/system/dns64/conf/good1.conf	CONF-C	2010,2016
-./bin/tests/system/dns64/conf/good2.conf	CONF-C	2010,2016
-./bin/tests/system/dns64/conf/good3.conf	CONF-C	2010,2016
-./bin/tests/system/dns64/conf/good4.conf	CONF-C	2010,2016
-./bin/tests/system/dns64/conf/good5.conf	CONF-C	2010,2016
-./bin/tests/system/dns64/ns1/example.db		ZONE	2010,2011,2013,2016
+./bin/tests/system/dns64/conf/bad1.conf		CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/bad2.conf		CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/bad3.conf		CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/bad4.conf		CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/bad5.conf		CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/bad6.conf		CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/bad7.conf		CONF-C	2012,2016,2018
+./bin/tests/system/dns64/conf/bad8.conf		CONF-C	2012,2016,2018
+./bin/tests/system/dns64/conf/bad9.conf		CONF-C	2012,2016,2018
+./bin/tests/system/dns64/conf/good1.conf	CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/good2.conf	CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/good3.conf	CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/good4.conf	CONF-C	2010,2016,2018
+./bin/tests/system/dns64/conf/good5.conf	CONF-C	2010,2016,2018
+./bin/tests/system/dns64/ns1/example.db		ZONE	2010,2011,2013,2016,2018
 ./bin/tests/system/dns64/ns1/named.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/dns64/ns1/root.db		ZONE	2010,2016
-./bin/tests/system/dns64/ns1/sign.sh		SH	2010,2012,2014,2016,2017
+./bin/tests/system/dns64/ns1/root.db		ZONE	2010,2016,2018
+./bin/tests/system/dns64/ns1/sign.sh		SH	2010,2012,2014,2016,2017,2018
 ./bin/tests/system/dns64/ns2/named.conf.in	CONF-C	2010,2011,2013,2016,2018
-./bin/tests/system/dns64/ns2/rpz.db		ZONE	2013,2016
-./bin/tests/system/dns64/prereq.sh		SH	2014,2016
+./bin/tests/system/dns64/ns2/rpz.db		ZONE	2013,2016,2018
+./bin/tests/system/dns64/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/dns64/setup.sh		SH	2010,2012,2014,2016,2017,2018
 ./bin/tests/system/dns64/tests.sh		SH	2010,2011,2012,2013,2014,2016,2018
-./bin/tests/system/dnssec/README		TXT.BRIEF	2000,2001,2002,2004,2011,2016
+./bin/tests/system/dnssec/README		TXT.BRIEF	2000,2001,2002,2004,2011,2016,2018
 ./bin/tests/system/dnssec/clean.sh		SH	2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/dnssec_update_test.pl	PERL	2002,2004,2007,2010,2012,2016,2018
 ./bin/tests/system/dnssec/ns1/named.conf.in	CONF-C	2000,2001,2004,2006,2007,2016,2018
-./bin/tests/system/dnssec/ns1/root.db.in	ZONE	2000,2001,2004,2007,2010,2013,2014,2016
-./bin/tests/system/dnssec/ns1/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017
-./bin/tests/system/dnssec/ns2/algroll.db.in	ZONE	2010,2016
-./bin/tests/system/dnssec/ns2/badparam.db.in	ZONE	2010,2016
-./bin/tests/system/dnssec/ns2/cdnskey-auto.secure.db.in	ZONE	2015,2016
-./bin/tests/system/dnssec/ns2/cdnskey-kskonly.secure.db.in	ZONE	2017
-./bin/tests/system/dnssec/ns2/cdnskey-update.secure.db.in	ZONE	2015,2016
-./bin/tests/system/dnssec/ns2/cdnskey.secure.db.in	ZONE	2015,2016
-./bin/tests/system/dnssec/ns2/cds-auto.secure.db.in	ZONE	2015,2016
-./bin/tests/system/dnssec/ns2/cds-kskonly.secure.db.in	ZONE	2017
-./bin/tests/system/dnssec/ns2/cds-update.secure.db.in	ZONE	2015,2016
-./bin/tests/system/dnssec/ns2/cds.secure.db.in	ZONE	2015,2016
-./bin/tests/system/dnssec/ns2/child.nsec3.example.db	ZONE	2006,2008,2016
-./bin/tests/system/dnssec/ns2/child.optout.example.db	ZONE	2006,2008,2016
-./bin/tests/system/dnssec/ns2/dlv.db.in		ZONE	2004,2007,2016
-./bin/tests/system/dnssec/ns2/dst.example.db.in	ZONE	2004,2007,2016
-./bin/tests/system/dnssec/ns2/example.db.in	ZONE	2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2016
-./bin/tests/system/dnssec/ns2/in-addr.arpa.db.in	ZONE	2014,2016
-./bin/tests/system/dnssec/ns2/insecure.secure.example.db	ZONE	2000,2001,2004,2007,2013,2016
+./bin/tests/system/dnssec/ns1/root.db.in	ZONE	2000,2001,2004,2007,2010,2013,2014,2016,2018
+./bin/tests/system/dnssec/ns1/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/dnssec/ns2/algroll.db.in	ZONE	2010,2016,2018
+./bin/tests/system/dnssec/ns2/badparam.db.in	ZONE	2010,2016,2018
+./bin/tests/system/dnssec/ns2/cdnskey-auto.secure.db.in	ZONE	2015,2016,2018
+./bin/tests/system/dnssec/ns2/cdnskey-kskonly.secure.db.in	ZONE	2017,2018
+./bin/tests/system/dnssec/ns2/cdnskey-update.secure.db.in	ZONE	2015,2016,2018
+./bin/tests/system/dnssec/ns2/cdnskey.secure.db.in	ZONE	2015,2016,2018
+./bin/tests/system/dnssec/ns2/cds-auto.secure.db.in	ZONE	2015,2016,2018
+./bin/tests/system/dnssec/ns2/cds-kskonly.secure.db.in	ZONE	2017,2018
+./bin/tests/system/dnssec/ns2/cds-update.secure.db.in	ZONE	2015,2016,2018
+./bin/tests/system/dnssec/ns2/cds.secure.db.in	ZONE	2015,2016,2018
+./bin/tests/system/dnssec/ns2/child.nsec3.example.db	ZONE	2006,2008,2016,2018
+./bin/tests/system/dnssec/ns2/child.optout.example.db	ZONE	2006,2008,2016,2018
+./bin/tests/system/dnssec/ns2/dlv.db.in		ZONE	2004,2007,2016,2018
+./bin/tests/system/dnssec/ns2/dst.example.db.in	ZONE	2004,2007,2016,2018
+./bin/tests/system/dnssec/ns2/example.db.in	ZONE	2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2016,2018
+./bin/tests/system/dnssec/ns2/in-addr.arpa.db.in	ZONE	2014,2016,2018
+./bin/tests/system/dnssec/ns2/insecure.secure.example.db	ZONE	2000,2001,2004,2007,2013,2016,2018
 ./bin/tests/system/dnssec/ns2/named.conf.in	CONF-C	2000,2001,2002,2004,2006,2007,2008,2010,2011,2014,2015,2016,2017,2018
-./bin/tests/system/dnssec/ns2/private.secure.example.db.in	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/dnssec/ns2/rfc2335.example.db	X	2004
-./bin/tests/system/dnssec/ns2/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017
-./bin/tests/system/dnssec/ns2/single-nsec3.db.in	ZONE	2010,2016
-./bin/tests/system/dnssec/ns3/auto-nsec.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/bogus.example.db.in	ZONE	2000,2001,2004,2007,2014,2016
-./bin/tests/system/dnssec/ns3/dnskey-nsec3-unknown.example.db.in	ZONE	2014,2016
-./bin/tests/system/dnssec/ns3/dnskey-unknown.example.db.in	ZONE	2014,2016
-./bin/tests/system/dnssec/ns3/dynamic.example.db.in	ZONE	2002,2004,2007,2016
-./bin/tests/system/dnssec/ns3/expired.example.db.in	ZONE	2011,2012,2016
-./bin/tests/system/dnssec/ns3/expiring.example.db.in	ZONE	2011,2012,2016
-./bin/tests/system/dnssec/ns3/future.example.db.in	ZONE	2014,2016
-./bin/tests/system/dnssec/ns3/generic.example.db.in	ZONE	2001,2002,2004,2007,2016
-./bin/tests/system/dnssec/ns3/inline.example.db	ZONE	2012,2016
-./bin/tests/system/dnssec/ns3/insecure.below-cname.example.db	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/insecure.example.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/dnssec/ns3/insecure.nsec3.example.db	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/insecure.optout.example.db	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/kskonly.example.db.in	ZONE	2010,2016
-./bin/tests/system/dnssec/ns3/lower.example.db.in	ZONE	2012,2016
-./bin/tests/system/dnssec/ns3/managed-future.example.db.in	ZONE	2016
-./bin/tests/system/dnssec/ns3/multiple.example.db.in	ZONE	2006,2008,2016
+./bin/tests/system/dnssec/ns2/private.secure.example.db.in	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dnssec/ns2/rfc2335.example.db	X	2004,2018
+./bin/tests/system/dnssec/ns2/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
+./bin/tests/system/dnssec/ns2/single-nsec3.db.in	ZONE	2010,2016,2018
+./bin/tests/system/dnssec/ns3/auto-nsec.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/bogus.example.db.in	ZONE	2000,2001,2004,2007,2014,2016,2018
+./bin/tests/system/dnssec/ns3/dnskey-nsec3-unknown.example.db.in	ZONE	2014,2016,2018
+./bin/tests/system/dnssec/ns3/dnskey-unknown.example.db.in	ZONE	2014,2016,2018
+./bin/tests/system/dnssec/ns3/dynamic.example.db.in	ZONE	2002,2004,2007,2016,2018
+./bin/tests/system/dnssec/ns3/expired.example.db.in	ZONE	2011,2012,2016,2018
+./bin/tests/system/dnssec/ns3/expiring.example.db.in	ZONE	2011,2012,2016,2018
+./bin/tests/system/dnssec/ns3/future.example.db.in	ZONE	2014,2016,2018
+./bin/tests/system/dnssec/ns3/generic.example.db.in	ZONE	2001,2002,2004,2007,2016,2018
+./bin/tests/system/dnssec/ns3/inline.example.db	ZONE	2012,2016,2018
+./bin/tests/system/dnssec/ns3/insecure.below-cname.example.db	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/insecure.example.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dnssec/ns3/insecure.nsec3.example.db	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/insecure.optout.example.db	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/kskonly.example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/dnssec/ns3/lower.example.db.in	ZONE	2012,2016,2018
+./bin/tests/system/dnssec/ns3/managed-future.example.db.in	ZONE	2016,2018
+./bin/tests/system/dnssec/ns3/multiple.example.db.in	ZONE	2006,2008,2016,2018
 ./bin/tests/system/dnssec/ns3/named.conf.in	CONF-C	2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018
-./bin/tests/system/dnssec/ns3/nosign.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in	ZONE	2006,2008,2016
-./bin/tests/system/dnssec/ns3/nsec3.example.db.in	ZONE	2006,2008,2016
-./bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/optout-unknown.example.db.in	ZONE	2006,2008,2016
-./bin/tests/system/dnssec/ns3/optout.example.db.in	ZONE	2006,2008,2016
-./bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/optout.optout.example.db.in	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/publish-inactive.example.db.in	ZONE	2013,2016
-./bin/tests/system/dnssec/ns3/rsasha256.example.db.in	ZONE	2009,2016
-./bin/tests/system/dnssec/ns3/rsasha512.example.db.in	ZONE	2009,2016
-./bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/secure.example.db.in	ZONE	2000,2001,2004,2007,2008,2010,2012,2013,2014,2016
-./bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/secure.optout.example.db.in	ZONE	2008,2016
-./bin/tests/system/dnssec/ns3/siginterval.example.db.in	ZONE	2013,2016
-./bin/tests/system/dnssec/ns3/siginterval1.conf	CONF-C	2013,2016
-./bin/tests/system/dnssec/ns3/siginterval2.conf	CONF-C	2013,2016
-./bin/tests/system/dnssec/ns3/sign.sh		SH	2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/dnssec/ns3/split-dnssec.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/split-smart.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/ttlpatch.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/update-nsec3.example.db.in	ZONE	2011,2016
-./bin/tests/system/dnssec/ns3/upper.example.db.in	ZONE	2012,2016
+./bin/tests/system/dnssec/ns3/nosign.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in	ZONE	2006,2008,2016,2018
+./bin/tests/system/dnssec/ns3/nsec3.example.db.in	ZONE	2006,2008,2016,2018
+./bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/optout-unknown.example.db.in	ZONE	2006,2008,2016,2018
+./bin/tests/system/dnssec/ns3/optout.example.db.in	ZONE	2006,2008,2016,2018
+./bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/optout.optout.example.db.in	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/publish-inactive.example.db.in	ZONE	2013,2016,2018
+./bin/tests/system/dnssec/ns3/rsasha256.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/dnssec/ns3/rsasha512.example.db.in	ZONE	2009,2016,2018
+./bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/secure.example.db.in	ZONE	2000,2001,2004,2007,2008,2010,2012,2013,2014,2016,2018
+./bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/secure.optout.example.db.in	ZONE	2008,2016,2018
+./bin/tests/system/dnssec/ns3/siginterval.example.db.in	ZONE	2013,2016,2018
+./bin/tests/system/dnssec/ns3/siginterval1.conf	CONF-C	2013,2016,2018
+./bin/tests/system/dnssec/ns3/siginterval2.conf	CONF-C	2013,2016,2018
+./bin/tests/system/dnssec/ns3/sign.sh		SH	2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/dnssec/ns3/split-dnssec.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/split-smart.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/ttlpatch.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/update-nsec3.example.db.in	ZONE	2011,2016,2018
+./bin/tests/system/dnssec/ns3/upper.example.db.in	ZONE	2012,2016,2018
 ./bin/tests/system/dnssec/ns4/named1.conf.in	CONF-C	2011,2013,2014,2016,2017,2018
 ./bin/tests/system/dnssec/ns4/named2.conf.in	CONF-C	2011,2013,2016,2017,2018
 ./bin/tests/system/dnssec/ns4/named3.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/dnssec/ns4/named4.conf.in	CONF-C	2013,2016,2017,2018
-./bin/tests/system/dnssec/ns5/.gitignore	X	2015
+./bin/tests/system/dnssec/ns5/.gitignore	X	2015,2018
 ./bin/tests/system/dnssec/ns5/named1.conf.in	CONF-C	2000,2001,2004,2006,2007,2015,2016,2017,2018
 ./bin/tests/system/dnssec/ns5/named2.conf.in	CONF-C	2000,2001,2004,2006,2007,2015,2016,2018
-./bin/tests/system/dnssec/ns5/sign.sh		SH	2015,2016,2017
-./bin/tests/system/dnssec/ns5/trusted.conf.bad	CONF-C	2000,2001,2004,2007,2016
-./bin/tests/system/dnssec/ns6/named.args	X	2013,2014,2016
+./bin/tests/system/dnssec/ns5/sign.sh		SH	2015,2016,2017,2018
+./bin/tests/system/dnssec/ns5/trusted.conf.bad	CONF-C	2000,2001,2004,2007,2016,2018
+./bin/tests/system/dnssec/ns6/named.args	X	2013,2014,2016,2018
 ./bin/tests/system/dnssec/ns6/named.conf.in	CONF-C	2004,2006,2007,2013,2016,2017,2018
-./bin/tests/system/dnssec/ns6/optout-tld.db.in	ZONE	2013,2016
-./bin/tests/system/dnssec/ns6/sign.sh		SH	2013,2014,2016,2017
+./bin/tests/system/dnssec/ns6/optout-tld.db.in	ZONE	2013,2016,2018
+./bin/tests/system/dnssec/ns6/sign.sh		SH	2013,2014,2016,2017,2018
 ./bin/tests/system/dnssec/ns7/named.conf.in	CONF-C	2006,2008,2010,2014,2016,2018
-./bin/tests/system/dnssec/ns7/named.nosoa	TXT.BRIEF	2010,2016
-./bin/tests/system/dnssec/ns7/nosoa.secure.example.db	ZONE	2010,2016
-./bin/tests/system/dnssec/ns7/sign.sh		SH	2014,2016,2017
-./bin/tests/system/dnssec/ns7/split-rrsig.db.in	ZONE	2014,2016
-./bin/tests/system/dnssec/ntadiff.pl		PERL	2015,2016
+./bin/tests/system/dnssec/ns7/named.nosoa	TXT.BRIEF	2010,2016,2018
+./bin/tests/system/dnssec/ns7/nosoa.secure.example.db	ZONE	2010,2016,2018
+./bin/tests/system/dnssec/ns7/sign.sh		SH	2014,2016,2017,2018
+./bin/tests/system/dnssec/ns7/split-rrsig.db.in	ZONE	2014,2016,2018
+./bin/tests/system/dnssec/ntadiff.pl		PERL	2015,2016,2018
 ./bin/tests/system/dnssec/prereq.sh		SH	2000,2001,2002,2004,2006,2007,2009,2012,2014,2015,2016,2018
 ./bin/tests/system/dnssec/setup.sh		SH	2000,2001,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/dnssec/signer/example.db.in	ZONE	2010,2016
-./bin/tests/system/dnssec/signer/remove.db.in	ZONE	2016
-./bin/tests/system/dnssec/signer/remove2.db.in	ZONE	2016
+./bin/tests/system/dnssec/signer/example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/dnssec/signer/remove.db.in	ZONE	2016,2018
+./bin/tests/system/dnssec/signer/remove2.db.in	ZONE	2016,2018
 ./bin/tests/system/dnssec/tests.sh		SH	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf	CONF-C	2016
-./bin/tests/system/dnstap/bad-size-version.conf	CONF-C	2017
+./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/bad-size-version.conf	CONF-C	2017,2018
 ./bin/tests/system/dnstap/clean.sh		SH	2015,2016,2017,2018
-./bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf	CONF-C	2016
-./bin/tests/system/dnstap/good-size-unlimited.conf	CONF-C	2017
-./bin/tests/system/dnstap/good-size-version.conf	CONF-C	2017
+./bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf	CONF-C	2016,2018
+./bin/tests/system/dnstap/good-size-unlimited.conf	CONF-C	2017,2018
+./bin/tests/system/dnstap/good-size-version.conf	CONF-C	2017,2018
 ./bin/tests/system/dnstap/ns1/named.conf.in	CONF-C	2015,2016,2017,2018
-./bin/tests/system/dnstap/ns1/root.db		ZONE	2015,2016
-./bin/tests/system/dnstap/ns2/example.db	ZONE	2015,2016
+./bin/tests/system/dnstap/ns1/root.db		ZONE	2015,2016,2018
+./bin/tests/system/dnstap/ns2/example.db	ZONE	2015,2016,2018
 ./bin/tests/system/dnstap/ns2/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/dnstap/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/dnstap/ns4/named.conf.in	CONF-C	2016,2018
@@ -1342,205 +1342,205 @@
 ./bin/tests/system/dnstap/tests.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/dnstap/ydump.py		PYTHON	2016,2017,2018
 ./bin/tests/system/dscp/clean.sh		SH	2013,2014,2015,2016,2018
-./bin/tests/system/dscp/ns1/named.args		X	2013,2014
+./bin/tests/system/dscp/ns1/named.args		X	2013,2014,2018
 ./bin/tests/system/dscp/ns1/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/dscp/ns1/root.db		ZONE	2013,2016
-./bin/tests/system/dscp/ns2/named.args		X	2013,2014
+./bin/tests/system/dscp/ns1/root.db		ZONE	2013,2016,2018
+./bin/tests/system/dscp/ns2/named.args		X	2013,2014,2018
 ./bin/tests/system/dscp/ns2/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/dscp/ns3/hint.db		ZONE	2013,2016
-./bin/tests/system/dscp/ns3/named.args		X	2013,2014
+./bin/tests/system/dscp/ns3/hint.db		ZONE	2013,2016,2018
+./bin/tests/system/dscp/ns3/named.args		X	2013,2014,2018
 ./bin/tests/system/dscp/ns3/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/dscp/ns4/named.args		X	2013,2014
+./bin/tests/system/dscp/ns4/named.args		X	2013,2014,2018
 ./bin/tests/system/dscp/ns4/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/dscp/ns4/root.db		ZONE	2013,2016
-./bin/tests/system/dscp/ns5/named.args		X	2013,2014
+./bin/tests/system/dscp/ns4/root.db		ZONE	2013,2016,2018
+./bin/tests/system/dscp/ns5/named.args		X	2013,2014,2018
 ./bin/tests/system/dscp/ns5/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/dscp/ns6/hint.db		ZONE	2013,2016
-./bin/tests/system/dscp/ns6/named.args		X	2013,2014
+./bin/tests/system/dscp/ns6/hint.db		ZONE	2013,2016,2018
+./bin/tests/system/dscp/ns6/named.args		X	2013,2014,2018
 ./bin/tests/system/dscp/ns6/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/dscp/ns7/named.args		X	2013,2014
+./bin/tests/system/dscp/ns7/named.args		X	2013,2014,2018
 ./bin/tests/system/dscp/ns7/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/dscp/setup.sh		SH	2018
 ./bin/tests/system/dscp/tests.sh		SH	2013,2016,2018
 ./bin/tests/system/dsdigest/clean.sh		SH	2012,2014,2016,2018
 ./bin/tests/system/dsdigest/ns1/named.conf.in	CONF-C	2012,2016,2018
-./bin/tests/system/dsdigest/ns1/root.db.in	ZONE	2012,2016
-./bin/tests/system/dsdigest/ns1/sign.sh		SH	2012,2014,2016
-./bin/tests/system/dsdigest/ns2/bad.db.in	ZONE	2012,2016
-./bin/tests/system/dsdigest/ns2/good.db.in	ZONE	2012,2016
+./bin/tests/system/dsdigest/ns1/root.db.in	ZONE	2012,2016,2018
+./bin/tests/system/dsdigest/ns1/sign.sh		SH	2012,2014,2016,2018
+./bin/tests/system/dsdigest/ns2/bad.db.in	ZONE	2012,2016,2018
+./bin/tests/system/dsdigest/ns2/good.db.in	ZONE	2012,2016,2018
 ./bin/tests/system/dsdigest/ns2/named.conf.in	CONF-C	2012,2016,2018
-./bin/tests/system/dsdigest/ns2/sign.sh		SH	2012,2014,2016
+./bin/tests/system/dsdigest/ns2/sign.sh		SH	2012,2014,2016,2018
 ./bin/tests/system/dsdigest/ns3/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/dsdigest/ns4/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/dsdigest/prereq.sh		SH	2012,2014,2016,2018
 ./bin/tests/system/dsdigest/setup.sh		SH	2012,2014,2016,2017,2018
 ./bin/tests/system/dsdigest/tests.sh		SH	2012,2016,2018
-./bin/tests/system/dyndb/Makefile.in		MAKE	2015,2016
+./bin/tests/system/dyndb/Makefile.in		MAKE	2015,2016,2018
 ./bin/tests/system/dyndb/clean.sh		SH	2015,2016,2018
-./bin/tests/system/dyndb/driver/.gitignore	X	2015
-./bin/tests/system/dyndb/driver/AUTHORS		X	2015
-./bin/tests/system/dyndb/driver/COPYING		X	2015,2016
-./bin/tests/system/dyndb/driver/Makefile.in	MAKE	2015,2016,2017
-./bin/tests/system/dyndb/driver/README		X	2015
+./bin/tests/system/dyndb/driver/.gitignore	X	2015,2018
+./bin/tests/system/dyndb/driver/AUTHORS		X	2015,2018
+./bin/tests/system/dyndb/driver/COPYING		X	2015,2016,2018
+./bin/tests/system/dyndb/driver/Makefile.in	MAKE	2015,2016,2017,2018
+./bin/tests/system/dyndb/driver/README		X	2015,2018
 ./bin/tests/system/dyndb/driver/db.c		X	2015,2016,2017,2018
-./bin/tests/system/dyndb/driver/db.h		X	2015,2016
-./bin/tests/system/dyndb/driver/driver.c	X	2015,2016
-./bin/tests/system/dyndb/driver/instance.c	X	2015,2016
-./bin/tests/system/dyndb/driver/instance.h	X	2015,2016
-./bin/tests/system/dyndb/driver/lock.c		X	2015
-./bin/tests/system/dyndb/driver/lock.h		X	2015
-./bin/tests/system/dyndb/driver/log.c		X	2015
-./bin/tests/system/dyndb/driver/log.h		X	2015
-./bin/tests/system/dyndb/driver/syncptr.c	X	2015,2017
-./bin/tests/system/dyndb/driver/syncptr.h	X	2015
-./bin/tests/system/dyndb/driver/util.h		X	2015
-./bin/tests/system/dyndb/driver/zone.c		X	2015
-./bin/tests/system/dyndb/driver/zone.h		X	2015
+./bin/tests/system/dyndb/driver/db.h		X	2015,2016,2018
+./bin/tests/system/dyndb/driver/driver.c	X	2015,2016,2018
+./bin/tests/system/dyndb/driver/instance.c	X	2015,2016,2018
+./bin/tests/system/dyndb/driver/instance.h	X	2015,2016,2018
+./bin/tests/system/dyndb/driver/lock.c		X	2015,2018
+./bin/tests/system/dyndb/driver/lock.h		X	2015,2018
+./bin/tests/system/dyndb/driver/log.c		X	2015,2018
+./bin/tests/system/dyndb/driver/log.h		X	2015,2018
+./bin/tests/system/dyndb/driver/syncptr.c	X	2015,2017,2018
+./bin/tests/system/dyndb/driver/syncptr.h	X	2015,2018
+./bin/tests/system/dyndb/driver/util.h		X	2015,2018
+./bin/tests/system/dyndb/driver/zone.c		X	2015,2018
+./bin/tests/system/dyndb/driver/zone.h		X	2015,2018
 ./bin/tests/system/dyndb/ns1/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/dyndb/prereq.sh		SH	2015,2016,2018
 ./bin/tests/system/dyndb/setup.sh		SH	2018
 ./bin/tests/system/dyndb/tests.sh		SH	2015,2016,2018
-./bin/tests/system/ecdsa/clean.sh		SH	2012,2014,2016
-./bin/tests/system/ecdsa/ns1/named.conf		CONF-C	2012,2016
-./bin/tests/system/ecdsa/ns1/root.db.in		ZONE	2012,2016
-./bin/tests/system/ecdsa/ns1/sign.sh		SH	2012,2014,2016
-./bin/tests/system/ecdsa/ns2/named.conf		CONF-C	2012,2016
-./bin/tests/system/ecdsa/prereq.sh		SH	2012,2014,2016
-./bin/tests/system/ecdsa/setup.sh		SH	2012,2014,2016,2017
-./bin/tests/system/ecdsa/tests.sh		SH	2012,2013,2015,2016
-./bin/tests/system/eddsa/clean.sh		SH	2017
-./bin/tests/system/eddsa/ns1/named.conf		CONF-C	2017
-./bin/tests/system/eddsa/ns1/root.db.in		ZONE	2017
-./bin/tests/system/eddsa/ns1/sign.sh		SH	2017
-./bin/tests/system/eddsa/ns2/Xexample.com.+015+03613.key	X	2017
-./bin/tests/system/eddsa/ns2/Xexample.com.+015+03613.private	X	2017
-./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.key	X	2017
-./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.private	X	2017
-./bin/tests/system/eddsa/ns2/example.com.db	ZONE	2017
-./bin/tests/system/eddsa/ns2/named.conf		CONF-C	2017
-./bin/tests/system/eddsa/ns2/sign.sh		SH	2017
-./bin/tests/system/eddsa/prereq.sh		SH	2017
-./bin/tests/system/eddsa/setup.sh		SH	2017
-./bin/tests/system/eddsa/tests.sh		SH	2017
+./bin/tests/system/ecdsa/clean.sh		SH	2012,2014,2016,2018
+./bin/tests/system/ecdsa/ns1/named.conf		CONF-C	2012,2016,2018
+./bin/tests/system/ecdsa/ns1/root.db.in		ZONE	2012,2016,2018
+./bin/tests/system/ecdsa/ns1/sign.sh		SH	2012,2014,2016,2018
+./bin/tests/system/ecdsa/ns2/named.conf		CONF-C	2012,2016,2018
+./bin/tests/system/ecdsa/prereq.sh		SH	2012,2014,2016,2018
+./bin/tests/system/ecdsa/setup.sh		SH	2012,2014,2016,2017,2018
+./bin/tests/system/ecdsa/tests.sh		SH	2012,2013,2015,2016,2018
+./bin/tests/system/eddsa/clean.sh		SH	2017,2018
+./bin/tests/system/eddsa/ns1/named.conf		CONF-C	2017,2018
+./bin/tests/system/eddsa/ns1/root.db.in		ZONE	2017,2018
+./bin/tests/system/eddsa/ns1/sign.sh		SH	2017,2018
+./bin/tests/system/eddsa/ns2/Xexample.com.+015+03613.key	X	2017,2018
+./bin/tests/system/eddsa/ns2/Xexample.com.+015+03613.private	X	2017,2018
+./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.key	X	2017,2018
+./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.private	X	2017,2018
+./bin/tests/system/eddsa/ns2/example.com.db	ZONE	2017,2018
+./bin/tests/system/eddsa/ns2/named.conf		CONF-C	2017,2018
+./bin/tests/system/eddsa/ns2/sign.sh		SH	2017,2018
+./bin/tests/system/eddsa/prereq.sh		SH	2017,2018
+./bin/tests/system/eddsa/setup.sh		SH	2017,2018
+./bin/tests/system/eddsa/tests.sh		SH	2017,2018
 ./bin/tests/system/ednscompliance/clean.sh	SH	2014,2015,2016,2018
 ./bin/tests/system/ednscompliance/ns1/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/ednscompliance/ns1/root.db	ZONE	2014,2016
+./bin/tests/system/ednscompliance/ns1/root.db	ZONE	2014,2016,2018
 ./bin/tests/system/ednscompliance/setup.sh	SH	2018
 ./bin/tests/system/ednscompliance/tests.sh	SH	2014,2015,2016,2018
-./bin/tests/system/emptyzones/clean.sh		SH	2014,2015,2016
-./bin/tests/system/emptyzones/ns1/empty.db	ZONE	2014,2016
+./bin/tests/system/emptyzones/clean.sh		SH	2014,2015,2016,2018
+./bin/tests/system/emptyzones/ns1/empty.db	ZONE	2014,2016,2018
 ./bin/tests/system/emptyzones/ns1/named1.conf.in	CONF-C	2014,2016,2017,2018
 ./bin/tests/system/emptyzones/ns1/named2.conf.in	CONF-C	2014,2015,2016,2017,2018
-./bin/tests/system/emptyzones/ns1/rfc1918.zones	CONF-C	2014,2016
-./bin/tests/system/emptyzones/ns1/root.hint	ZONE	2014,2016
+./bin/tests/system/emptyzones/ns1/rfc1918.zones	CONF-C	2014,2016,2018
+./bin/tests/system/emptyzones/ns1/root.hint	ZONE	2014,2016,2018
 ./bin/tests/system/emptyzones/setup.sh		SH	2014,2016,2018
 ./bin/tests/system/emptyzones/tests.sh		SH	2014,2015,2016,2018
-./bin/tests/system/feature-test.c		C	2016,2017
+./bin/tests/system/feature-test.c		C	2016,2017,2018
 ./bin/tests/system/fetchlimit/ans4/ans.pl	PERL	2015,2016,2018
 ./bin/tests/system/fetchlimit/clean.sh		SH	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns1/named.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/fetchlimit/ns1/root.db	ZONE	2015,2016
-./bin/tests/system/fetchlimit/ns2/example.db	ZONE	2015,2016
+./bin/tests/system/fetchlimit/ns1/root.db	ZONE	2015,2016,2018
+./bin/tests/system/fetchlimit/ns2/example.db	ZONE	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns2/named.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/fetchlimit/ns3/named.args	X	2015
+./bin/tests/system/fetchlimit/ns3/named.args	X	2015,2018
 ./bin/tests/system/fetchlimit/ns3/named1.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/named2.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/named3.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/fetchlimit/ns3/root.hint	ZONE	2015,2016
+./bin/tests/system/fetchlimit/ns3/root.hint	ZONE	2015,2016,2018
 ./bin/tests/system/fetchlimit/setup.sh		SH	2015,2016,2018
 ./bin/tests/system/fetchlimit/tests.sh		SH	2015,2016,2018
-./bin/tests/system/filter-aaaa/.gitignore	X	2012,2014,2016
+./bin/tests/system/filter-aaaa/.gitignore	X	2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/clean.sh		SH	2010,2012,2014,2016,2018
-./bin/tests/system/filter-aaaa/conf/bad1.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/bad2.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/bad3.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/bad4.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/bad5.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/bad6.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good1.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good2.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good3.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good4.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good5.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good6.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good7.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/conf/good8.conf	CONF-C	2010,2016
+./bin/tests/system/filter-aaaa/conf/bad1.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/bad2.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/bad3.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/bad4.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/bad5.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/bad6.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good1.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good2.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good3.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good4.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good5.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good6.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good7.conf	CONF-C	2010,2016,2018
+./bin/tests/system/filter-aaaa/conf/good8.conf	CONF-C	2010,2016,2018
 ./bin/tests/system/filter-aaaa/ns1/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns1/root.db	ZONE	2010,2012,2016,2017
+./bin/tests/system/filter-aaaa/ns1/root.db	ZONE	2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/sign.sh	SH	2010,2012,2014,2016,2018
-./bin/tests/system/filter-aaaa/ns1/signed.db.in	ZONE	2010,2012,2016,2017
-./bin/tests/system/filter-aaaa/ns1/signed.db.presigned	X	2014,2017
-./bin/tests/system/filter-aaaa/ns1/unsigned.db	ZONE	2010,2012,2016,2017
-./bin/tests/system/filter-aaaa/ns2/hints	ZONE	2010,2016
+./bin/tests/system/filter-aaaa/ns1/signed.db.in	ZONE	2010,2012,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns1/signed.db.presigned	X	2014,2017,2018
+./bin/tests/system/filter-aaaa/ns1/unsigned.db	ZONE	2010,2012,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns2/hints	ZONE	2010,2016,2018
 ./bin/tests/system/filter-aaaa/ns2/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns2/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns3/hints	ZONE	2010,2016
+./bin/tests/system/filter-aaaa/ns3/hints	ZONE	2010,2016,2018
 ./bin/tests/system/filter-aaaa/ns3/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns3/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns4/root.db	ZONE	2010,2012,2016,2017
+./bin/tests/system/filter-aaaa/ns4/root.db	ZONE	2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/sign.sh	SH	2010,2012,2014,2016,2018
-./bin/tests/system/filter-aaaa/ns4/signed.db.in	ZONE	2010,2012,2016,2017
-./bin/tests/system/filter-aaaa/ns4/signed.db.presigned	X	2014
-./bin/tests/system/filter-aaaa/ns4/unsigned.db	ZONE	2010,2012,2016,2017
+./bin/tests/system/filter-aaaa/ns4/signed.db.in	ZONE	2010,2012,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns4/signed.db.presigned	X	2014,2018
+./bin/tests/system/filter-aaaa/ns4/unsigned.db	ZONE	2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/setup.sh		SH	2010,2012,2014,2016,2017,2018
 ./bin/tests/system/filter-aaaa/tests.sh		SH	2010,2012,2015,2016,2018
 ./bin/tests/system/formerr/clean.sh		SH	2013,2014,2015,2016,2018
-./bin/tests/system/formerr/formerr.pl		PERL	2013,2014,2016
-./bin/tests/system/formerr/nametoolong		X	2013
-./bin/tests/system/formerr/noquestions		X	2013
+./bin/tests/system/formerr/formerr.pl		PERL	2013,2014,2016,2018
+./bin/tests/system/formerr/nametoolong		X	2013,2018
+./bin/tests/system/formerr/noquestions		X	2013,2018
 ./bin/tests/system/formerr/ns1/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/formerr/ns1/root.db		ZONE	2013,2016
+./bin/tests/system/formerr/ns1/root.db		ZONE	2013,2016,2018
 ./bin/tests/system/formerr/setup.sh		SH	2018
 ./bin/tests/system/formerr/tests.sh		SH	2013,2015,2016,2018
-./bin/tests/system/formerr/twoquestions		X	2013
+./bin/tests/system/formerr/twoquestions		X	2013,2018
 ./bin/tests/system/forward/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
-./bin/tests/system/forward/ns1/example.db	X	2000,2001
+./bin/tests/system/forward/ns1/example.db	X	2000,2001,2018
 ./bin/tests/system/forward/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2014,2016,2018
-./bin/tests/system/forward/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/forward/ns2/example.db	X	2000,2001
+./bin/tests/system/forward/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/forward/ns2/example.db	X	2000,2001,2018
 ./bin/tests/system/forward/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2013,2014,2016,2018
-./bin/tests/system/forward/ns2/root.db		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/forward/ns2/root.db		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/forward/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
-./bin/tests/system/forward/ns3/root.db		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/forward/ns3/root.db		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/forward/ns4/named.conf.in	CONF-C	2000,2001,2004,2007,2013,2014,2016,2018
-./bin/tests/system/forward/ns4/root.db		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/forward/ns4/root.db		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/forward/ns5/named.conf.in	CONF-C	2011,2016,2018
-./bin/tests/system/forward/ns5/root.db		ZONE	2011,2016
-./bin/tests/system/forward/rfc1918-inherited.conf	CONF-C	2016
-./bin/tests/system/forward/rfc1918-notinherited.conf	CONF-C	2016
+./bin/tests/system/forward/ns5/root.db		ZONE	2011,2016,2018
+./bin/tests/system/forward/rfc1918-inherited.conf	CONF-C	2016,2018
+./bin/tests/system/forward/rfc1918-notinherited.conf	CONF-C	2016,2018
 ./bin/tests/system/forward/setup.sh		SH	2018
 ./bin/tests/system/forward/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
-./bin/tests/system/forward/ula-inherited.conf	CONF-C	2016
-./bin/tests/system/forward/ula-notinherited.conf	CONF-C	2016
-./bin/tests/system/genzone.sh			SH	2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/geoip/clean.sh		SH	2013,2014,2016
-./bin/tests/system/geoip/data/GeoIP.csv		X	2013,2014
-./bin/tests/system/geoip/data/GeoIP.dat		X	2013,2014
-./bin/tests/system/geoip/data/GeoIPASNum.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPASNum.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPASNumv6.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPASNumv6.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPCity.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPCity.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPCityv6.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPCityv6.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPDomain.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPDomain.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPISP.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPISP.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPNetSpeed.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPNetSpeed.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPOrg.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPOrg.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPRegion.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPRegion.dat	X	2013
-./bin/tests/system/geoip/data/GeoIPv6.csv	X	2013
-./bin/tests/system/geoip/data/GeoIPv6.dat	X	2013
-./bin/tests/system/geoip/data/README		TXT.BRIEF	2013,2014,2016
-./bin/tests/system/geoip/ns2/example.db.in	ZONE	2013,2016
+./bin/tests/system/forward/ula-inherited.conf	CONF-C	2016,2018
+./bin/tests/system/forward/ula-notinherited.conf	CONF-C	2016,2018
+./bin/tests/system/genzone.sh			SH	2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/geoip/clean.sh		SH	2013,2014,2016,2018
+./bin/tests/system/geoip/data/GeoIP.csv		X	2013,2014,2018
+./bin/tests/system/geoip/data/GeoIP.dat		X	2013,2014,2018
+./bin/tests/system/geoip/data/GeoIPASNum.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPASNum.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPASNumv6.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPASNumv6.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPCity.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPCity.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPCityv6.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPCityv6.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPDomain.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPDomain.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPISP.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPISP.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPNetSpeed.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPNetSpeed.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPOrg.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPOrg.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPRegion.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPRegion.dat	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPv6.csv	X	2013,2018
+./bin/tests/system/geoip/data/GeoIPv6.dat	X	2013,2018
+./bin/tests/system/geoip/data/README		TXT.BRIEF	2013,2014,2016,2018
+./bin/tests/system/geoip/ns2/example.db.in	ZONE	2013,2016,2018
 ./bin/tests/system/geoip/ns2/named1.conf.in	CONF-C	2013,2014,2016,2018
 ./bin/tests/system/geoip/ns2/named10.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/geoip/ns2/named11.conf.in	CONF-C	2013,2014,2016,2018
@@ -1556,174 +1556,174 @@
 ./bin/tests/system/geoip/ns2/named7.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/geoip/ns2/named8.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/geoip/ns2/named9.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/geoip/options.conf		CONF-C	2015,2016
+./bin/tests/system/geoip/options.conf		CONF-C	2015,2016,2018
 ./bin/tests/system/geoip/prereq.sh		SH	2013,2014,2016,2018
 ./bin/tests/system/geoip/setup.sh		SH	2013,2014,2016,2018
 ./bin/tests/system/geoip/tests.sh		SH	2013,2014,2015,2016,2018
 ./bin/tests/system/glue/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
-./bin/tests/system/glue/fi.good			X	2000,2001
-./bin/tests/system/glue/noglue.good		X	2000,2001
-./bin/tests/system/glue/ns1/cache.in		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/glue/ns1/mil.db		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/glue/fi.good			X	2000,2001,2018
+./bin/tests/system/glue/noglue.good		X	2000,2001,2018
+./bin/tests/system/glue/ns1/cache.in		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/glue/ns1/mil.db		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/glue/ns1/named.conf.in	CONF-C	2000,2001,2004,2005,2007,2009,2016,2018
-./bin/tests/system/glue/ns1/net.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/glue/ns1/root-servers.nil.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/glue/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2017
+./bin/tests/system/glue/ns1/net.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/glue/ns1/root-servers.nil.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/glue/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/glue/setup.sh		SH	2001,2004,2007,2012,2016,2018
 ./bin/tests/system/glue/tests.sh		SH	2000,2001,2003,2004,2007,2012,2013,2016,2017,2018
-./bin/tests/system/glue/xx.good			X	2000,2001
-./bin/tests/system/glue/yy.good			X	2000,2001,2003
-./bin/tests/system/gost/clean.sh		SH	2010,2012,2014,2016
-./bin/tests/system/gost/ns1/named.conf		CONF-C	2010,2016
-./bin/tests/system/gost/ns1/root.db.in		ZONE	2010,2016
-./bin/tests/system/gost/ns1/sign.sh		SH	2010,2012,2014,2016
-./bin/tests/system/gost/ns2/named.conf		CONF-C	2010,2016
-./bin/tests/system/gost/prereq.sh		SH	2010,2012,2014,2016
-./bin/tests/system/gost/setup.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/gost/tests.sh		SH	2010,2012,2013,2016
-./bin/tests/system/ifconfig.bat			BAT	2016
-./bin/tests/system/ifconfig.sh			SH	2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2016
-./bin/tests/system/inline/.gitignore		X	2014
-./bin/tests/system/inline/checkdsa.sh.in	SH	2013,2014,2016
+./bin/tests/system/glue/xx.good			X	2000,2001,2018
+./bin/tests/system/glue/yy.good			X	2000,2001,2003,2018
+./bin/tests/system/gost/clean.sh		SH	2010,2012,2014,2016,2018
+./bin/tests/system/gost/ns1/named.conf		CONF-C	2010,2016,2018
+./bin/tests/system/gost/ns1/root.db.in		ZONE	2010,2016,2018
+./bin/tests/system/gost/ns1/sign.sh		SH	2010,2012,2014,2016,2018
+./bin/tests/system/gost/ns2/named.conf		CONF-C	2010,2016,2018
+./bin/tests/system/gost/prereq.sh		SH	2010,2012,2014,2016,2018
+./bin/tests/system/gost/setup.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/gost/tests.sh		SH	2010,2012,2013,2016,2018
+./bin/tests/system/ifconfig.bat			BAT	2016,2018
+./bin/tests/system/ifconfig.sh			SH	2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2016,2018
+./bin/tests/system/inline/.gitignore		X	2014,2018
+./bin/tests/system/inline/checkdsa.sh.in	SH	2013,2014,2016,2018
 ./bin/tests/system/inline/clean.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/inline/ns1/named.conf.in	CONF-C	2011,2016,2018
-./bin/tests/system/inline/ns1/root.db.in	ZONE	2011,2012,2013,2016,2017
-./bin/tests/system/inline/ns1/sign.sh		SH	2011,2012,2014,2016,2017
-./bin/tests/system/inline/ns2/bits.db.in	ZONE	2011,2016
+./bin/tests/system/inline/ns1/root.db.in	ZONE	2011,2012,2013,2016,2017,2018
+./bin/tests/system/inline/ns1/sign.sh		SH	2011,2012,2014,2016,2017,2018
+./bin/tests/system/inline/ns2/bits.db.in	ZONE	2011,2016,2018
 ./bin/tests/system/inline/ns2/named.conf.in	CONF-C	2011,2012,2013,2014,2016,2017,2018
-./bin/tests/system/inline/ns2/nsec3-loop.db	ZONE	2017
-./bin/tests/system/inline/ns3/master.db.in	ZONE	2011,2012,2016
-./bin/tests/system/inline/ns3/master2.db.in	ZONE	2011,2012,2016
-./bin/tests/system/inline/ns3/master3.db.in	ZONE	2012,2016
-./bin/tests/system/inline/ns3/master4.db.in	ZONE	2012,2016
+./bin/tests/system/inline/ns2/nsec3-loop.db	ZONE	2017,2018
+./bin/tests/system/inline/ns3/master.db.in	ZONE	2011,2012,2016,2018
+./bin/tests/system/inline/ns3/master2.db.in	ZONE	2011,2012,2016,2018
+./bin/tests/system/inline/ns3/master3.db.in	ZONE	2012,2016,2018
+./bin/tests/system/inline/ns3/master4.db.in	ZONE	2012,2016,2018
 ./bin/tests/system/inline/ns3/named.conf.in	CONF-C	2011,2012,2013,2015,2016,2017,2018
-./bin/tests/system/inline/ns3/sign.sh		SH	2011,2012,2013,2014,2016,2017
+./bin/tests/system/inline/ns3/sign.sh		SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/inline/ns4/named.conf.in	CONF-C	2011,2016,2018
-./bin/tests/system/inline/ns4/noixfr.db.in	ZONE	2011,2016
+./bin/tests/system/inline/ns4/noixfr.db.in	ZONE	2011,2016,2018
 ./bin/tests/system/inline/ns5/named.conf.post	CONF-C	2011,2014,2016,2018
 ./bin/tests/system/inline/ns5/named.conf.pre	CONF-C	2011,2016,2018
 ./bin/tests/system/inline/ns6/named.conf.in	CONF-C	2011,2016,2018
 ./bin/tests/system/inline/ns7/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/inline/ns7/sign.sh		SH	2017
-./bin/tests/system/inline/prereq.sh		SH	2014,2016
+./bin/tests/system/inline/ns7/sign.sh		SH	2017,2018
+./bin/tests/system/inline/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/inline/setup.sh		SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/inline/tests.sh		SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/integrity/clean.sh		SH	2017,2018
-./bin/tests/system/integrity/ns1/mx-cname.db	ZONE	2017
+./bin/tests/system/integrity/ns1/mx-cname.db	ZONE	2017,2018
 ./bin/tests/system/integrity/ns1/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/integrity/ns1/srv-cname.db	ZONE	2017
+./bin/tests/system/integrity/ns1/srv-cname.db	ZONE	2017,2018
 ./bin/tests/system/integrity/setup.sh		SH	2018
 ./bin/tests/system/integrity/tests.sh		SH	2017,2018
-./bin/tests/system/ixfr/ans2/startme		X	2011
+./bin/tests/system/ixfr/ans2/startme		X	2011,2018
 ./bin/tests/system/ixfr/clean.sh		SH	2001,2004,2007,2011,2012,2014,2015,2016,2018
-./bin/tests/system/ixfr/ns1/.gitignore		X	2012
-./bin/tests/system/ixfr/ns1/startme		X	2012,2013
-./bin/tests/system/ixfr/ns3/mytest0.db		ZONE	2011,2016
-./bin/tests/system/ixfr/ns3/mytest1.db		ZONE	2011,2016
-./bin/tests/system/ixfr/ns3/mytest2.db		ZONE	2011,2016
+./bin/tests/system/ixfr/ns1/.gitignore		X	2012,2018
+./bin/tests/system/ixfr/ns1/startme		X	2012,2013,2018
+./bin/tests/system/ixfr/ns3/mytest0.db		ZONE	2011,2016,2018
+./bin/tests/system/ixfr/ns3/mytest1.db		ZONE	2011,2016,2018
+./bin/tests/system/ixfr/ns3/mytest2.db		ZONE	2011,2016,2018
 ./bin/tests/system/ixfr/ns3/named.conf.in	CONF-C	2011,2013,2014,2016,2018
-./bin/tests/system/ixfr/ns3/subtest0.db		ZONE	2011,2016
-./bin/tests/system/ixfr/ns3/subtest1.db		ZONE	2011,2016
+./bin/tests/system/ixfr/ns3/subtest0.db		ZONE	2011,2016,2018
+./bin/tests/system/ixfr/ns3/subtest1.db		ZONE	2011,2016,2018
 ./bin/tests/system/ixfr/ns4/named.conf.in	CONF-C	2011,2013,2016,2018
 ./bin/tests/system/ixfr/prereq.sh		SH	2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/ixfr/setup.sh		SH	2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/ixfr/tests.sh		SH	2001,2004,2007,2011,2012,2014,2016,2018
 ./bin/tests/system/keepalive/clean.sh		SH	2017,2018
-./bin/tests/system/keepalive/expected		X	2017
+./bin/tests/system/keepalive/expected		X	2017,2018
 ./bin/tests/system/keepalive/ns1/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/keepalive/ns1/root.db	ZONE	2017
-./bin/tests/system/keepalive/ns2/example.db	ZONE	2017
+./bin/tests/system/keepalive/ns1/root.db	ZONE	2017,2018
+./bin/tests/system/keepalive/ns2/example.db	ZONE	2017,2018
 ./bin/tests/system/keepalive/ns2/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/keepalive/ns3/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/keepalive/setup.sh		SH	2017,2018
 ./bin/tests/system/keepalive/tests.sh		SH	2017,2018
-./bin/tests/system/keymgr/01-ksk-inactive/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/01-ksk-inactive/expect	X	2016
-./bin/tests/system/keymgr/02-zsk-inactive/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/02-zsk-inactive/expect	X	2016
-./bin/tests/system/keymgr/03-ksk-unpublished/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/03-ksk-unpublished/expect	X	2016
-./bin/tests/system/keymgr/04-zsk-unpublished/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/04-zsk-unpublished/expect	X	2016
-./bin/tests/system/keymgr/05-ksk-unpub-active/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/05-ksk-unpub-active/expect	X	2016
-./bin/tests/system/keymgr/06-zsk-unpub-active/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/06-zsk-unpub-active/expect	X	2016
-./bin/tests/system/keymgr/07-ksk-ttl/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/07-ksk-ttl/expect	X	2016
-./bin/tests/system/keymgr/08-zsk-ttl/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/08-zsk-ttl/expect	X	2016
-./bin/tests/system/keymgr/09-no-keys/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/09-no-keys/expect	X	2016
-./bin/tests/system/keymgr/10-change-roll/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/10-change-roll/expect	X	2016
-./bin/tests/system/keymgr/11-many-simul/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/11-many-simul/expect	X	2016
-./bin/tests/system/keymgr/12-many-active/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/12-many-active/expect	X	2016
-./bin/tests/system/keymgr/13-noroll/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/13-noroll/expect	X	2016
-./bin/tests/system/keymgr/14-wrongalg/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/14-wrongalg/expect	X	2016
-./bin/tests/system/keymgr/15-unspec/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/15-unspec/expect	X	2016
-./bin/tests/system/keymgr/16-wrongalg-unspec/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/16-wrongalg-unspec/expect	X	2016
-./bin/tests/system/keymgr/17-noforce/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/17-noforce/expect	X	2016
-./bin/tests/system/keymgr/18-nonstd-prepub/README	TXT.BRIEF	2016
-./bin/tests/system/keymgr/18-nonstd-prepub/expect	X	2016
-./bin/tests/system/keymgr/18-nonstd-prepub/policy.conf	CONF-C	2016
-./bin/tests/system/keymgr/clean.sh		SH	2016
-./bin/tests/system/keymgr/policy.conf		CONF-C	2016
-./bin/tests/system/keymgr/policy.good		X	2016
-./bin/tests/system/keymgr/policy.sample		CONF-C	2016,2017
+./bin/tests/system/keymgr/01-ksk-inactive/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/01-ksk-inactive/expect	X	2016,2018
+./bin/tests/system/keymgr/02-zsk-inactive/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/02-zsk-inactive/expect	X	2016,2018
+./bin/tests/system/keymgr/03-ksk-unpublished/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/03-ksk-unpublished/expect	X	2016,2018
+./bin/tests/system/keymgr/04-zsk-unpublished/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/04-zsk-unpublished/expect	X	2016,2018
+./bin/tests/system/keymgr/05-ksk-unpub-active/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/05-ksk-unpub-active/expect	X	2016,2018
+./bin/tests/system/keymgr/06-zsk-unpub-active/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/06-zsk-unpub-active/expect	X	2016,2018
+./bin/tests/system/keymgr/07-ksk-ttl/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/07-ksk-ttl/expect	X	2016,2018
+./bin/tests/system/keymgr/08-zsk-ttl/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/08-zsk-ttl/expect	X	2016,2018
+./bin/tests/system/keymgr/09-no-keys/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/09-no-keys/expect	X	2016,2018
+./bin/tests/system/keymgr/10-change-roll/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/10-change-roll/expect	X	2016,2018
+./bin/tests/system/keymgr/11-many-simul/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/11-many-simul/expect	X	2016,2018
+./bin/tests/system/keymgr/12-many-active/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/12-many-active/expect	X	2016,2018
+./bin/tests/system/keymgr/13-noroll/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/13-noroll/expect	X	2016,2018
+./bin/tests/system/keymgr/14-wrongalg/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/14-wrongalg/expect	X	2016,2018
+./bin/tests/system/keymgr/15-unspec/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/15-unspec/expect	X	2016,2018
+./bin/tests/system/keymgr/16-wrongalg-unspec/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/16-wrongalg-unspec/expect	X	2016,2018
+./bin/tests/system/keymgr/17-noforce/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/17-noforce/expect	X	2016,2018
+./bin/tests/system/keymgr/18-nonstd-prepub/README	TXT.BRIEF	2016,2018
+./bin/tests/system/keymgr/18-nonstd-prepub/expect	X	2016,2018
+./bin/tests/system/keymgr/18-nonstd-prepub/policy.conf	CONF-C	2016,2018
+./bin/tests/system/keymgr/clean.sh		SH	2016,2018
+./bin/tests/system/keymgr/policy.conf		CONF-C	2016,2018
+./bin/tests/system/keymgr/policy.good		X	2016,2018
+./bin/tests/system/keymgr/policy.sample		CONF-C	2016,2017,2018
 ./bin/tests/system/keymgr/prereq.sh		SH	2016,2018
 ./bin/tests/system/keymgr/setup.sh		SH	2016,2017,2018
-./bin/tests/system/keymgr/testpolicy.py		PYTHON	2016
+./bin/tests/system/keymgr/testpolicy.py		PYTHON	2016,2018
 ./bin/tests/system/keymgr/tests.sh		SH	2016,2018
-./bin/tests/system/legacy/build.sh		SH	2014,2016,2017
+./bin/tests/system/legacy/build.sh		SH	2014,2016,2017,2018
 ./bin/tests/system/legacy/clean.sh		SH	2014,2016,2018
 ./bin/tests/system/legacy/ns1/named1.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns1/named2.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/legacy/ns1/root.db		ZONE	2014,2016
-./bin/tests/system/legacy/ns1/trusted.conf	X	2014
-./bin/tests/system/legacy/ns2/dropedns.db	ZONE	2014,2016
+./bin/tests/system/legacy/ns1/root.db		ZONE	2014,2016,2018
+./bin/tests/system/legacy/ns1/trusted.conf	X	2014,2018
+./bin/tests/system/legacy/ns2/dropedns.db	ZONE	2014,2016,2018
 ./bin/tests/system/legacy/ns2/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/legacy/ns2/named.dropedns	X	2014
-./bin/tests/system/legacy/ns3/dropedns-notcp.db	ZONE	2014,2016
+./bin/tests/system/legacy/ns2/named.dropedns	X	2014,2018
+./bin/tests/system/legacy/ns3/dropedns-notcp.db	ZONE	2014,2016,2018
 ./bin/tests/system/legacy/ns3/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/legacy/ns3/named.dropedns	X	2014
-./bin/tests/system/legacy/ns3/named.notcp	X	2014
-./bin/tests/system/legacy/ns4/named.args	X	2014
+./bin/tests/system/legacy/ns3/named.dropedns	X	2014,2018
+./bin/tests/system/legacy/ns3/named.notcp	X	2014,2018
+./bin/tests/system/legacy/ns4/named.args	X	2014,2018
 ./bin/tests/system/legacy/ns4/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/legacy/ns4/plain.db		ZONE	2014,2016
-./bin/tests/system/legacy/ns5/named.args	X	2014
+./bin/tests/system/legacy/ns4/plain.db		ZONE	2014,2016,2018
+./bin/tests/system/legacy/ns5/named.args	X	2014,2018
 ./bin/tests/system/legacy/ns5/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/legacy/ns5/named.notcp	X	2014
-./bin/tests/system/legacy/ns5/plain-notcp.db	ZONE	2014,2016
-./bin/tests/system/legacy/ns6/edns512.db.in	ZONE	2014,2016
-./bin/tests/system/legacy/ns6/edns512.db.signed	X	2014
-./bin/tests/system/legacy/ns6/named.args	X	2014
+./bin/tests/system/legacy/ns5/named.notcp	X	2014,2018
+./bin/tests/system/legacy/ns5/plain-notcp.db	ZONE	2014,2016,2018
+./bin/tests/system/legacy/ns6/edns512.db.in	ZONE	2014,2016,2018
+./bin/tests/system/legacy/ns6/edns512.db.signed	X	2014,2018
+./bin/tests/system/legacy/ns6/named.args	X	2014,2018
 ./bin/tests/system/legacy/ns6/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns6/sign.sh		SH	2014,2016,2018
-./bin/tests/system/legacy/ns7/edns512-notcp.db.in	ZONE	2014,2016
-./bin/tests/system/legacy/ns7/edns512-notcp.db.signed	X	2014
-./bin/tests/system/legacy/ns7/named.args	X	2014
+./bin/tests/system/legacy/ns7/edns512-notcp.db.in	ZONE	2014,2016,2018
+./bin/tests/system/legacy/ns7/edns512-notcp.db.signed	X	2014,2018
+./bin/tests/system/legacy/ns7/named.args	X	2014,2018
 ./bin/tests/system/legacy/ns7/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/legacy/ns7/named.notcp	X	2014
+./bin/tests/system/legacy/ns7/named.notcp	X	2014,2018
 ./bin/tests/system/legacy/ns7/sign.sh		SH	2014,2016,2018
 ./bin/tests/system/legacy/setup.sh		SH	2014,2016,2018
 ./bin/tests/system/legacy/tests.sh		SH	2014,2015,2016,2018
 ./bin/tests/system/limits/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
-./bin/tests/system/limits/knowngood.dig.out.1000	X	2000,2001
-./bin/tests/system/limits/knowngood.dig.out.2000	X	2000,2001
-./bin/tests/system/limits/knowngood.dig.out.3000	X	2000,2001
-./bin/tests/system/limits/knowngood.dig.out.4000	X	2000,2001
-./bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset	X	2000,2001
-./bin/tests/system/limits/ns1/example.db	ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/limits/knowngood.dig.out.1000	X	2000,2001,2018
+./bin/tests/system/limits/knowngood.dig.out.2000	X	2000,2001,2018
+./bin/tests/system/limits/knowngood.dig.out.3000	X	2000,2001,2018
+./bin/tests/system/limits/knowngood.dig.out.4000	X	2000,2001,2018
+./bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset	X	2000,2001,2018
+./bin/tests/system/limits/ns1/example.db	ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/limits/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
-./bin/tests/system/limits/ns1/root.db		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/limits/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/limits/setup.sh		SH	2018
 ./bin/tests/system/limits/tests.sh		SH	2000,2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/logfileconfig/clean.sh	SH	2011,2012,2014,2015,2016,2017,2018
@@ -1739,108 +1739,108 @@
 ./bin/tests/system/logfileconfig/ns1/named.unlimited	CONF-C	2016,2018
 ./bin/tests/system/logfileconfig/ns1/named.versconf	CONF-C	2016,2018
 ./bin/tests/system/logfileconfig/ns1/rndc.conf.in	CONF-C	2011,2013,2016,2017,2018
-./bin/tests/system/logfileconfig/ns1/root.db	ZONE	2011,2016
+./bin/tests/system/logfileconfig/ns1/root.db	ZONE	2011,2016,2018
 ./bin/tests/system/logfileconfig/setup.sh	SH	2011,2012,2014,2016,2018
 ./bin/tests/system/logfileconfig/tests.sh	SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/masterfile/clean.sh		SH	2001,2004,2007,2010,2012,2014,2015,2016,2018
-./bin/tests/system/masterfile/knowngood.dig.out	X	2001,2004,2012
-./bin/tests/system/masterfile/ns1/include.db	ZONE	2001,2004,2007,2012,2016
+./bin/tests/system/masterfile/knowngood.dig.out	X	2001,2004,2012,2018
+./bin/tests/system/masterfile/ns1/include.db	ZONE	2001,2004,2007,2012,2016,2018
 ./bin/tests/system/masterfile/ns1/named.conf.in	CONF-C	2001,2004,2007,2016,2018
-./bin/tests/system/masterfile/ns1/sub.db	ZONE	2001,2004,2007,2016
-./bin/tests/system/masterfile/ns1/ttl1.db	ZONE	2001,2004,2007,2016
-./bin/tests/system/masterfile/ns1/ttl2.db	ZONE	2001,2004,2007,2016
-./bin/tests/system/masterfile/ns2/example.db	ZONE	2010,2016
+./bin/tests/system/masterfile/ns1/sub.db	ZONE	2001,2004,2007,2016,2018
+./bin/tests/system/masterfile/ns1/ttl1.db	ZONE	2001,2004,2007,2016,2018
+./bin/tests/system/masterfile/ns1/ttl2.db	ZONE	2001,2004,2007,2016,2018
+./bin/tests/system/masterfile/ns2/example.db	ZONE	2010,2016,2018
 ./bin/tests/system/masterfile/ns2/named.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/masterfile/setup.sh		SH	2018
 ./bin/tests/system/masterfile/tests.sh		SH	2001,2004,2007,2010,2012,2015,2016,2018
-./bin/tests/system/masterfile/zone/inheritownerafterinclude.db	ZONE	2015,2016
-./bin/tests/system/masterfile/zone/inheritownerafterinclude.good	X	2015
-./bin/tests/system/masterfile/zone/nameservers.db	ZONE	2015,2016
+./bin/tests/system/masterfile/zone/inheritownerafterinclude.db	ZONE	2015,2016,2018
+./bin/tests/system/masterfile/zone/inheritownerafterinclude.good	X	2015,2018
+./bin/tests/system/masterfile/zone/nameservers.db	ZONE	2015,2016,2018
 ./bin/tests/system/masterformat/clean.sh	SH	2005,2007,2011,2012,2013,2014,2015,2016,2018
-./bin/tests/system/masterformat/ns1/compile.sh	SH	2005,2006,2007,2011,2012,2013,2014,2016,2017
-./bin/tests/system/masterformat/ns1/example.db	ZONE	2005,2007,2014,2016
-./bin/tests/system/masterformat/ns1/large.db.in	ZONE	2012,2016
+./bin/tests/system/masterformat/ns1/compile.sh	SH	2005,2006,2007,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/masterformat/ns1/example.db	ZONE	2005,2007,2014,2016,2018
+./bin/tests/system/masterformat/ns1/large.db.in	ZONE	2012,2016,2018
 ./bin/tests/system/masterformat/ns1/named.conf.in	CONF-C	2005,2007,2011,2012,2013,2014,2016,2018
-./bin/tests/system/masterformat/ns1/signed.db	ZONE	2013,2016
-./bin/tests/system/masterformat/ns2/formerly-text.db.in	ZONE	2011,2016
+./bin/tests/system/masterformat/ns1/signed.db	ZONE	2013,2016,2018
+./bin/tests/system/masterformat/ns2/formerly-text.db.in	ZONE	2011,2016,2018
 ./bin/tests/system/masterformat/ns2/named.conf.in	CONF-C	2005,2007,2011,2012,2014,2016,2018
 ./bin/tests/system/masterformat/ns3/named.conf.in	CONF-C	2012,2013,2016,2018
-./bin/tests/system/masterformat/prereq.sh	SH	2014,2016
+./bin/tests/system/masterformat/prereq.sh	SH	2014,2016,2018
 ./bin/tests/system/masterformat/setup.sh	SH	2005,2006,2007,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/masterformat/tests.sh	SH	2005,2007,2011,2012,2013,2014,2016,2017,2018
-./bin/tests/system/metadata/child.db		ZONE	2009,2016
-./bin/tests/system/metadata/clean.sh		SH	2009,2011,2012,2014,2016,2017
-./bin/tests/system/metadata/parent.db		ZONE	2009,2016
-./bin/tests/system/metadata/prereq.sh		SH	2009,2012,2014,2016
+./bin/tests/system/metadata/child.db		ZONE	2009,2016,2018
+./bin/tests/system/metadata/clean.sh		SH	2009,2011,2012,2014,2016,2017,2018
+./bin/tests/system/metadata/parent.db		ZONE	2009,2016,2018
+./bin/tests/system/metadata/prereq.sh		SH	2009,2012,2014,2016,2018
 ./bin/tests/system/metadata/setup.sh		SH	2009,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/metadata/tests.sh		SH	2009,2011,2012,2013,2014,2016,2017,2018
-./bin/tests/system/mkeys/README			TXT.BRIEF	2015,2016,2017
+./bin/tests/system/mkeys/README			TXT.BRIEF	2015,2016,2017,2018
 ./bin/tests/system/mkeys/clean.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns1/named1.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns1/named2.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns1/named3.conf.in	CONF-C	2017,2018
-./bin/tests/system/mkeys/ns1/root.db		ZONE	2015,2016,2017
-./bin/tests/system/mkeys/ns1/sign.sh		SH	2015,2016,2017
-./bin/tests/system/mkeys/ns2/named.args		X	2015,2016,2017
+./bin/tests/system/mkeys/ns1/root.db		ZONE	2015,2016,2017,2018
+./bin/tests/system/mkeys/ns1/sign.sh		SH	2015,2016,2017,2018
+./bin/tests/system/mkeys/ns2/named.args		X	2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns2/named.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/mkeys/ns3/named.args		X	2015,2016,2017
+./bin/tests/system/mkeys/ns3/named.args		X	2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns4/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/mkeys/ns5/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/mkeys/ns5/named1.args	X	2017
-./bin/tests/system/mkeys/ns5/named2.args	X	2017
-./bin/tests/system/mkeys/prereq.sh		SH	2015,2016
+./bin/tests/system/mkeys/ns5/named1.args	X	2017,2018
+./bin/tests/system/mkeys/ns5/named2.args	X	2017,2018
+./bin/tests/system/mkeys/prereq.sh		SH	2015,2016,2018
 ./bin/tests/system/mkeys/setup.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/mkeys/tests.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/names/clean.sh		SH	2015,2016,2018
-./bin/tests/system/names/ns1/example.db		ZONE	2015,2016
+./bin/tests/system/names/ns1/example.db		ZONE	2015,2016,2018
 ./bin/tests/system/names/ns1/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/names/setup.sh		SH	2015,2016,2018
 ./bin/tests/system/names/tests.sh		SH	2015,2016,2018
 ./bin/tests/system/notify/clean.sh		SH	2000,2001,2004,2007,2011,2012,2014,2015,2016,2018
 ./bin/tests/system/notify/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
-./bin/tests/system/notify/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/notify/ns2/example1.db	ZONE	2000,2001,2002,2004,2007,2009,2016
-./bin/tests/system/notify/ns2/example2.db	ZONE	2000,2001,2002,2004,2007,2009,2016
-./bin/tests/system/notify/ns2/example3.db	ZONE	2000,2001,2002,2004,2007,2009,2016
-./bin/tests/system/notify/ns2/example4.db	ZONE	2000,2001,2002,2004,2007,2009,2016
-./bin/tests/system/notify/ns2/generic.db	ZONE	2014,2016
+./bin/tests/system/notify/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/notify/ns2/example1.db	ZONE	2000,2001,2002,2004,2007,2009,2016,2018
+./bin/tests/system/notify/ns2/example2.db	ZONE	2000,2001,2002,2004,2007,2009,2016,2018
+./bin/tests/system/notify/ns2/example3.db	ZONE	2000,2001,2002,2004,2007,2009,2016,2018
+./bin/tests/system/notify/ns2/example4.db	ZONE	2000,2001,2002,2004,2007,2009,2016,2018
+./bin/tests/system/notify/ns2/generic.db	ZONE	2014,2016,2018
 ./bin/tests/system/notify/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2014,2016,2018
 ./bin/tests/system/notify/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/notify/ns4/named.conf.in	CONF-C	2014,2016,2017,2018
 ./bin/tests/system/notify/ns4/named.port.in	X	2014,2018
 ./bin/tests/system/notify/ns5/named.conf.in	CONF-C	2015,2016,2017,2018
-./bin/tests/system/notify/ns5/x21.db		ZONE	2015,2016
+./bin/tests/system/notify/ns5/x21.db		ZONE	2015,2016,2018
 ./bin/tests/system/notify/setup.sh		SH	2000,2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/notify/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/nslookup/clean.sh		SH	2014,2015,2016,2018
-./bin/tests/system/nslookup/ns1/example.net.db	ZONE	2016
+./bin/tests/system/nslookup/ns1/example.net.db	ZONE	2016,2018
 ./bin/tests/system/nslookup/ns1/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/nslookup/setup.sh		SH	2014,2016,2018
 ./bin/tests/system/nslookup/tests.sh		SH	2014,2016,2018
 ./bin/tests/system/nsupdate/ans4/ans.pl		PERL	2017,2018
 ./bin/tests/system/nsupdate/clean.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014,2015,2016,2017,2018
-./bin/tests/system/nsupdate/commandlist		X	2012
-./bin/tests/system/nsupdate/knowngood.ns1.after	X	2000,2001,2003,2004,2009
-./bin/tests/system/nsupdate/knowngood.ns1.afterstop	X	2001,2004
-./bin/tests/system/nsupdate/knowngood.ns1.before	X	2000,2001,2003,2004,2009
-./bin/tests/system/nsupdate/ns1/example1.db	ZONE	2000,2001,2002,2004,2007,2009,2016
-./bin/tests/system/nsupdate/ns1/many.test.db.in	ZONE	2014,2016,2017
-./bin/tests/system/nsupdate/ns1/max-ttl.db	ZONE	2014,2016
-./bin/tests/system/nsupdate/ns1/maxjournal.db.in	ZONE	2017
+./bin/tests/system/nsupdate/commandlist		X	2012,2018
+./bin/tests/system/nsupdate/knowngood.ns1.after	X	2000,2001,2003,2004,2009,2018
+./bin/tests/system/nsupdate/knowngood.ns1.afterstop	X	2001,2004,2018
+./bin/tests/system/nsupdate/knowngood.ns1.before	X	2000,2001,2003,2004,2009,2018
+./bin/tests/system/nsupdate/ns1/example1.db	ZONE	2000,2001,2002,2004,2007,2009,2016,2018
+./bin/tests/system/nsupdate/ns1/many.test.db.in	ZONE	2014,2016,2017,2018
+./bin/tests/system/nsupdate/ns1/max-ttl.db	ZONE	2014,2016,2018
+./bin/tests/system/nsupdate/ns1/maxjournal.db.in	ZONE	2017,2018
 ./bin/tests/system/nsupdate/ns1/named.conf.in	CONF-C	2000,2001,2004,2005,2007,2009,2011,2012,2013,2014,2016,2017,2018
-./bin/tests/system/nsupdate/ns1/sample.db.in	ZONE	2016
+./bin/tests/system/nsupdate/ns1/sample.db.in	ZONE	2016,2018
 ./bin/tests/system/nsupdate/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2013,2016,2017,2018
-./bin/tests/system/nsupdate/ns2/sample.db.in	ZONE	2016
-./bin/tests/system/nsupdate/ns3/delegation.test.db.in	ZONE	2016
-./bin/tests/system/nsupdate/ns3/dnskey.test.db.in	ZONE	2011,2016
-./bin/tests/system/nsupdate/ns3/example.db.in	ZONE	2010,2016
+./bin/tests/system/nsupdate/ns2/sample.db.in	ZONE	2016,2018
+./bin/tests/system/nsupdate/ns3/delegation.test.db.in	ZONE	2016,2018
+./bin/tests/system/nsupdate/ns3/dnskey.test.db.in	ZONE	2011,2016,2018
+./bin/tests/system/nsupdate/ns3/example.db.in	ZONE	2010,2016,2018
 ./bin/tests/system/nsupdate/ns3/named.conf.in	CONF-C	2010,2011,2013,2014,2016,2018
-./bin/tests/system/nsupdate/ns3/nsec3param.test.db.in	ZONE	2010,2016
-./bin/tests/system/nsupdate/ns3/sign.sh		SH	2010,2011,2012,2014,2016,2017
-./bin/tests/system/nsupdate/ns3/too-big.test.db.in	ZONE	2016
-./bin/tests/system/nsupdate/ns5/local.db.in	ZONE	2017
-./bin/tests/system/nsupdate/ns5/named.args	X	2017
+./bin/tests/system/nsupdate/ns3/nsec3param.test.db.in	ZONE	2010,2016,2018
+./bin/tests/system/nsupdate/ns3/sign.sh		SH	2010,2011,2012,2014,2016,2017,2018
+./bin/tests/system/nsupdate/ns3/too-big.test.db.in	ZONE	2016,2018
+./bin/tests/system/nsupdate/ns5/local.db.in	ZONE	2017,2018
+./bin/tests/system/nsupdate/ns5/named.args	X	2017,2018
 ./bin/tests/system/nsupdate/ns5/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/nsupdate/prereq.sh		SH	2014,2015,2016,2018
 ./bin/tests/system/nsupdate/setup.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014,2016,2017,2018
@@ -1848,18 +1848,18 @@
 ./bin/tests/system/nsupdate/update_test.pl	PERL	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/nsupdate/verylarge.in	X	2013,2018
 ./bin/tests/system/nzd2nzf/clean.sh		SH	2016,2018
-./bin/tests/system/nzd2nzf/ns1/added.db		ZONE	2016
+./bin/tests/system/nzd2nzf/ns1/added.db		ZONE	2016,2018
 ./bin/tests/system/nzd2nzf/ns1/named.conf.in	CONF-C	2016,2018
 ./bin/tests/system/nzd2nzf/prereq.sh		SH	2016,2018
 ./bin/tests/system/nzd2nzf/setup.sh		SH	2016,2018
 ./bin/tests/system/nzd2nzf/tests.sh		SH	2016,2018
-./bin/tests/system/org.isc.bind.system		SH	2010,2012,2013,2016
-./bin/tests/system/org.isc.bind.system.plist	X	2010
-./bin/tests/system/packet.pl			PERL	2011,2012,2016
+./bin/tests/system/org.isc.bind.system		SH	2010,2012,2013,2016,2018
+./bin/tests/system/org.isc.bind.system.plist	X	2010,2018
+./bin/tests/system/packet.pl			PERL	2011,2012,2016,2018
 ./bin/tests/system/padding/clean.sh		SH	2017,2018
 ./bin/tests/system/padding/ns1/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/padding/ns1/root.db		ZONE	2017
-./bin/tests/system/padding/ns2/example.db	ZONE	2017
+./bin/tests/system/padding/ns1/root.db		ZONE	2017,2018
+./bin/tests/system/padding/ns2/example.db	ZONE	2017,2018
 ./bin/tests/system/padding/ns2/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/padding/ns3/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/padding/ns4/named.conf.in	CONF-C	2017,2018
@@ -1867,60 +1867,60 @@
 ./bin/tests/system/padding/tests.sh		SH	2017,2018
 ./bin/tests/system/pending/clean.sh		SH	2009,2012,2014,2016,2018
 ./bin/tests/system/pending/ns1/named.conf.in	CONF-C	2009,2016,2018
-./bin/tests/system/pending/ns1/root.db.in	ZONE	2009,2010,2016
-./bin/tests/system/pending/ns1/sign.sh		SH	2009,2010,2012,2014,2016
-./bin/tests/system/pending/ns2/example.com.db.in	ZONE	2009,2010,2016
-./bin/tests/system/pending/ns2/example.db.in	ZONE	2009,2010,2016
-./bin/tests/system/pending/ns2/forgery.db	ZONE	2010,2016
+./bin/tests/system/pending/ns1/root.db.in	ZONE	2009,2010,2016,2018
+./bin/tests/system/pending/ns1/sign.sh		SH	2009,2010,2012,2014,2016,2018
+./bin/tests/system/pending/ns2/example.com.db.in	ZONE	2009,2010,2016,2018
+./bin/tests/system/pending/ns2/example.db.in	ZONE	2009,2010,2016,2018
+./bin/tests/system/pending/ns2/forgery.db	ZONE	2010,2016,2018
 ./bin/tests/system/pending/ns2/named.conf.in	CONF-C	2009,2010,2016,2018
-./bin/tests/system/pending/ns2/sign.sh		SH	2009,2010,2012,2014,2016,2017
-./bin/tests/system/pending/ns3/hostile.db	ZONE	2009,2016
-./bin/tests/system/pending/ns3/mail.example.db	ZONE	2009,2016
+./bin/tests/system/pending/ns2/sign.sh		SH	2009,2010,2012,2014,2016,2017,2018
+./bin/tests/system/pending/ns3/hostile.db	ZONE	2009,2016,2018
+./bin/tests/system/pending/ns3/mail.example.db	ZONE	2009,2016,2018
 ./bin/tests/system/pending/ns3/named.conf.in	CONF-C	2009,2016,2018
 ./bin/tests/system/pending/ns4/named.conf.in	CONF-C	2009,2016,2018
-./bin/tests/system/pending/prereq.sh		SH	2009,2012,2014,2016
+./bin/tests/system/pending/prereq.sh		SH	2009,2012,2014,2016,2018
 ./bin/tests/system/pending/setup.sh		SH	2009,2012,2014,2016,2017,2018
 ./bin/tests/system/pending/tests.sh		SH	2009,2010,2012,2015,2016,2018
-./bin/tests/system/pipelined/.gitignore		X	2015
-./bin/tests/system/pipelined/Makefile.in	MAKE	2014,2015,2016
+./bin/tests/system/pipelined/.gitignore		X	2015,2018
+./bin/tests/system/pipelined/Makefile.in	MAKE	2014,2015,2016,2018
 ./bin/tests/system/pipelined/clean.sh		SH	2014,2015,2016,2018
-./bin/tests/system/pipelined/input		X	2014,2015
-./bin/tests/system/pipelined/inputb		X	2014,2015
+./bin/tests/system/pipelined/input		X	2014,2015,2018
+./bin/tests/system/pipelined/inputb		X	2014,2015,2018
 ./bin/tests/system/pipelined/ns1/named.conf.in	CONF-C	2014,2015,2016,2018
-./bin/tests/system/pipelined/ns1/root.db	ZONE	2014,2015,2016
-./bin/tests/system/pipelined/ns2/examplea.db	ZONE	2014,2015,2016
+./bin/tests/system/pipelined/ns1/root.db	ZONE	2014,2015,2016,2018
+./bin/tests/system/pipelined/ns2/examplea.db	ZONE	2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns2/named.conf.in	CONF-C	2014,2015,2016,2018
-./bin/tests/system/pipelined/ns3/exampleb.db	ZONE	2014,2015,2016
-./bin/tests/system/pipelined/ns3/named.args	X	2014,2015
+./bin/tests/system/pipelined/ns3/exampleb.db	ZONE	2014,2015,2016,2018
+./bin/tests/system/pipelined/ns3/named.args	X	2014,2015,2018
 ./bin/tests/system/pipelined/ns3/named.conf.in	CONF-C	2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns4/named.conf.in	CONF-C	2014,2015,2016,2018
 ./bin/tests/system/pipelined/pipequeries.c	C	2014,2015,2015,2016,2017,2018
-./bin/tests/system/pipelined/ref		X	2014,2015
-./bin/tests/system/pipelined/refb		X	2014,2015
+./bin/tests/system/pipelined/ref		X	2014,2015,2018
+./bin/tests/system/pipelined/refb		X	2014,2015,2018
 ./bin/tests/system/pipelined/setup.sh		SH	2014,2015,2016,2017,2018
 ./bin/tests/system/pipelined/tests.sh		SH	2014,2015,2016,2017,2018
-./bin/tests/system/pkcs11/clean.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/pkcs11/ns1/example.db.in	ZONE	2010,2016
-./bin/tests/system/pkcs11/ns1/named.conf	CONF-C	2010,2013,2014,2016,2017
-./bin/tests/system/pkcs11/prereq.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/pkcs11/setup.sh		SH	2010,2012,2013,2014,2016,2017
-./bin/tests/system/pkcs11/tests.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/pkcs11/usepkcs11		X	2010
-./bin/tests/system/pkcs11ssl/clean.sh		SH	2014,2016
-./bin/tests/system/pkcs11ssl/ns1/example.db.in	ZONE	2014,2016
-./bin/tests/system/pkcs11ssl/ns1/named.conf	CONF-C	2014,2016
-./bin/tests/system/pkcs11ssl/prereq.sh		SH	2014,2016
-./bin/tests/system/pkcs11ssl/setup.sh		SH	2014,2016
-./bin/tests/system/pkcs11ssl/tests.sh		SH	2014,2016
-./bin/tests/system/pkcs11ssl/usepkcs11		X	2014
-./bin/tests/system/reclimit/README		TXT.BRIEF	2014,2016,2017
+./bin/tests/system/pkcs11/clean.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/pkcs11/ns1/example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/pkcs11/ns1/named.conf	CONF-C	2010,2013,2014,2016,2017,2018
+./bin/tests/system/pkcs11/prereq.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/pkcs11/setup.sh		SH	2010,2012,2013,2014,2016,2017,2018
+./bin/tests/system/pkcs11/tests.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/pkcs11/usepkcs11		X	2010,2018
+./bin/tests/system/pkcs11ssl/clean.sh		SH	2014,2016,2018
+./bin/tests/system/pkcs11ssl/ns1/example.db.in	ZONE	2014,2016,2018
+./bin/tests/system/pkcs11ssl/ns1/named.conf	CONF-C	2014,2016,2018
+./bin/tests/system/pkcs11ssl/prereq.sh		SH	2014,2016,2018
+./bin/tests/system/pkcs11ssl/setup.sh		SH	2014,2016,2018
+./bin/tests/system/pkcs11ssl/tests.sh		SH	2014,2016,2018
+./bin/tests/system/pkcs11ssl/usepkcs11		X	2014,2018
+./bin/tests/system/reclimit/README		TXT.BRIEF	2014,2016,2017,2018
 ./bin/tests/system/reclimit/ans2/ans.pl		PERL	2014,2015,2016,2017,2018
 ./bin/tests/system/reclimit/ans7/ans.pl		PERL	2014,2016,2018
 ./bin/tests/system/reclimit/clean.sh		SH	2014,2016,2018
 ./bin/tests/system/reclimit/ns1/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/reclimit/ns1/root.db		ZONE	2014,2016,2017
-./bin/tests/system/reclimit/ns3/.gitignore	X	2014
-./bin/tests/system/reclimit/ns3/hints.db	ZONE	2014,2016
+./bin/tests/system/reclimit/ns1/root.db		ZONE	2014,2016,2017,2018
+./bin/tests/system/reclimit/ns3/.gitignore	X	2014,2018
+./bin/tests/system/reclimit/ns3/hints.db	ZONE	2014,2016,2018
 ./bin/tests/system/reclimit/ns3/named1.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/reclimit/ns3/named2.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/reclimit/ns3/named3.conf.in	CONF-C	2014,2016,2018
@@ -1929,30 +1929,30 @@
 ./bin/tests/system/reclimit/setup.sh		SH	2014,2016,2018
 ./bin/tests/system/reclimit/tests.sh		SH	2014,2015,2016,2017,2018
 ./bin/tests/system/redirect/clean.sh		SH	2011,2012,2013,2014,2015,2016,2018
-./bin/tests/system/redirect/conf/bad1.conf	CONF-C	2011,2016
-./bin/tests/system/redirect/conf/bad2.conf	CONF-C	2011,2016
-./bin/tests/system/redirect/conf/bad3.conf	CONF-C	2011,2016
-./bin/tests/system/redirect/conf/good1.conf	CONF-C	2011,2016
-./bin/tests/system/redirect/conf/good2.conf	CONF-C	2011,2016
-./bin/tests/system/redirect/conf/good3.conf	CONF-C	2011,2016
-./bin/tests/system/redirect/conf/good4.conf	CONF-C	2011,2016
-./bin/tests/system/redirect/ns1/example.db	ZONE	2011,2016
+./bin/tests/system/redirect/conf/bad1.conf	CONF-C	2011,2016,2018
+./bin/tests/system/redirect/conf/bad2.conf	CONF-C	2011,2016,2018
+./bin/tests/system/redirect/conf/bad3.conf	CONF-C	2011,2016,2018
+./bin/tests/system/redirect/conf/good1.conf	CONF-C	2011,2016,2018
+./bin/tests/system/redirect/conf/good2.conf	CONF-C	2011,2016,2018
+./bin/tests/system/redirect/conf/good3.conf	CONF-C	2011,2016,2018
+./bin/tests/system/redirect/conf/good4.conf	CONF-C	2011,2016,2018
+./bin/tests/system/redirect/ns1/example.db	ZONE	2011,2016,2018
 ./bin/tests/system/redirect/ns1/named.conf.in	CONF-C	2011,2016,2018
-./bin/tests/system/redirect/ns1/redirect.db	ZONE	2011,2016
-./bin/tests/system/redirect/ns1/root.db		ZONE	2011,2016
-./bin/tests/system/redirect/ns1/sign.sh		SH	2011,2012,2014,2016,2017
-./bin/tests/system/redirect/ns2/example.db.in	ZONE	2013,2016
+./bin/tests/system/redirect/ns1/redirect.db	ZONE	2011,2016,2018
+./bin/tests/system/redirect/ns1/root.db		ZONE	2011,2016,2018
+./bin/tests/system/redirect/ns1/sign.sh		SH	2011,2012,2014,2016,2017,2018
+./bin/tests/system/redirect/ns2/example.db.in	ZONE	2013,2016,2018
 ./bin/tests/system/redirect/ns2/named.conf.in	CONF-C	2011,2013,2016,2018
-./bin/tests/system/redirect/ns2/redirect.db.in	ZONE	2011.2013,2013,2016
-./bin/tests/system/redirect/ns3/example.db	ZONE	2015,2016
+./bin/tests/system/redirect/ns2/redirect.db.in	ZONE	2011.2013,2013,2016,2018
+./bin/tests/system/redirect/ns3/example.db	ZONE	2015,2016,2018
 ./bin/tests/system/redirect/ns3/named.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/redirect/ns3/redirect.db	ZONE	2015,2016
-./bin/tests/system/redirect/ns3/root.db		ZONE	2015,2016
-./bin/tests/system/redirect/ns3/sign.sh		SH	2015,2016,2017
-./bin/tests/system/redirect/ns4/example.db.in	ZONE	2015,2016
+./bin/tests/system/redirect/ns3/redirect.db	ZONE	2015,2016,2018
+./bin/tests/system/redirect/ns3/root.db		ZONE	2015,2016,2018
+./bin/tests/system/redirect/ns3/sign.sh		SH	2015,2016,2017,2018
+./bin/tests/system/redirect/ns4/example.db.in	ZONE	2015,2016,2018
 ./bin/tests/system/redirect/ns4/named.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/redirect/ns4/root.hint	ZONE	2015,2016
-./bin/tests/system/redirect/prereq.sh		SH	2014,2016
+./bin/tests/system/redirect/ns4/root.hint	ZONE	2015,2016,2018
+./bin/tests/system/redirect/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/redirect/setup.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/redirect/tests.sh		SH	2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/resolver/ans2/ans.pl		PERL	2000,2001,2004,2007,2009,2010,2012,2016,2018
@@ -1960,90 +1960,90 @@
 ./bin/tests/system/resolver/ans8/ans.pl		PERL	2017,2018
 ./bin/tests/system/resolver/clean.sh		SH	2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/resolver/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2009,2013,2014,2015,2016,2017,2018
-./bin/tests/system/resolver/ns1/root.hint	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/resolver/ns4/broken.db	ZONE	2012,2016
-./bin/tests/system/resolver/ns4/child.server.db	ZONE	2011,2016
-./bin/tests/system/resolver/ns4/moves.db	ZONE	2011,2016
+./bin/tests/system/resolver/ns1/root.hint	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/resolver/ns4/broken.db	ZONE	2012,2016,2018
+./bin/tests/system/resolver/ns4/child.server.db	ZONE	2011,2016,2018
+./bin/tests/system/resolver/ns4/moves.db	ZONE	2011,2016,2018
 ./bin/tests/system/resolver/ns4/named.conf.in	CONF-C	2010,2011,2012,2013,2015,2016,2018
-./bin/tests/system/resolver/ns4/named.noaa	TXT.BRIEF	2010,2016
-./bin/tests/system/resolver/ns4/root.db		ZONE	2010,2014,2015,2016,2017
-./bin/tests/system/resolver/ns4/tld1.db		ZONE	2012,2014,2016,2017
-./bin/tests/system/resolver/ns4/tld2.db		ZONE	2012,2014,2016,2017
-./bin/tests/system/resolver/ns5/child.server.db	ZONE	2011,2016
-./bin/tests/system/resolver/ns5/moves.db	ZONE	2011,2016
+./bin/tests/system/resolver/ns4/named.noaa	TXT.BRIEF	2010,2016,2018
+./bin/tests/system/resolver/ns4/root.db		ZONE	2010,2014,2015,2016,2017,2018
+./bin/tests/system/resolver/ns4/tld1.db		ZONE	2012,2014,2016,2017,2018
+./bin/tests/system/resolver/ns4/tld2.db		ZONE	2012,2014,2016,2017,2018
+./bin/tests/system/resolver/ns5/child.server.db	ZONE	2011,2016,2018
+./bin/tests/system/resolver/ns5/moves.db	ZONE	2011,2016,2018
 ./bin/tests/system/resolver/ns5/named.conf.in	CONF-C	2010,2011,2013,2014,2015,2016,2018
-./bin/tests/system/resolver/ns5/root.hint	ZONE	2010,2016
-./bin/tests/system/resolver/ns6/broken.db	ZONE	2012,2016
-./bin/tests/system/resolver/ns6/delegation-only.db	ZONE	2015,2016
-./bin/tests/system/resolver/ns6/ds.example.net.db.in	ZONE	2016
-./bin/tests/system/resolver/ns6/example.net.db.in	ZONE	2010,2014,2016
-./bin/tests/system/resolver/ns6/fetch.tld.db	ZONE	2017
-./bin/tests/system/resolver/ns6/keygen.sh	SH	2010,2012,2014,2016,2017
-./bin/tests/system/resolver/ns6/moves.db	ZONE	2011,2016
+./bin/tests/system/resolver/ns5/root.hint	ZONE	2010,2016,2018
+./bin/tests/system/resolver/ns6/broken.db	ZONE	2012,2016,2018
+./bin/tests/system/resolver/ns6/delegation-only.db	ZONE	2015,2016,2018
+./bin/tests/system/resolver/ns6/ds.example.net.db.in	ZONE	2016,2018
+./bin/tests/system/resolver/ns6/example.net.db.in	ZONE	2010,2014,2016,2018
+./bin/tests/system/resolver/ns6/fetch.tld.db	ZONE	2017,2018
+./bin/tests/system/resolver/ns6/keygen.sh	SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/resolver/ns6/moves.db	ZONE	2011,2016,2018
 ./bin/tests/system/resolver/ns6/named.conf.in	CONF-C	2010,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/resolver/ns6/no-edns-version.tld.db	ZONE	2014,2016
-./bin/tests/system/resolver/ns6/root.db		ZONE	2010,2011,2014,2016
-./bin/tests/system/resolver/ns6/to-be-removed.tld.db.in	ZONE	2012,2016
-./bin/tests/system/resolver/ns7/all-cnames.db	ZONE	2014,2016
-./bin/tests/system/resolver/ns7/edns-version.tld.db	ZONE	2014,2016
-./bin/tests/system/resolver/ns7/named.args	X	2011,2012,2014
+./bin/tests/system/resolver/ns6/no-edns-version.tld.db	ZONE	2014,2016,2018
+./bin/tests/system/resolver/ns6/root.db		ZONE	2010,2011,2014,2016,2018
+./bin/tests/system/resolver/ns6/to-be-removed.tld.db.in	ZONE	2012,2016,2018
+./bin/tests/system/resolver/ns7/all-cnames.db	ZONE	2014,2016,2018
+./bin/tests/system/resolver/ns7/edns-version.tld.db	ZONE	2014,2016,2018
+./bin/tests/system/resolver/ns7/named.args	X	2011,2012,2014,2018
 ./bin/tests/system/resolver/ns7/named1.conf.in	CONF-C	2010,2011,2013,2014,2016,2018
 ./bin/tests/system/resolver/ns7/named2.conf.in	CONF-C	2013,2014,2016,2018
-./bin/tests/system/resolver/ns7/root.hint	ZONE	2010,2016
-./bin/tests/system/resolver/ns7/server.db.in	ZONE	2011,2016
+./bin/tests/system/resolver/ns7/root.hint	ZONE	2010,2016,2018
+./bin/tests/system/resolver/ns7/server.db.in	ZONE	2011,2016,2018
 ./bin/tests/system/resolver/prereq.sh		SH	2000,2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/resolver/setup.sh		SH	2010,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/resolver/tests.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/rndc/.gitignore		X	2014
-./bin/tests/system/rndc/Makefile.in		MAKE	2014,2015,2016,2017
+./bin/tests/system/rndc/.gitignore		X	2014,2018
+./bin/tests/system/rndc/Makefile.in		MAKE	2014,2015,2016,2017,2018
 ./bin/tests/system/rndc/clean.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/rndc/gencheck.c		C	2014,2015,2016
-./bin/tests/system/rndc/ns2/incl.db		ZONE	2013,2016
+./bin/tests/system/rndc/gencheck.c		C	2014,2015,2016,2018
+./bin/tests/system/rndc/ns2/incl.db		ZONE	2013,2016,2018
 ./bin/tests/system/rndc/ns2/named.conf.in	CONF-C	2011,2012,2013,2016,2018
-./bin/tests/system/rndc/ns2/secondkey.conf	CONF-C	2012,2013,2016
+./bin/tests/system/rndc/ns2/secondkey.conf	CONF-C	2012,2013,2016,2018
 ./bin/tests/system/rndc/ns3/named.conf.in	CONF-C	2012,2013,2015,2016,2018
-./bin/tests/system/rndc/ns4/.gitignore		X	2016
+./bin/tests/system/rndc/ns4/.gitignore		X	2016,2018
 ./bin/tests/system/rndc/ns4/named.conf.in	CONF-C	2013,2014,2015,2016,2018
 ./bin/tests/system/rndc/ns5/named.conf.in	CONF-C	2015,2016,2018
-./bin/tests/system/rndc/ns6/named.args		X	2016
+./bin/tests/system/rndc/ns6/named.args		X	2016,2018
 ./bin/tests/system/rndc/ns6/named.conf.in	CONF-C	2016,2018
 ./bin/tests/system/rndc/setup.sh		SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rndc/tests.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/rpz/.gitignore		X	2017
-./bin/tests/system/rpz/Makefile.in		MAKE	2017
-./bin/tests/system/rpz/ckdnsrps.sh		SH	2017
+./bin/tests/system/rpz/.gitignore		X	2017,2018
+./bin/tests/system/rpz/Makefile.in		MAKE	2017,2018
+./bin/tests/system/rpz/ckdnsrps.sh		SH	2017,2018
 ./bin/tests/system/rpz/clean.sh			SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/dnsrps.c			C	2017,2018
-./bin/tests/system/rpz/dnsrpzd-license.conf	X	2017
+./bin/tests/system/rpz/dnsrpzd-license.conf	X	2017,2018
 ./bin/tests/system/rpz/dnsrpzd.conf.in		CONF-C	2017,2018
 ./bin/tests/system/rpz/ns1/named.conf.in	CONF-C	2011,2013,2016,2017,2018
-./bin/tests/system/rpz/ns1/root.db		ZONE	2011,2012,2013,2016
-./bin/tests/system/rpz/ns2/base-tld2s.db	ZONE	2012,2013,2016
-./bin/tests/system/rpz/ns2/bl.tld2.db.in	ZONE	2013,2016
-./bin/tests/system/rpz/ns2/blv2.tld2.db.in	ZONE	2013,2016
-./bin/tests/system/rpz/ns2/blv3.tld2.db.in	ZONE	2013,2016
-./bin/tests/system/rpz/ns2/hints		ZONE	2011,2013,2016
+./bin/tests/system/rpz/ns1/root.db		ZONE	2011,2012,2013,2016,2018
+./bin/tests/system/rpz/ns2/base-tld2s.db	ZONE	2012,2013,2016,2018
+./bin/tests/system/rpz/ns2/bl.tld2.db.in	ZONE	2013,2016,2018
+./bin/tests/system/rpz/ns2/blv2.tld2.db.in	ZONE	2013,2016,2018
+./bin/tests/system/rpz/ns2/blv3.tld2.db.in	ZONE	2013,2016,2018
+./bin/tests/system/rpz/ns2/hints		ZONE	2011,2013,2016,2018
 ./bin/tests/system/rpz/ns2/named.conf.in	CONF-C	2011,2012,2013,2016,2017,2018
-./bin/tests/system/rpz/ns2/tld2.db		ZONE	2011,2012,2013,2016
-./bin/tests/system/rpz/ns3/base.db		ZONE	2011,2012,2013,2016,2017
-./bin/tests/system/rpz/ns3/crash1		X	2011,2013
-./bin/tests/system/rpz/ns3/crash2		X	2011,2012,2013
-./bin/tests/system/rpz/ns3/hints		ZONE	2011,2013,2016
+./bin/tests/system/rpz/ns2/tld2.db		ZONE	2011,2012,2013,2016,2018
+./bin/tests/system/rpz/ns3/base.db		ZONE	2011,2012,2013,2016,2017,2018
+./bin/tests/system/rpz/ns3/crash1		X	2011,2013,2018
+./bin/tests/system/rpz/ns3/crash2		X	2011,2012,2013,2018
+./bin/tests/system/rpz/ns3/hints		ZONE	2011,2013,2016,2018
 ./bin/tests/system/rpz/ns3/named.conf.in	CONF-C	2011,2012,2013,2016,2017,2018
-./bin/tests/system/rpz/ns4/hints		ZONE	2011,2013,2016
+./bin/tests/system/rpz/ns4/hints		ZONE	2011,2013,2016,2018
 ./bin/tests/system/rpz/ns4/named.conf.in	CONF-C	2011,2012,2013,2016,2017,2018
-./bin/tests/system/rpz/ns4/tld4.db		ZONE	2011,2012,2013,2016
-./bin/tests/system/rpz/ns5/empty.db.in		ZONE	2014,2016
-./bin/tests/system/rpz/ns5/hints		ZONE	2011,2012,2013,2016
-./bin/tests/system/rpz/ns5/named.args		X	2013,2014
+./bin/tests/system/rpz/ns4/tld4.db		ZONE	2011,2012,2013,2016,2018
+./bin/tests/system/rpz/ns5/empty.db.in		ZONE	2014,2016,2018
+./bin/tests/system/rpz/ns5/hints		ZONE	2011,2012,2013,2016,2018
+./bin/tests/system/rpz/ns5/named.args		X	2013,2014,2018
 ./bin/tests/system/rpz/ns5/named.conf.in	CONF-C	2012,2013,2014,2016,2017,2018
-./bin/tests/system/rpz/ns5/tld5.db		ZONE	2013,2016,2017
-./bin/tests/system/rpz/ns6/hints		ZONE	2014,2016
+./bin/tests/system/rpz/ns5/tld5.db		ZONE	2013,2016,2017,2018
+./bin/tests/system/rpz/ns6/hints		ZONE	2014,2016,2018
 ./bin/tests/system/rpz/ns6/named.conf.in	CONF-C	2014,2016,2017,2018
-./bin/tests/system/rpz/ns7/hints		ZONE	2014,2016
+./bin/tests/system/rpz/ns7/hints		ZONE	2014,2016,2018
 ./bin/tests/system/rpz/ns7/named.conf.in	CONF-C	2014,2016,2017,2018
-./bin/tests/system/rpz/prereq.sh		SH	2014,2016
-./bin/tests/system/rpz/qperf.sh			SH	2012,2013,2016
+./bin/tests/system/rpz/prereq.sh		SH	2014,2016,2018
+./bin/tests/system/rpz/qperf.sh			SH	2012,2013,2016,2018
 ./bin/tests/system/rpz/setup.sh			SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/test1			ZONE	2011,2012,2013,2016,2018
 ./bin/tests/system/rpz/test2			ZONE	2011,2012,2013,2016,2018
@@ -2054,123 +2054,123 @@
 ./bin/tests/system/rpz/test6			ZONE	2013,2016,2018
 ./bin/tests/system/rpz/tests.sh			SH	2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/.gitignore	X	2015,2018
-./bin/tests/system/rpzrecurse/README		TXT.BRIEF	2015,2016
+./bin/tests/system/rpzrecurse/README		TXT.BRIEF	2015,2016,2018
 ./bin/tests/system/rpzrecurse/ans5/ans.pl	PERL	2016,2018
 ./bin/tests/system/rpzrecurse/clean.sh		SH	2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns1/db.l0		ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns1/db.l1.l0	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns1/example.db	ZONE	2015,2016
+./bin/tests/system/rpzrecurse/ns1/db.l0		ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns1/db.l1.l0	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns1/example.db	ZONE	2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns1/named.conf.in	CONF-C	2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns1/root.db	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns1/test1.example.net.db	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns1/test2.example.net.db	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/.gitignore	X	2015
-./bin/tests/system/rpzrecurse/ns2/db.clientip1	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.clientip2	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.clientip21	ZONE	2016
-./bin/tests/system/rpzrecurse/ns2/db.log1	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.log2	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.log3	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.wildcard1	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.wildcard2a	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.wildcard2b	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/db.wildcard3	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.clientip.conf	CONF-C	2015,2016,2017
-./bin/tests/system/rpzrecurse/ns2/named.clientip2.conf	CONF-C	2016,2017
+./bin/tests/system/rpzrecurse/ns1/root.db	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns1/test1.example.net.db	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns1/test2.example.net.db	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/.gitignore	X	2015,2018
+./bin/tests/system/rpzrecurse/ns2/db.clientip1	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.clientip2	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.clientip21	ZONE	2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.log1	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.log2	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.log3	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.wildcard1	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.wildcard2a	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.wildcard2b	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/db.wildcard3	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/named.clientip.conf	CONF-C	2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/ns2/named.clientip2.conf	CONF-C	2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns2/named.conf.header.in	CONF-C	2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns2/named.default.conf	CONF-C	2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.log.conf	CONF-C	2015,2016,2017
-./bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf	CONF-C	2015,2016,2017
-./bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf	CONF-C	2015,2016,2017
-./bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf	CONF-C	2015,2016,2017
-./bin/tests/system/rpzrecurse/ns2/root.hint	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns3/example.db	ZONE	2016
+./bin/tests/system/rpzrecurse/ns2/named.default.conf	CONF-C	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns2/named.log.conf	CONF-C	2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf	CONF-C	2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf	CONF-C	2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf	CONF-C	2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/ns2/root.hint	ZONE	2015,2016,2018
+./bin/tests/system/rpzrecurse/ns3/example.db	ZONE	2016,2018
 ./bin/tests/system/rpzrecurse/ns3/named1.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns3/named2.conf.in	CONF-C	2016,2017,2018
-./bin/tests/system/rpzrecurse/ns3/policy.db	ZONE	2016
-./bin/tests/system/rpzrecurse/ns3/root.db	ZONE	2016
-./bin/tests/system/rpzrecurse/ns4/child.example.db	ZONE	2016
+./bin/tests/system/rpzrecurse/ns3/policy.db	ZONE	2016,2018
+./bin/tests/system/rpzrecurse/ns3/root.db	ZONE	2016,2018
+./bin/tests/system/rpzrecurse/ns4/child.example.db	ZONE	2016,2018
 ./bin/tests/system/rpzrecurse/ns4/named.conf.in	CONF-C	2016,2017,2018
-./bin/tests/system/rpzrecurse/prereq.sh		SH	2015,2016,2017
+./bin/tests/system/rpzrecurse/prereq.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/setup.sh		SH	2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/testgen.pl	PERL	2015,2016,2017
+./bin/tests/system/rpzrecurse/testgen.pl	PERL	2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/tests.sh		SH	2015,2016,2017,2018
-./bin/tests/system/rrchecker/classlist.good	X	2013
-./bin/tests/system/rrchecker/clean.sh		SH	2013,2014,2016,2017
-./bin/tests/system/rrchecker/privatelist.good	X	2013
+./bin/tests/system/rrchecker/classlist.good	X	2013,2018
+./bin/tests/system/rrchecker/clean.sh		SH	2013,2014,2016,2017,2018
+./bin/tests/system/rrchecker/privatelist.good	X	2013,2018
 ./bin/tests/system/rrchecker/tests.sh		SH	2013,2014,2015,2016,2017,2018
-./bin/tests/system/rrchecker/typelist.good	X	2013,2014,2015,2016,2017
-./bin/tests/system/rrl/.gitignore		X	2013,2014
-./bin/tests/system/rrl/broken.conf		CONF-C	2016,2017
+./bin/tests/system/rrchecker/typelist.good	X	2013,2014,2015,2016,2017,2018
+./bin/tests/system/rrl/.gitignore		X	2013,2014,2018
+./bin/tests/system/rrl/broken.conf		CONF-C	2016,2017,2018
 ./bin/tests/system/rrl/clean.sh			SH	2012,2013,2014,2016,2018
 ./bin/tests/system/rrl/ns1/named.conf.in	CONF-C	2012,2013,2016,2018
-./bin/tests/system/rrl/ns1/root.db		ZONE	2012,2013,2016
-./bin/tests/system/rrl/ns2/hints		ZONE	2012,2013,2016
+./bin/tests/system/rrl/ns1/root.db		ZONE	2012,2013,2016,2018
+./bin/tests/system/rrl/ns2/hints		ZONE	2012,2013,2016,2018
 ./bin/tests/system/rrl/ns2/named.conf.in	CONF-C	2012,2013,2016,2017,2018
-./bin/tests/system/rrl/ns2/tld2.db		ZONE	2012,2013,2016
-./bin/tests/system/rrl/ns3/hints		ZONE	2012,2013,2016
+./bin/tests/system/rrl/ns2/tld2.db		ZONE	2012,2013,2016,2018
+./bin/tests/system/rrl/ns3/hints		ZONE	2012,2013,2016,2018
 ./bin/tests/system/rrl/ns3/named.conf.in	CONF-C	2012,2013,2016,2018
-./bin/tests/system/rrl/ns3/tld3.db		ZONE	2012,2013,2016
-./bin/tests/system/rrl/ns4/hints		ZONE	2016
+./bin/tests/system/rrl/ns3/tld3.db		ZONE	2012,2013,2016,2018
+./bin/tests/system/rrl/ns4/hints		ZONE	2016,2018
 ./bin/tests/system/rrl/ns4/named.conf.in	CONF-C	2016,2017,2018
-./bin/tests/system/rrl/ns4/tld4.db		ZONE	2016
+./bin/tests/system/rrl/ns4/tld4.db		ZONE	2016,2018
 ./bin/tests/system/rrl/setup.sh			SH	2012,2013,2016,2018
 ./bin/tests/system/rrl/tests.sh			SH	2012,2013,2015,2016,2018
 ./bin/tests/system/rrsetorder/clean.sh		SH	2006,2007,2008,2011,2012,2014,2016,2017,2018
-./bin/tests/system/rrsetorder/dig.out.fixed.good	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good1	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good10	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good11	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good12	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good13	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good14	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good15	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good16	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good17	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good18	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good19	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good2	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good20	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good21	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good22	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good23	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good24	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good3	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good4	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good5	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good6	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good7	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good8	X	2006
-./bin/tests/system/rrsetorder/dig.out.random.good9	X	2006
+./bin/tests/system/rrsetorder/dig.out.fixed.good	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good1	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good10	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good11	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good12	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good13	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good14	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good15	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good16	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good17	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good18	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good19	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good2	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good20	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good21	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good22	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good23	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good24	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good3	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good4	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good5	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good6	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good7	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good8	X	2006,2018
+./bin/tests/system/rrsetorder/dig.out.random.good9	X	2006,2018
 ./bin/tests/system/rrsetorder/ns1/named.conf.in	CONF-C	2006,2007,2013,2016,2018
-./bin/tests/system/rrsetorder/ns1/root.db	ZONE	2006,2007,2012,2016,2017
+./bin/tests/system/rrsetorder/ns1/root.db	ZONE	2006,2007,2012,2016,2017,2018
 ./bin/tests/system/rrsetorder/ns2/named.conf.in	CONF-C	2006,2007,2016,2018
 ./bin/tests/system/rrsetorder/ns3/named.conf.in	CONF-C	2006,2007,2016,2017,2018
 ./bin/tests/system/rrsetorder/ns4/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/rrsetorder/setup.sh		SH	2018
 ./bin/tests/system/rrsetorder/tests.sh		SH	2006,2007,2008,2011,2012,2014,2015,2016,2017,2018
-./bin/tests/system/rsabigexponent/.gitignore	X	2013
-./bin/tests/system/rsabigexponent/Makefile.in	MAKE	2012,2014,2015,2016,2017
-./bin/tests/system/rsabigexponent/bigkey.c	C	2012,2014,2015,2016,2017
+./bin/tests/system/rsabigexponent/.gitignore	X	2013,2018
+./bin/tests/system/rsabigexponent/Makefile.in	MAKE	2012,2014,2015,2016,2017,2018
+./bin/tests/system/rsabigexponent/bigkey.c	C	2012,2014,2015,2016,2017,2018
 ./bin/tests/system/rsabigexponent/clean.sh	SH	2012,2014,2016,2018
-./bin/tests/system/rsabigexponent/conf/bad01.conf	CONF-C	2012,2016
-./bin/tests/system/rsabigexponent/conf/bad02.conf	CONF-C	2012,2016
-./bin/tests/system/rsabigexponent/conf/bad03.conf	CONF-C	2012,2016
-./bin/tests/system/rsabigexponent/conf/good01.conf	CONF-C	2012,2016
-./bin/tests/system/rsabigexponent/conf/good02.conf	CONF-C	2012,2016
-./bin/tests/system/rsabigexponent/conf/good03.conf	CONF-C	2012,2016
+./bin/tests/system/rsabigexponent/conf/bad01.conf	CONF-C	2012,2016,2018
+./bin/tests/system/rsabigexponent/conf/bad02.conf	CONF-C	2012,2016,2018
+./bin/tests/system/rsabigexponent/conf/bad03.conf	CONF-C	2012,2016,2018
+./bin/tests/system/rsabigexponent/conf/good01.conf	CONF-C	2012,2016,2018
+./bin/tests/system/rsabigexponent/conf/good02.conf	CONF-C	2012,2016,2018
+./bin/tests/system/rsabigexponent/conf/good03.conf	CONF-C	2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns1/named.conf.in	CONF-C	2012,2016,2018
-./bin/tests/system/rsabigexponent/ns1/root.db.in	ZONE	2012,2016
-./bin/tests/system/rsabigexponent/ns1/sign.sh	SH	2012,2014,2016
-./bin/tests/system/rsabigexponent/ns2/Xexample.+005+05896.key	X	2012
-./bin/tests/system/rsabigexponent/ns2/Xexample.+005+05896.private	X	2012
-./bin/tests/system/rsabigexponent/ns2/Xexample.+005+51829.key	X	2012
-./bin/tests/system/rsabigexponent/ns2/Xexample.+005+51829.private	X	2012
-./bin/tests/system/rsabigexponent/ns2/dsset-example.in	X	2012
-./bin/tests/system/rsabigexponent/ns2/example.db.bad	ZONE	2012,2016
-./bin/tests/system/rsabigexponent/ns2/example.db.in	ZONE	2012,2016
+./bin/tests/system/rsabigexponent/ns1/root.db.in	ZONE	2012,2016,2018
+./bin/tests/system/rsabigexponent/ns1/sign.sh	SH	2012,2014,2016,2018
+./bin/tests/system/rsabigexponent/ns2/Xexample.+005+05896.key	X	2012,2018
+./bin/tests/system/rsabigexponent/ns2/Xexample.+005+05896.private	X	2012,2018
+./bin/tests/system/rsabigexponent/ns2/Xexample.+005+51829.key	X	2012,2018
+./bin/tests/system/rsabigexponent/ns2/Xexample.+005+51829.private	X	2012,2018
+./bin/tests/system/rsabigexponent/ns2/dsset-example.in	X	2012,2018
+./bin/tests/system/rsabigexponent/ns2/example.db.bad	ZONE	2012,2016,2018
+./bin/tests/system/rsabigexponent/ns2/example.db.in	ZONE	2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns2/named.conf.in	CONF-C	2012,2016,2018
-./bin/tests/system/rsabigexponent/ns2/sign.sh	SH	2012,2014,2016
+./bin/tests/system/rsabigexponent/ns2/sign.sh	SH	2012,2014,2016,2018
 ./bin/tests/system/rsabigexponent/ns3/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/rsabigexponent/prereq.sh	SH	2012,2014,2016,2017,2018
 ./bin/tests/system/rsabigexponent/setup.sh	SH	2012,2014,2016,2017,2018
@@ -2178,7 +2178,7 @@
 ./bin/tests/system/run.sh			SH	2000,2001,2004,2007,2010,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/runall.sh			SH	2000,2001,2004,2007,2010,2011,2012,2014,2015,2016,2018
 ./bin/tests/system/runsequential.sh		SH	2018
-./bin/tests/system/runtime/README		TXT.BRIEF	2014,2016
+./bin/tests/system/runtime/README		TXT.BRIEF	2014,2016,2018
 ./bin/tests/system/runtime/clean.sh		SH	2014,2015,2016,2017,2018
 ./bin/tests/system/runtime/ns2/named-alt1.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/runtime/ns2/named-alt2.conf.in	CONF-C	2014,2016,2017,2018
@@ -2189,907 +2189,911 @@
 ./bin/tests/system/runtime/ns2/named1.conf.in	CONF-C	2017,2018
 ./bin/tests/system/runtime/setup.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/runtime/tests.sh		SH	2014,2015,2016,2017,2018
-./bin/tests/system/send.pl			PERL	2001,2004,2007,2011,2012,2016
+./bin/tests/system/send.pl			PERL	2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/serve-stale/.gitignore	X	2018
 ./bin/tests/system/serve-stale/ans2/ans.pl	PERL	2017,2018
 ./bin/tests/system/serve-stale/clean.sh		SH	2017,2018
 ./bin/tests/system/serve-stale/ns1/named1.conf.in	CONF-C	2017,2018
 ./bin/tests/system/serve-stale/ns1/named2.conf.in	CONF-C	2017,2018
-./bin/tests/system/serve-stale/ns1/root.db	ZONE	2017
+./bin/tests/system/serve-stale/ns1/root.db	ZONE	2017,2018
 ./bin/tests/system/serve-stale/ns3/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/serve-stale/prereq.sh	SH	2017
+./bin/tests/system/serve-stale/prereq.sh	SH	2017,2018
 ./bin/tests/system/serve-stale/setup.sh		SH	2017,2018
 ./bin/tests/system/serve-stale/tests.sh		SH	2017,2018
-./bin/tests/system/setup.sh			SH	2000,2001,2004,2007,2012,2014,2016
-./bin/tests/system/sfcache/README		TXT.BRIEF	2014,2016
+./bin/tests/system/setup.sh			SH	2000,2001,2004,2007,2012,2014,2016,2018
+./bin/tests/system/sfcache/README		TXT.BRIEF	2014,2016,2018
 ./bin/tests/system/sfcache/clean.sh		SH	2014,2015,2016,2017,2018
 ./bin/tests/system/sfcache/ns1/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/sfcache/ns1/root.db.in	ZONE	2014,2016
-./bin/tests/system/sfcache/ns1/sign.sh		SH	2014,2016,2017
-./bin/tests/system/sfcache/ns2/example.db.in	ZONE	2014,2016
+./bin/tests/system/sfcache/ns1/root.db.in	ZONE	2014,2016,2018
+./bin/tests/system/sfcache/ns1/sign.sh		SH	2014,2016,2017,2018
+./bin/tests/system/sfcache/ns2/example.db.in	ZONE	2014,2016,2018
 ./bin/tests/system/sfcache/ns2/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/sfcache/ns2/sign.sh		SH	2014,2016
+./bin/tests/system/sfcache/ns2/sign.sh		SH	2014,2016,2018
 ./bin/tests/system/sfcache/ns5/named.conf.in	CONF-C	2014,2016,2017,2018
-./bin/tests/system/sfcache/ns5/trusted.conf.bad	CONF-C	2014,2016
-./bin/tests/system/sfcache/prereq.sh		SH	2014,2016,2017
+./bin/tests/system/sfcache/ns5/trusted.conf.bad	CONF-C	2014,2016,2018
+./bin/tests/system/sfcache/prereq.sh		SH	2014,2016,2017,2018
 ./bin/tests/system/sfcache/setup.sh		SH	2014,2016,2017,2018
 ./bin/tests/system/sfcache/tests.sh		SH	2014,2016,2017,2018
-./bin/tests/system/smartsign/child.db		ZONE	2010,2016
-./bin/tests/system/smartsign/clean.sh		SH	2010,2012,2014,2016
-./bin/tests/system/smartsign/parent.db		ZONE	2010,2016
-./bin/tests/system/smartsign/prereq.sh		SH	2010,2012,2014,2016
-./bin/tests/system/smartsign/setup.sh		SH	2010,2012,2014,2016,2017
+./bin/tests/system/smartsign/child.db		ZONE	2010,2016,2018
+./bin/tests/system/smartsign/clean.sh		SH	2010,2012,2014,2016,2018
+./bin/tests/system/smartsign/parent.db		ZONE	2010,2016,2018
+./bin/tests/system/smartsign/prereq.sh		SH	2010,2012,2014,2016,2018
+./bin/tests/system/smartsign/setup.sh		SH	2010,2012,2014,2016,2017,2018
 ./bin/tests/system/smartsign/tests.sh		SH	2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/sortlist/clean.sh		SH	2000,2001,2004,2007,2009,2012,2014,2015,2016,2018
-./bin/tests/system/sortlist/ns1/example.db	ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/sortlist/ns1/example.db	ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/sortlist/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
-./bin/tests/system/sortlist/ns1/root.db		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/sortlist/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/sortlist/setup.sh		SH	2018
 ./bin/tests/system/sortlist/tests.sh		SH	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/spf/clean.sh			SH	2013,2014,2016,2018
 ./bin/tests/system/spf/ns1/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/spf/ns1/spf.db		ZONE	2013,2016
+./bin/tests/system/spf/ns1/spf.db		ZONE	2013,2016,2018
 ./bin/tests/system/spf/setup.sh			SH	2018
 ./bin/tests/system/spf/tests.sh			SH	2013,2014,2016,2018
 ./bin/tests/system/start.pl			SH	2001,2004,2005,2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/start.sh			SH	2000,2001,2004,2007,2012,2016
+./bin/tests/system/start.sh			SH	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/staticstub/clean.sh		SH	2010,2012,2014,2015,2016,2018
-./bin/tests/system/staticstub/conf/bad01.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad02.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad03.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad04.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad05.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad06.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad07.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad08.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad09.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad10.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/bad11.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/good01.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/good02.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/good03.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/good04.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/conf/good05.conf	CONF-C	2010,2016
-./bin/tests/system/staticstub/knowngood.dig.out.rec	X	2010,2013
+./bin/tests/system/staticstub/conf/bad01.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad02.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad03.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad04.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad05.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad06.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad07.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad08.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad09.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad10.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/bad11.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/good01.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/good02.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/good03.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/good04.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/conf/good05.conf	CONF-C	2010,2016,2018
+./bin/tests/system/staticstub/knowngood.dig.out.rec	X	2010,2013,2018
 ./bin/tests/system/staticstub/ns1/named.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/staticstub/ns1/root.db	ZONE	2010,2016
+./bin/tests/system/staticstub/ns1/root.db	ZONE	2010,2016,2018
 ./bin/tests/system/staticstub/ns2/named.conf.in	CONF-C	2010,2015,2016,2018
-./bin/tests/system/staticstub/ns3/example.db.in	ZONE	2010,2016
-./bin/tests/system/staticstub/ns3/example.org.db	ZONE	2010,2016
+./bin/tests/system/staticstub/ns3/example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/staticstub/ns3/example.org.db	ZONE	2010,2016,2018
 ./bin/tests/system/staticstub/ns3/named.conf.in	CONF-C	2010,2013,2015,2016,2018
-./bin/tests/system/staticstub/ns3/sign.sh	SH	2010,2012,2014,2015,2016
-./bin/tests/system/staticstub/ns3/undelegated.db.in	ZONE	2015,2016
-./bin/tests/system/staticstub/ns4/example.com.db	ZONE	2010,2016
-./bin/tests/system/staticstub/ns4/example.info.db	ZONE	2010,2016
-./bin/tests/system/staticstub/ns4/example.org.db	ZONE	2010,2016
+./bin/tests/system/staticstub/ns3/sign.sh	SH	2010,2012,2014,2015,2016,2018
+./bin/tests/system/staticstub/ns3/undelegated.db.in	ZONE	2015,2016,2018
+./bin/tests/system/staticstub/ns4/example.com.db	ZONE	2010,2016,2018
+./bin/tests/system/staticstub/ns4/example.info.db	ZONE	2010,2016,2018
+./bin/tests/system/staticstub/ns4/example.org.db	ZONE	2010,2016,2018
 ./bin/tests/system/staticstub/ns4/named.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/staticstub/ns4/sign.sh	SH	2010,2012,2014,2016,2017
-./bin/tests/system/staticstub/ns4/sub.example.db.in	ZONE	2010,2016
-./bin/tests/system/staticstub/prereq.sh		SH	2014,2016
+./bin/tests/system/staticstub/ns4/sign.sh	SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/staticstub/ns4/sub.example.db.in	ZONE	2010,2016,2018
+./bin/tests/system/staticstub/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/staticstub/setup.sh		SH	2010,2012,2014,2016,2017,2018
 ./bin/tests/system/staticstub/tests.sh		SH	2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/statistics/ans4/ans.pl	PERL	2012,2016,2018
 ./bin/tests/system/statistics/clean.sh		SH	2012,2014,2015,2016,2018
 ./bin/tests/system/statistics/ns1/named.conf.in	CONF-C	2012,2015,2016,2018
-./bin/tests/system/statistics/ns1/root.db	ZONE	2012,2016
-./bin/tests/system/statistics/ns1/zone.db	ZONE	2015,2016
-./bin/tests/system/statistics/ns2/example.db	ZONE	2012,2016
-./bin/tests/system/statistics/ns2/internal.db	ZONE	2012,2016
+./bin/tests/system/statistics/ns1/root.db	ZONE	2012,2016,2018
+./bin/tests/system/statistics/ns1/zone.db	ZONE	2015,2016,2018
+./bin/tests/system/statistics/ns2/example.db	ZONE	2012,2016,2018
+./bin/tests/system/statistics/ns2/internal.db	ZONE	2012,2016,2018
 ./bin/tests/system/statistics/ns2/named.conf.in	CONF-C	2012,2015,2016,2018
-./bin/tests/system/statistics/ns3/internal.db	ZONE	2012,2016
+./bin/tests/system/statistics/ns3/internal.db	ZONE	2012,2016,2018
 ./bin/tests/system/statistics/ns3/named.conf.in	CONF-C	2012,2013,2015,2016,2018
-./bin/tests/system/statistics/ns3/root.hint	ZONE	2012,2016
+./bin/tests/system/statistics/ns3/root.hint	ZONE	2012,2016,2018
 ./bin/tests/system/statistics/prereq.sh		SH	2012,2014,2016,2018
 ./bin/tests/system/statistics/setup.sh		SH	2018
 ./bin/tests/system/statistics/tests.sh		SH	2012,2015,2016,2017,2018
 ./bin/tests/system/statschannel/clean.sh	SH	2015,2016,2017,2018
-./bin/tests/system/statschannel/fetch.pl	PERL	2015,2016
-./bin/tests/system/statschannel/mem-xml.pl	PERL	2017
-./bin/tests/system/statschannel/ns2/example.db	ZONE	2015,2016
+./bin/tests/system/statschannel/fetch.pl	PERL	2015,2016,2018
+./bin/tests/system/statschannel/mem-xml.pl	PERL	2017,2018
+./bin/tests/system/statschannel/ns2/example.db	ZONE	2015,2016,2018
 ./bin/tests/system/statschannel/ns2/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/statschannel/prereq.sh	SH	2015,2016,2018
-./bin/tests/system/statschannel/server-json.pl	PERL	2015,2016,2017
-./bin/tests/system/statschannel/server-xml.pl	PERL	2015,2016,2017
+./bin/tests/system/statschannel/server-json.pl	PERL	2015,2016,2017,2018
+./bin/tests/system/statschannel/server-xml.pl	PERL	2015,2016,2017,2018
 ./bin/tests/system/statschannel/setup.sh	SH	2018
 ./bin/tests/system/statschannel/tests.sh	SH	2015,2016,2017,2018
-./bin/tests/system/statschannel/traffic-json.pl	PERL	2015,2016,2017
-./bin/tests/system/statschannel/traffic-xml.pl	PERL	2015,2016,2017
-./bin/tests/system/statschannel/traffic.expect.1	X	2015
-./bin/tests/system/statschannel/traffic.expect.2	X	2015
-./bin/tests/system/statschannel/traffic.expect.4	X	2015
-./bin/tests/system/statschannel/traffic.expect.5	X	2015,2016
-./bin/tests/system/statschannel/traffic.expect.6	X	2015,2016
+./bin/tests/system/statschannel/traffic-json.pl	PERL	2015,2016,2017,2018
+./bin/tests/system/statschannel/traffic-xml.pl	PERL	2015,2016,2017,2018
+./bin/tests/system/statschannel/traffic.expect.1	X	2015,2018
+./bin/tests/system/statschannel/traffic.expect.2	X	2015,2018
+./bin/tests/system/statschannel/traffic.expect.4	X	2015,2018
+./bin/tests/system/statschannel/traffic.expect.5	X	2015,2016,2018
+./bin/tests/system/statschannel/traffic.expect.6	X	2015,2016,2018
 ./bin/tests/system/stop.pl			SH	2001,2004,2005,2006,2007,2012,2016,2017,2018
-./bin/tests/system/stop.sh			SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/stress/clean.sh		SH	2000,2001,2004,2007,2012,2014,2016
-./bin/tests/system/stress/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016
-./bin/tests/system/stress/ns3/named.conf	CONF-C	2000,2001,2004,2007,2013,2016,2017
-./bin/tests/system/stress/prereq.sh		SH	2015,2016
-./bin/tests/system/stress/setup.pl		PERL	2000,2001,2004,2007,2012,2016
-./bin/tests/system/stress/setup.sh		SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/stress/tests.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016
-./bin/tests/system/stress/update.pl		PERL	2000,2001,2004,2007,2012,2016
+./bin/tests/system/stop.sh			SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/stress/clean.sh		SH	2000,2001,2004,2007,2012,2014,2016,2018
+./bin/tests/system/stress/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016,2018
+./bin/tests/system/stress/ns2/named.conf	CONF-C	2018
+./bin/tests/system/stress/ns3/named.conf	CONF-C	2000,2001,2004,2007,2013,2016,2017,2018
+./bin/tests/system/stress/ns4/named.conf	CONF-C	2018
+./bin/tests/system/stress/prereq.sh		SH	2015,2016,2018
+./bin/tests/system/stress/setup.pl		PERL	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/stress/setup.sh		SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/stress/tests.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
+./bin/tests/system/stress/update.pl		PERL	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/stub/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
-./bin/tests/system/stub/knowngood.dig.out.norec	X	2000,2001
-./bin/tests/system/stub/knowngood.dig.out.rec	X	2000,2001,2013
+./bin/tests/system/stub/knowngood.dig.out.norec	X	2000,2001,2018
+./bin/tests/system/stub/knowngood.dig.out.rec	X	2000,2001,2013,2018
 ./bin/tests/system/stub/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
-./bin/tests/system/stub/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/stub/ns2/child.example.db	ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/stub/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/stub/ns2/child.example.db	ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/stub/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
-./bin/tests/system/stub/ns3/example.db		ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/stub/ns3/example.db		ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/stub/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/stub/setup.sh		SH	2018
 ./bin/tests/system/stub/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/synthfromdnssec/clean.sh	SH	2017,2018
-./bin/tests/system/synthfromdnssec/ns1/example.db.in	ZONE	2017
+./bin/tests/system/synthfromdnssec/ns1/example.db.in	ZONE	2017,2018
 ./bin/tests/system/synthfromdnssec/ns1/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/synthfromdnssec/ns1/root.db.in	ZONE	2017
-./bin/tests/system/synthfromdnssec/ns1/sign.sh	SH	2017
+./bin/tests/system/synthfromdnssec/ns1/root.db.in	ZONE	2017,2018
+./bin/tests/system/synthfromdnssec/ns1/sign.sh	SH	2017,2018
 ./bin/tests/system/synthfromdnssec/ns2/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/synthfromdnssec/ns2/root.hints	ZONE	2017
+./bin/tests/system/synthfromdnssec/ns2/root.hints	ZONE	2017,2018
 ./bin/tests/system/synthfromdnssec/ns3/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/synthfromdnssec/ns3/redirect.db	ZONE	2017
-./bin/tests/system/synthfromdnssec/ns3/root.hints	ZONE	2017
+./bin/tests/system/synthfromdnssec/ns3/redirect.db	ZONE	2017,2018
+./bin/tests/system/synthfromdnssec/ns3/root.hints	ZONE	2017,2018
 ./bin/tests/system/synthfromdnssec/ns4/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/synthfromdnssec/ns4/root.hints	ZONE	2017
+./bin/tests/system/synthfromdnssec/ns4/root.hints	ZONE	2017,2018
 ./bin/tests/system/synthfromdnssec/ns5/named.conf.in	CONF-C	2017,2018
-./bin/tests/system/synthfromdnssec/ns5/root.hints	ZONE	2017
-./bin/tests/system/synthfromdnssec/prereq.sh	SH	2017
+./bin/tests/system/synthfromdnssec/ns5/root.hints	ZONE	2017,2018
+./bin/tests/system/synthfromdnssec/prereq.sh	SH	2017,2018
 ./bin/tests/system/synthfromdnssec/setup.sh	SH	2017,2018
 ./bin/tests/system/synthfromdnssec/tests.sh	SH	2017,2018
 ./bin/tests/system/tcp/clean.sh			SH	2014,2016,2018
 ./bin/tests/system/tcp/ns1/named.conf.in	CONF-C	2014,2016,2018
-./bin/tests/system/tcp/ns1/root.db		ZONE	2014,2016
-./bin/tests/system/tcp/ns2/example.db		ZONE	2014,2016
+./bin/tests/system/tcp/ns1/root.db		ZONE	2014,2016,2018
+./bin/tests/system/tcp/ns2/example.db		ZONE	2014,2016,2018
 ./bin/tests/system/tcp/ns2/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/tcp/ns3/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/tcp/ns4/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/tcp/setup.sh			SH	2018
 ./bin/tests/system/tcp/tests.sh			SH	2014,2016,2018
-./bin/tests/system/testcrypto.sh		SH	2014,2016,2017
-./bin/tests/system/testsock.pl			PERL	2000,2001,2004,2007,2010,2011,2012,2013,2016
-./bin/tests/system/testsock6.pl			PERL	2010,2012,2014,2016
+./bin/tests/system/testcrypto.sh		SH	2014,2016,2017,2018
+./bin/tests/system/testsock.pl			PERL	2000,2001,2004,2007,2010,2011,2012,2013,2016,2018
+./bin/tests/system/testsock6.pl			PERL	2010,2012,2014,2016,2018
 ./bin/tests/system/testsummary.sh		SH	2018
-./bin/tests/system/tkey/Makefile.in		MAKE	2001,2002,2004,2007,2009,2012,2014,2015,2016,2017
-./bin/tests/system/tkey/clean.sh		SH	2001,2004,2007,2011,2012,2013,2014,2015,2016
-./bin/tests/system/tkey/keycreate.c		C	2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2017
-./bin/tests/system/tkey/keydelete.c		C	2001,2004,2005,2007,2009,2010,2011,2014,2015,2016,2017
-./bin/tests/system/tkey/ns1/example.db		ZONE	2013,2016
-./bin/tests/system/tkey/ns1/named.conf.in	CONF-C	2001,2004,2007,2009,2011,2013,2014,2016,2017
-./bin/tests/system/tkey/ns1/setup.sh		SH	2001,2004,2007,2009,2012,2014,2016
-./bin/tests/system/tkey/prereq.sh		SH	2001,2004,2006,2007,2009,2012,2014,2016
-./bin/tests/system/tkey/setup.sh		SH	2001,2004,2007,2009,2012,2013,2014,2016,2017
-./bin/tests/system/tkey/tests.sh		SH	2001,2004,2007,2009,2011,2012,2013,2014,2016,2017
-./bin/tests/system/tools/clean.sh		SH	2017
+./bin/tests/system/tkey/Makefile.in		MAKE	2001,2002,2004,2007,2009,2012,2014,2015,2016,2017,2018
+./bin/tests/system/tkey/clean.sh		SH	2001,2004,2007,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/tkey/keycreate.c		C	2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2017,2018
+./bin/tests/system/tkey/keydelete.c		C	2001,2004,2005,2007,2009,2010,2011,2014,2015,2016,2017,2018
+./bin/tests/system/tkey/ns1/example.db		ZONE	2013,2016,2018
+./bin/tests/system/tkey/ns1/named.conf.in	CONF-C	2001,2004,2007,2009,2011,2013,2014,2016,2017,2018
+./bin/tests/system/tkey/ns1/setup.sh		SH	2001,2004,2007,2009,2012,2014,2016,2018
+./bin/tests/system/tkey/prereq.sh		SH	2001,2004,2006,2007,2009,2012,2014,2016,2018
+./bin/tests/system/tkey/setup.sh		SH	2001,2004,2007,2009,2012,2013,2014,2016,2017,2018
+./bin/tests/system/tkey/tests.sh		SH	2001,2004,2007,2009,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/tools/clean.sh		SH	2017,2018
 ./bin/tests/system/tools/tests.sh		SH	2017,2018
 ./bin/tests/system/tsig/clean.sh		SH	2005,2006,2007,2012,2014,2016,2018
-./bin/tests/system/tsig/ns1/example.db		ZONE	2005,2006,2007,2009,2012,2016
+./bin/tests/system/tsig/ns1/example.db		ZONE	2005,2006,2007,2009,2012,2016,2018
 ./bin/tests/system/tsig/ns1/named.conf.in	CONF-C	2005,2006,2007,2016,2018
 ./bin/tests/system/tsig/setup.sh		SH	2016,2017,2018
 ./bin/tests/system/tsig/tests.sh		SH	2005,2006,2007,2011,2012,2016,2018
 ./bin/tests/system/tsiggss/authsock.pl		PERL	2011,2012,2016,2018
 ./bin/tests/system/tsiggss/clean.sh		SH	2010,2011,2014,2015,2016,2018
-./bin/tests/system/tsiggss/ns1/administrator.ccache	X	2010
-./bin/tests/system/tsiggss/ns1/dns.keytab	X	2010
-./bin/tests/system/tsiggss/ns1/example.nil.db.in	X	2011
+./bin/tests/system/tsiggss/ns1/administrator.ccache	X	2010,2018
+./bin/tests/system/tsiggss/ns1/dns.keytab	X	2010,2018
+./bin/tests/system/tsiggss/ns1/example.nil.db.in	X	2011,2018
 ./bin/tests/system/tsiggss/ns1/named.conf.in	CONF-C	2010,2011,2013,2016,2018
-./bin/tests/system/tsiggss/ns1/testdenied.ccache	X	2010
+./bin/tests/system/tsiggss/ns1/testdenied.ccache	X	2010,2018
 ./bin/tests/system/tsiggss/prereq.sh		SH	2010,2011,2012,2014,2016,2018
 ./bin/tests/system/tsiggss/setup.sh		SH	2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/tsiggss/tests.sh		SH	2010,2011,2014,2016,2017,2018
 ./bin/tests/system/unknown/clean.sh		SH	2000,2001,2004,2007,2012,2013,2014,2015,2016,2018
-./bin/tests/system/unknown/large.out		X	2012
-./bin/tests/system/unknown/ns1/broken1.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns1/broken2.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns1/broken3.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns1/broken4.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns1/broken5.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns1/class10.hints	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns1/example-class10.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns1/example-in.db	ZONE	2000,2001,2004,2007,2011,2012,2016
-./bin/tests/system/unknown/ns1/large.db		ZONE	2012,2016
+./bin/tests/system/unknown/large.out		X	2012,2018
+./bin/tests/system/unknown/ns1/broken1.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns1/broken2.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns1/broken3.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns1/broken4.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns1/broken5.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns1/class10.hints	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns1/example-class10.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns1/example-in.db	ZONE	2000,2001,2004,2007,2011,2012,2016,2018
+./bin/tests/system/unknown/ns1/large.db		ZONE	2012,2016,2018
 ./bin/tests/system/unknown/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/unknown/ns2/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/unknown/ns3/named.conf.in	CONF-C	2012,2016,2018
-./bin/tests/system/unknown/ns3/sign.sh		SH	2012,2014,2016,2017
-./bin/tests/system/unknown/prereq.sh		SH	2014,2016
+./bin/tests/system/unknown/ns3/sign.sh		SH	2012,2014,2016,2017,2018
+./bin/tests/system/unknown/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/unknown/setup.sh		SH	2012,2014,2016,2017,2018
 ./bin/tests/system/unknown/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2016,2018
-./bin/tests/system/unknown/zones/nan.bad	ZONE	2013,2016
+./bin/tests/system/unknown/zones/nan.bad	ZONE	2013,2016,2018
 ./bin/tests/system/upforwd/ans4/ans.pl		PERL	2011,2012,2016,2018
 ./bin/tests/system/upforwd/clean.sh		SH	2000,2001,2004,2007,2011,2012,2014,2015,2016,2018
-./bin/tests/system/upforwd/knowngood.after1	X	2000,2001
-./bin/tests/system/upforwd/knowngood.after2	X	2000,2001
-./bin/tests/system/upforwd/knowngood.before	X	2000,2001
-./bin/tests/system/upforwd/knowngood.ns2.before	X	2000,2001
-./bin/tests/system/upforwd/ns1/example1.db	ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/upforwd/knowngood.after1	X	2000,2001,2018
+./bin/tests/system/upforwd/knowngood.after2	X	2000,2001,2018
+./bin/tests/system/upforwd/knowngood.before	X	2000,2001,2018
+./bin/tests/system/upforwd/knowngood.ns2.before	X	2000,2001,2018
+./bin/tests/system/upforwd/ns1/example1.db	ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/upforwd/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2014,2016,2017,2018
 ./bin/tests/system/upforwd/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2014,2016,2017,2018
 ./bin/tests/system/upforwd/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2014,2016,2017,2018
-./bin/tests/system/upforwd/ns3/nomaster.db	ZONE	2011,2016
+./bin/tests/system/upforwd/ns3/nomaster.db	ZONE	2011,2016,2018
 ./bin/tests/system/upforwd/prereq.sh		SH	2012,2014,2016,2018
 ./bin/tests/system/upforwd/setup.sh		SH	2000,2001,2004,2007,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/upforwd/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
-./bin/tests/system/verify/.gitignore		X	2012,2016
-./bin/tests/system/verify/clean.sh		SH	2012,2014,2016
-./bin/tests/system/verify/prereq.sh		SH	2014,2016
-./bin/tests/system/verify/setup.sh		SH	2012,2014,2016,2017
+./bin/tests/system/verify/.gitignore		X	2012,2016,2018
+./bin/tests/system/verify/clean.sh		SH	2012,2014,2016,2018
+./bin/tests/system/verify/prereq.sh		SH	2014,2016,2018
+./bin/tests/system/verify/setup.sh		SH	2012,2014,2016,2017,2018
 ./bin/tests/system/verify/tests.sh		SH	2012,2013,2016,2017,2018
 ./bin/tests/system/verify/zones/genzones.sh	SH	2012,2013,2014,2016,2017,2018
-./bin/tests/system/verify/zones/unsigned.db	ZONE	2012,2016
+./bin/tests/system/verify/zones/unsigned.db	ZONE	2012,2016,2018
 ./bin/tests/system/views/clean.sh		SH	2000,2001,2004,2005,2007,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/views/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
-./bin/tests/system/views/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/views/ns2/.gitignore		X	2012
-./bin/tests/system/views/ns2/1.10.in-addr.arpa.db	ZONE	2015,2016
-./bin/tests/system/views/ns2/clone.db		ZONE	2013,2016
-./bin/tests/system/views/ns2/example1.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/views/ns2/example2.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/views/ns2/external/inline.db	ZONE	2014,2016
-./bin/tests/system/views/ns2/internal.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/views/ns2/internal/inline.db	ZONE	2014,2016
+./bin/tests/system/views/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/views/ns2/.gitignore		X	2012,2018
+./bin/tests/system/views/ns2/1.10.in-addr.arpa.db	ZONE	2015,2016,2018
+./bin/tests/system/views/ns2/clone.db		ZONE	2013,2016,2018
+./bin/tests/system/views/ns2/example1.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/views/ns2/example2.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/views/ns2/external/inline.db	ZONE	2014,2016,2018
+./bin/tests/system/views/ns2/internal.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/views/ns2/internal/inline.db	ZONE	2014,2016,2018
 ./bin/tests/system/views/ns2/named1.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
 ./bin/tests/system/views/ns2/named2.conf.in	CONF-C	2000,2001,2004,2007,2013,2014,2015,2016,2018
-./bin/tests/system/views/ns3/.gitignore		X	2012
-./bin/tests/system/views/ns3/child.clone.db	ZONE	2013,2016
-./bin/tests/system/views/ns3/internal.db	ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/views/ns3/.gitignore		X	2012,2018
+./bin/tests/system/views/ns3/child.clone.db	ZONE	2013,2016,2018
+./bin/tests/system/views/ns3/internal.db	ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/views/ns3/named1.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
 ./bin/tests/system/views/ns3/named2.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/views/ns5/child.clone.db	ZONE	2013,2016
+./bin/tests/system/views/ns5/child.clone.db	ZONE	2013,2016,2018
 ./bin/tests/system/views/ns5/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/views/setup.sh		SH	2000,2001,2004,2007,2012,2014,2016,2017,2018
 ./bin/tests/system/views/tests.sh		SH	2000,2001,2004,2007,2012,2013,2014,2016,2018
 ./bin/tests/system/wildcard/clean.sh		SH	2012,2013,2014,2016,2018
-./bin/tests/system/wildcard/ns1/dlv.db.in	ZONE	2013,2016
+./bin/tests/system/wildcard/ns1/dlv.db.in	ZONE	2013,2016,2018
 ./bin/tests/system/wildcard/ns1/named.conf.in	CONF-C	2012,2013,2016,2018
-./bin/tests/system/wildcard/ns1/nsec.db.in	ZONE	2012,2013,2016
-./bin/tests/system/wildcard/ns1/nsec3.db.in	ZONE	2012,2013,2016
-./bin/tests/system/wildcard/ns1/private.nsec.db.in	ZONE	2012,2013,2016
-./bin/tests/system/wildcard/ns1/private.nsec3.db.in	ZONE	2012,2013,2016
-./bin/tests/system/wildcard/ns1/root.db.in	ZONE	2012,2013,2016
+./bin/tests/system/wildcard/ns1/nsec.db.in	ZONE	2012,2013,2016,2018
+./bin/tests/system/wildcard/ns1/nsec3.db.in	ZONE	2012,2013,2016,2018
+./bin/tests/system/wildcard/ns1/private.nsec.db.in	ZONE	2012,2013,2016,2018
+./bin/tests/system/wildcard/ns1/private.nsec3.db.in	ZONE	2012,2013,2016,2018
+./bin/tests/system/wildcard/ns1/root.db.in	ZONE	2012,2013,2016,2018
 ./bin/tests/system/wildcard/ns1/sign.sh		SH	2012,2013,2014,2016,2018
-./bin/tests/system/wildcard/ns2/hints		ZONE	2012,2016
+./bin/tests/system/wildcard/ns2/hints		ZONE	2012,2016,2018
 ./bin/tests/system/wildcard/ns2/named.conf.in	CONF-C	2012,2016,2018
-./bin/tests/system/wildcard/ns3/hints		ZONE	2012,2016
+./bin/tests/system/wildcard/ns3/hints		ZONE	2012,2016,2018
 ./bin/tests/system/wildcard/ns3/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/wildcard/ns4/named.conf.in	CONF-C	2012,2016,2018
-./bin/tests/system/wildcard/ns5/hints		ZONE	2013,2016
+./bin/tests/system/wildcard/ns5/hints		ZONE	2013,2016,2018
 ./bin/tests/system/wildcard/ns5/named.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/wildcard/prereq.sh		SH	2014,2016
+./bin/tests/system/wildcard/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/wildcard/setup.sh		SH	2012,2014,2016,2017,2018
 ./bin/tests/system/wildcard/tests.sh		SH	2012,2013,2016,2018
-./bin/tests/system/win32/bigkey.vcxproj.filters.in	X	2016
-./bin/tests/system/win32/bigkey.vcxproj.in	X	2016,2017
-./bin/tests/system/win32/bigkey.vcxproj.user	X	2016
-./bin/tests/system/win32/feature-test.vcxproj.filters.in	X	2016
-./bin/tests/system/win32/feature-test.vcxproj.in	X	2016,2017
-./bin/tests/system/win32/feature-test.vcxproj.user	X	2016
-./bin/tests/system/win32/gencheck.vcxproj.filters.in	X	2016
-./bin/tests/system/win32/gencheck.vcxproj.in	X	2016,2017
-./bin/tests/system/win32/gencheck.vcxproj.user	X	2016
-./bin/tests/system/win32/keycreate.vcxproj.filters.in	X	2016
-./bin/tests/system/win32/keycreate.vcxproj.in	X	2016,2017
-./bin/tests/system/win32/keycreate.vcxproj.user	X	2016
-./bin/tests/system/win32/keydelete.vcxproj.filters.in	X	2016
-./bin/tests/system/win32/keydelete.vcxproj.in	X	2016,2017
-./bin/tests/system/win32/keydelete.vcxproj.user	X	2016
-./bin/tests/system/win32/pipequeries.vcxproj.filters.in	X	2016
-./bin/tests/system/win32/pipequeries.vcxproj.in	X	2016,2017
-./bin/tests/system/win32/pipequeries.vcxproj.user	X	2016
-./bin/tests/system/xfer/ans5/badkeydata		X	2011
-./bin/tests/system/xfer/ans5/goodaxfr		X	2011
-./bin/tests/system/xfer/ans5/partial		X	2011
-./bin/tests/system/xfer/ans5/unknownkey		X	2011
-./bin/tests/system/xfer/ans5/unsigned		X	2011
-./bin/tests/system/xfer/ans5/wrongkey		X	2011
+./bin/tests/system/win32/bigkey.vcxproj.filters.in	X	2016,2018
+./bin/tests/system/win32/bigkey.vcxproj.in	X	2016,2017,2018
+./bin/tests/system/win32/bigkey.vcxproj.user	X	2016,2018
+./bin/tests/system/win32/feature-test.vcxproj.filters.in	X	2016,2018
+./bin/tests/system/win32/feature-test.vcxproj.in	X	2016,2017,2018
+./bin/tests/system/win32/feature-test.vcxproj.user	X	2016,2018
+./bin/tests/system/win32/gencheck.vcxproj.filters.in	X	2016,2018
+./bin/tests/system/win32/gencheck.vcxproj.in	X	2016,2017,2018
+./bin/tests/system/win32/gencheck.vcxproj.user	X	2016,2018
+./bin/tests/system/win32/keycreate.vcxproj.filters.in	X	2016,2018
+./bin/tests/system/win32/keycreate.vcxproj.in	X	2016,2017,2018
+./bin/tests/system/win32/keycreate.vcxproj.user	X	2016,2018
+./bin/tests/system/win32/keydelete.vcxproj.filters.in	X	2016,2018
+./bin/tests/system/win32/keydelete.vcxproj.in	X	2016,2017,2018
+./bin/tests/system/win32/keydelete.vcxproj.user	X	2016,2018
+./bin/tests/system/win32/pipequeries.vcxproj.filters.in	X	2016,2018
+./bin/tests/system/win32/pipequeries.vcxproj.in	X	2016,2017,2018
+./bin/tests/system/win32/pipequeries.vcxproj.user	X	2016,2018
+./bin/tests/system/xfer/ans5/badkeydata		X	2011,2018
+./bin/tests/system/xfer/ans5/goodaxfr		X	2011,2018
+./bin/tests/system/xfer/ans5/partial		X	2011,2018
+./bin/tests/system/xfer/ans5/unknownkey		X	2011,2018
+./bin/tests/system/xfer/ans5/unsigned		X	2011,2018
+./bin/tests/system/xfer/ans5/wrongkey		X	2011,2018
 ./bin/tests/system/xfer/clean.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2015,2016,2018
-./bin/tests/system/xfer/dig1.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/xfer/dig2.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/xfer/knowngood.mapped	X	2016
-./bin/tests/system/xfer/ns1/axfr-too-big.db	ZONE	2016
-./bin/tests/system/xfer/ns1/ixfr-too-big.db.in	ZONE	2016
+./bin/tests/system/xfer/dig1.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/xfer/dig2.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/xfer/knowngood.mapped	X	2016,2018
+./bin/tests/system/xfer/ns1/axfr-too-big.db	ZONE	2016,2018
+./bin/tests/system/xfer/ns1/ixfr-too-big.db.in	ZONE	2016,2018
 ./bin/tests/system/xfer/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2014,2016,2018
-./bin/tests/system/xfer/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/xfer/ns2/mapped.db.in	ZONE	2016
+./bin/tests/system/xfer/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/xfer/ns2/mapped.db.in	ZONE	2016,2018
 ./bin/tests/system/xfer/ns2/named.conf.in	CONF-C	2000,2001,2004,2005,2007,2013,2016,2018
-./bin/tests/system/xfer/ns2/slave.db.in		ZONE	2013,2016
+./bin/tests/system/xfer/ns2/slave.db.in		ZONE	2013,2016,2018
 ./bin/tests/system/xfer/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2013,2016,2017,2018
 ./bin/tests/system/xfer/ns4/named.conf.base	CONF-C	2011,2013,2016,2018
-./bin/tests/system/xfer/ns4/root.db.in		ZONE	2011,2016
+./bin/tests/system/xfer/ns4/root.db.in		ZONE	2011,2016,2018
 ./bin/tests/system/xfer/ns6/named.conf.in	CONF-C	2011,2014,2016,2018
 ./bin/tests/system/xfer/ns7/named.conf.in	CONF-C	2011,2014,2016,2018
-./bin/tests/system/xfer/ns8/.gitignore		X	2015
-./bin/tests/system/xfer/ns8/example.db		ZONE	2015,2016
+./bin/tests/system/xfer/ns8/.gitignore		X	2015,2018
+./bin/tests/system/xfer/ns8/example.db		ZONE	2015,2016,2018
 ./bin/tests/system/xfer/ns8/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/xfer/prereq.sh		SH	2011,2012,2014,2016,2018
 ./bin/tests/system/xfer/setup.sh		SH	2001,2002,2004,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/xfer/tests.sh		SH	2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/xferquota/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
-./bin/tests/system/xferquota/ns1/changing1.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/xferquota/ns1/changing2.db	ZONE	2000,2001,2004,2007,2016
+./bin/tests/system/xferquota/ns1/changing1.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/xferquota/ns1/changing2.db	ZONE	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xferquota/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
-./bin/tests/system/xferquota/ns1/root.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/xferquota/ns2/example.db	ZONE	2000,2001,2002,2003,2004,2007,2009,2016
+./bin/tests/system/xferquota/ns1/root.db	ZONE	2000,2001,2004,2007,2016,2018
+./bin/tests/system/xferquota/ns2/example.db	ZONE	2000,2001,2002,2003,2004,2007,2009,2016,2018
 ./bin/tests/system/xferquota/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
-./bin/tests/system/xferquota/setup.pl		PERL	2000,2001,2004,2007,2011,2012,2016
+./bin/tests/system/xferquota/setup.pl		PERL	2000,2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/xferquota/setup.sh		SH	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/xferquota/tests.sh		SH	2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/zero/ans5/ans.pl		PERL	2016,2018
 ./bin/tests/system/zero/clean.sh		SH	2013,2014,2015,2016,2018
 ./bin/tests/system/zero/ns1/named.conf.in	CONF-C	2013,2016,2017,2018
-./bin/tests/system/zero/ns1/root.db		ZONE	2013,2016
+./bin/tests/system/zero/ns1/root.db		ZONE	2013,2016,2018
 ./bin/tests/system/zero/ns2/named.conf.in	CONF-C	2013,2016,2017,2018
-./bin/tests/system/zero/ns2/tld.db		ZONE	2016
+./bin/tests/system/zero/ns2/tld.db		ZONE	2016,2018
 ./bin/tests/system/zero/ns3/named.conf.in	CONF-C	2013,2016,2017,2018
-./bin/tests/system/zero/ns3/root.hint		ZONE	2013,2016
+./bin/tests/system/zero/ns3/root.hint		ZONE	2013,2016,2018
 ./bin/tests/system/zero/ns4/named.conf.in	CONF-C	2013,2016,2017,2018
-./bin/tests/system/zero/ns4/one.tld.db		ZONE	2016
+./bin/tests/system/zero/ns4/one.tld.db		ZONE	2016,2018
 ./bin/tests/system/zero/setup.sh		SH	2013,2014,2016,2018
 ./bin/tests/system/zero/tests.sh		SH	2013,2016,2017,2018
-./bin/tests/system/zonechecks/a.db		ZONE	2004,2007,2016
-./bin/tests/system/zonechecks/aaaa.db		ZONE	2004,2007,2016
-./bin/tests/system/zonechecks/bigserial.db	ZONE	2015,2016
+./bin/tests/system/zonechecks/a.db		ZONE	2004,2007,2016,2018
+./bin/tests/system/zonechecks/aaaa.db		ZONE	2004,2007,2016,2018
+./bin/tests/system/zonechecks/bigserial.db	ZONE	2015,2016,2018
 ./bin/tests/system/zonechecks/clean.sh		SH	2004,2007,2012,2014,2015,2016,2018
-./bin/tests/system/zonechecks/cname.db		ZONE	2004,2007,2016
-./bin/tests/system/zonechecks/dname.db		ZONE	2004,2007,2016
-./bin/tests/system/zonechecks/noaddress.db	ZONE	2004,2007,2016
+./bin/tests/system/zonechecks/cname.db		ZONE	2004,2007,2016,2018
+./bin/tests/system/zonechecks/dname.db		ZONE	2004,2007,2016,2018
+./bin/tests/system/zonechecks/noaddress.db	ZONE	2004,2007,2016,2018
 ./bin/tests/system/zonechecks/ns1/named.conf.in	CONF-C	2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/zonechecks/ns2/named.conf.in	CONF-C	2012,2013,2016,2017,2018
-./bin/tests/system/zonechecks/nxdomain.db	ZONE	2004,2007,2016
-./bin/tests/system/zonechecks/prereq.sh		SH	2014,2016
+./bin/tests/system/zonechecks/nxdomain.db	ZONE	2004,2007,2016,2018
+./bin/tests/system/zonechecks/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/zonechecks/setup.sh		SH	2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/zonechecks/tests.sh		SH	2004,2007,2009,2012,2013,2014,2015,2016,2018
-./bin/tests/t_api.pl				PERL	1999,2000,2001,2004,2007,2012,2016
+./bin/tests/t_api.pl				PERL	1999,2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/task_test.c				C	1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
-./bin/tests/tasks/Makefile.in			MAKE	1998,1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
+./bin/tests/tasks/Makefile.in			MAKE	1998,1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
 ./bin/tests/tasks/t_tasks.c			C	1998,1999,2000,2001,2004,2005,2007,2009,2011,2013,2014,2015,2016,2018
-./bin/tests/tasks/win32/t_tasks.vcxproj.filters.in	X	2013,2015
-./bin/tests/tasks/win32/t_tasks.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/tasks/win32/t_tasks.vcxproj.user	X	2013,2015
+./bin/tests/tasks/win32/t_tasks.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/tasks/win32/t_tasks.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/tasks/win32/t_tasks.vcxproj.user	X	2013,2015,2018
 ./bin/tests/timer_test.c			C	1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
-./bin/tests/timers/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
-./bin/tests/timers/t_timers.c			C	1999,2000,2001,2004,2007,2008,2009,2011,2013,2016
-./bin/tests/timers/win32/t_timers.vcxproj.filters.in	X	2013,2015
-./bin/tests/timers/win32/t_timers.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/timers/win32/t_timers.vcxproj.user	X	2013
-./bin/tests/virtual-time/Makefile.in		MAKE	2010,2012,2016
-./bin/tests/virtual-time/README			TXT.BRIEF	2010,2016
-./bin/tests/virtual-time/autosign-ksk/clean.sh	SH	2010,2012,2015,2016
-./bin/tests/virtual-time/autosign-ksk/ns1/example.db.in	ZONE	2010,2016
-./bin/tests/virtual-time/autosign-ksk/ns1/named.conf	CONF-C	2010,2016
-./bin/tests/virtual-time/autosign-ksk/ns1/root.db	ZONE	2010,2016
-./bin/tests/virtual-time/autosign-ksk/ns1/sign.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/autosign-ksk/setup.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/autosign-ksk/tests.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/autosign-zsk/clean.sh	SH	2010,2012,2015,2016
-./bin/tests/virtual-time/autosign-zsk/ns1/example.db.in	ZONE	2010,2016
-./bin/tests/virtual-time/autosign-zsk/ns1/named.conf	CONF-C	2010,2016
-./bin/tests/virtual-time/autosign-zsk/ns1/root.db	ZONE	2010,2016
-./bin/tests/virtual-time/autosign-zsk/ns1/sign.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/autosign-zsk/setup.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/autosign-zsk/tests.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/cleanall.sh		SH	2010,2012,2016,2017
-./bin/tests/virtual-time/common/controls.conf	CONF-C	2010,2016
-./bin/tests/virtual-time/common/rndc.conf	CONF-C	2010,2016
-./bin/tests/virtual-time/common/root.hint	ZONE	2010,2016
-./bin/tests/virtual-time/conf.sh.in		SH	2010,2012,2016,2017
-./bin/tests/virtual-time/run.sh			SH	2010,2012,2016
-./bin/tests/virtual-time/runall.sh		SH	2010,2012,2016
-./bin/tests/virtual-time/setup.sh		SH	2010,2012,2016
-./bin/tests/virtual-time/slave/clean.sh		SH	2010,2012,2015,2016
-./bin/tests/virtual-time/slave/ns1/example.db.in	ZONE	2010,2016
-./bin/tests/virtual-time/slave/ns1/named.conf	CONF-C	2010,2016
-./bin/tests/virtual-time/slave/ns1/root.db	ZONE	2010,2016
-./bin/tests/virtual-time/slave/ns1/wrap.sh	SH	2010,2012,2016
-./bin/tests/virtual-time/slave/setup.sh		SH	2010,2012,2016
-./bin/tests/virtual-time/slave/tests.sh		SH	2010,2012,2016
-./bin/tests/virtual-time/start.pl		PERL	2010,2012,2015,2016
-./bin/tests/virtual-time/start.sh		SH	2010,2012,2016
-./bin/tests/virtual-time/stop.pl		PERL	2010,2012,2016
-./bin/tests/virtual-time/stop.sh		SH	2010,2012,2016
-./bin/tests/virtual-time/testsock.pl		PERL	2010,2012,2016
-./bin/tests/virtual-time/vtwrapper.c		C	2010,2016
-./bin/tests/win32/backtrace_test.vcxproj.filters.in	X	2013,2015
-./bin/tests/win32/backtrace_test.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/win32/backtrace_test.vcxproj.user	X	2013
-./bin/tests/win32/inter_test.vcxproj.filters.in	X	2013,2015
-./bin/tests/win32/inter_test.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/win32/inter_test.vcxproj.user	X	2013
-./bin/tests/win32/makejournal.vcxproj.filters.in	X	2016
-./bin/tests/win32/makejournal.vcxproj.in	X	2016,2017
-./bin/tests/win32/makejournal.vcxproj.user	X	2016
-./bin/tests/win32/rwlock_test.vcxproj.filters.in	X	2013,2015
-./bin/tests/win32/rwlock_test.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/win32/rwlock_test.vcxproj.user	X	2013
-./bin/tests/win32/shutdown_test.vcxproj.filters.in	X	2013,2015
-./bin/tests/win32/shutdown_test.vcxproj.in	X	2013,2015,2016,2017
-./bin/tests/win32/shutdown_test.vcxproj.user	X	2013
-./bin/tests/win32/sock_test.vcxproj.filters.in	X	2013,2015
-./bin/tests/win32/sock_test.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/win32/sock_test.vcxproj.user	X	2013
-./bin/tests/win32/task_test.vcxproj.filters.in	X	2013,2015
-./bin/tests/win32/task_test.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/win32/task_test.vcxproj.user	X	2013
-./bin/tests/win32/timer_test.vcxproj.filters.in	X	2013,2015
-./bin/tests/win32/timer_test.vcxproj.in		X	2013,2015,2016,2017
-./bin/tests/win32/timer_test.vcxproj.user	X	2013
-./bin/tests/wire_test.c				C	1999,2000,2001,2004,2005,2007,2015,2016
-./bin/tests/wire_test.data			X	1999,2000,2001
-./bin/tests/wire_test.data2			X	1999,2000,2001
-./bin/tests/wire_test.data3			X	1999,2000,2001
-./bin/tests/wire_test.data4			X	1999,2000,2001
-./bin/tests/zone_test.c				C	1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2015,2016
-./bin/tools/.gitignore				X	2012,2014,2015,2016,2017
-./bin/tools/Makefile.in				MAKE	2009,2010,2012,2013,2014,2015,2016,2017
+./bin/tests/timers/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
+./bin/tests/timers/t_timers.c			C	1999,2000,2001,2004,2007,2008,2009,2011,2013,2016,2018
+./bin/tests/timers/win32/t_timers.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/timers/win32/t_timers.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/timers/win32/t_timers.vcxproj.user	X	2013,2018
+./bin/tests/virtual-time/Makefile.in		MAKE	2010,2012,2016,2018
+./bin/tests/virtual-time/README			TXT.BRIEF	2010,2016,2018
+./bin/tests/virtual-time/autosign-ksk/clean.sh	SH	2010,2012,2015,2016,2018
+./bin/tests/virtual-time/autosign-ksk/ns1/example.db.in	ZONE	2010,2016,2018
+./bin/tests/virtual-time/autosign-ksk/ns1/named.conf	CONF-C	2010,2016,2018
+./bin/tests/virtual-time/autosign-ksk/ns1/root.db	ZONE	2010,2016,2018
+./bin/tests/virtual-time/autosign-ksk/ns1/sign.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/autosign-ksk/setup.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/autosign-ksk/tests.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/autosign-zsk/clean.sh	SH	2010,2012,2015,2016,2018
+./bin/tests/virtual-time/autosign-zsk/ns1/example.db.in	ZONE	2010,2016,2018
+./bin/tests/virtual-time/autosign-zsk/ns1/named.conf	CONF-C	2010,2016,2018
+./bin/tests/virtual-time/autosign-zsk/ns1/root.db	ZONE	2010,2016,2018
+./bin/tests/virtual-time/autosign-zsk/ns1/sign.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/autosign-zsk/setup.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/autosign-zsk/tests.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/cleanall.sh		SH	2010,2012,2016,2017,2018
+./bin/tests/virtual-time/common/controls.conf	CONF-C	2010,2016,2018
+./bin/tests/virtual-time/common/rndc.conf	CONF-C	2010,2016,2018
+./bin/tests/virtual-time/common/root.hint	ZONE	2010,2016,2018
+./bin/tests/virtual-time/conf.sh.in		SH	2010,2012,2016,2017,2018
+./bin/tests/virtual-time/run.sh			SH	2010,2012,2016,2018
+./bin/tests/virtual-time/runall.sh		SH	2010,2012,2016,2018
+./bin/tests/virtual-time/setup.sh		SH	2010,2012,2016,2018
+./bin/tests/virtual-time/slave/clean.sh		SH	2010,2012,2015,2016,2018
+./bin/tests/virtual-time/slave/ns1/example.db.in	ZONE	2010,2016,2018
+./bin/tests/virtual-time/slave/ns1/named.conf	CONF-C	2010,2016,2018
+./bin/tests/virtual-time/slave/ns1/root.db	ZONE	2010,2016,2018
+./bin/tests/virtual-time/slave/ns1/wrap.sh	SH	2010,2012,2016,2018
+./bin/tests/virtual-time/slave/setup.sh		SH	2010,2012,2016,2018
+./bin/tests/virtual-time/slave/tests.sh		SH	2010,2012,2016,2018
+./bin/tests/virtual-time/start.pl		PERL	2010,2012,2015,2016,2018
+./bin/tests/virtual-time/start.sh		SH	2010,2012,2016,2018
+./bin/tests/virtual-time/stop.pl		PERL	2010,2012,2016,2018
+./bin/tests/virtual-time/stop.sh		SH	2010,2012,2016,2018
+./bin/tests/virtual-time/testsock.pl		PERL	2010,2012,2016,2018
+./bin/tests/virtual-time/vtwrapper.c		C	2010,2016,2018
+./bin/tests/win32/backtrace_test.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/win32/backtrace_test.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/win32/backtrace_test.vcxproj.user	X	2013,2018
+./bin/tests/win32/inter_test.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/win32/inter_test.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/win32/inter_test.vcxproj.user	X	2013,2018
+./bin/tests/win32/makejournal.vcxproj.filters.in	X	2016,2018
+./bin/tests/win32/makejournal.vcxproj.in	X	2016,2017,2018
+./bin/tests/win32/makejournal.vcxproj.user	X	2016,2018
+./bin/tests/win32/rwlock_test.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/win32/rwlock_test.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/win32/rwlock_test.vcxproj.user	X	2013,2018
+./bin/tests/win32/shutdown_test.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/win32/shutdown_test.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tests/win32/shutdown_test.vcxproj.user	X	2013,2018
+./bin/tests/win32/sock_test.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/win32/sock_test.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/win32/sock_test.vcxproj.user	X	2013,2018
+./bin/tests/win32/task_test.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/win32/task_test.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/win32/task_test.vcxproj.user	X	2013,2018
+./bin/tests/win32/timer_test.vcxproj.filters.in	X	2013,2015,2018
+./bin/tests/win32/timer_test.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tests/win32/timer_test.vcxproj.user	X	2013,2018
+./bin/tests/wire_test.c				C	1999,2000,2001,2004,2005,2007,2015,2016,2018
+./bin/tests/wire_test.data			X	1999,2000,2001,2018
+./bin/tests/wire_test.data2			X	1999,2000,2001,2018
+./bin/tests/wire_test.data3			X	1999,2000,2001,2018
+./bin/tests/wire_test.data4			X	1999,2000,2001,2018
+./bin/tests/zone_test.c				C	1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2015,2016,2018
+./bin/tools/.gitignore				X	2012,2014,2015,2016,2017,2018
+./bin/tools/Makefile.in				MAKE	2009,2010,2012,2013,2014,2015,2016,2017,2018
 ./bin/tools/arpaname.1				MAN	DOCBOOK
-./bin/tools/arpaname.c				C	2009,2015,2016
-./bin/tools/arpaname.docbook			SGML	2009,2014,2015,2016
+./bin/tools/arpaname.c				C	2009,2015,2016,2018
+./bin/tools/arpaname.docbook			SGML	2009,2014,2015,2016,2018
 ./bin/tools/arpaname.html			HTML	DOCBOOK
 ./bin/tools/dnstap-read.1			MAN	DOCBOOK
 ./bin/tools/dnstap-read.c			C	2015,2016,2017,2018
-./bin/tools/dnstap-read.docbook			SGML	2015,2016,2017
+./bin/tools/dnstap-read.docbook			SGML	2015,2016,2017,2018
 ./bin/tools/dnstap-read.html			HTML	DOCBOOK
 ./bin/tools/genrandom.8				MAN	DOCBOOK
-./bin/tools/genrandom.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2010,2012,2014,2016
-./bin/tools/genrandom.docbook			SGML	2009,2010,2011,2014,2015,2016
+./bin/tools/genrandom.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2010,2012,2014,2016,2018
+./bin/tools/genrandom.docbook			SGML	2009,2010,2011,2014,2015,2016,2018
 ./bin/tools/genrandom.html			HTML	DOCBOOK
 ./bin/tools/mdig.1				MAN	DOCBOOK
 ./bin/tools/mdig.c				C	2015,2016,2017,2018
-./bin/tools/mdig.docbook			SGML	2015,2016,2017
+./bin/tools/mdig.docbook			SGML	2015,2016,2017,2018
 ./bin/tools/mdig.html				HTML	DOCBOOK
 ./bin/tools/named-journalprint.8		MAN	DOCBOOK
-./bin/tools/named-journalprint.c		C	2000,2001,2004,2005,2006,2007,2008,2009,2015,2016
-./bin/tools/named-journalprint.docbook		SGML	2009,2014,2015,2016,2017
+./bin/tools/named-journalprint.c		C	2000,2001,2004,2005,2006,2007,2008,2009,2015,2016,2018
+./bin/tools/named-journalprint.docbook		SGML	2009,2014,2015,2016,2017,2018
 ./bin/tools/named-journalprint.html		HTML	DOCBOOK
 ./bin/tools/named-nzd2nzf.8			MAN	DOCBOOK
-./bin/tools/named-nzd2nzf.c			C	2016,2017
-./bin/tools/named-nzd2nzf.docbook		SGML	2016
+./bin/tools/named-nzd2nzf.c			C	2016,2017,2018
+./bin/tools/named-nzd2nzf.docbook		SGML	2016,2018
 ./bin/tools/named-nzd2nzf.html			HTML	DOCBOOK
 ./bin/tools/named-rrchecker.1			MAN	DOCBOOK
-./bin/tools/named-rrchecker.c			C	2013,2015,2016,2017
-./bin/tools/named-rrchecker.docbook		SGML	2013,2014,2015,2016
+./bin/tools/named-rrchecker.c			C	2013,2015,2016,2017,2018
+./bin/tools/named-rrchecker.docbook		SGML	2013,2014,2015,2016,2018
 ./bin/tools/named-rrchecker.html		HTML	DOCBOOK
 ./bin/tools/nsec3hash.8				MAN	DOCBOOK
-./bin/tools/nsec3hash.c				C	2006,2008,2009,2011,2014,2016,2017
-./bin/tools/nsec3hash.docbook			SGML	2009,2014,2015,2016,2017
+./bin/tools/nsec3hash.c				C	2006,2008,2009,2011,2014,2016,2017,2018
+./bin/tools/nsec3hash.docbook			SGML	2009,2014,2015,2016,2017,2018
 ./bin/tools/nsec3hash.html			HTML	DOCBOOK
-./bin/tools/win32/arpaname.vcxproj.filters.in	X	2013,2015
-./bin/tools/win32/arpaname.vcxproj.in		X	2013,2015,2016,2017
-./bin/tools/win32/arpaname.vcxproj.user		X	2013
-./bin/tools/win32/genrandom.vcxproj.filters.in	X	2013,2015
-./bin/tools/win32/genrandom.vcxproj.in		X	2013,2015,2016,2017
-./bin/tools/win32/genrandom.vcxproj.user	X	2013
-./bin/tools/win32/journalprint.vcxproj.filters.in	X	2013,2015
-./bin/tools/win32/journalprint.vcxproj.in	X	2013,2015,2016,2017
-./bin/tools/win32/journalprint.vcxproj.user	X	2013
-./bin/tools/win32/mdig.vcxproj.filters.in	X	2015
-./bin/tools/win32/mdig.vcxproj.in		X	2015,2016,2017
-./bin/tools/win32/mdig.vcxproj.user		X	2015
-./bin/tools/win32/nsec3hash.vcxproj.filters.in	X	2013,2015
-./bin/tools/win32/nsec3hash.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/tools/win32/nsec3hash.vcxproj.user	X	2013
-./bin/tools/win32/rrchecker.vcxproj.filters.in	X	2013,2015
-./bin/tools/win32/rrchecker.vcxproj.in		X	2013,2014,2015,2016,2017
-./bin/tools/win32/rrchecker.vcxproj.user	X	2013
-./bin/win32/BINDInstall/AccountInfo.cpp		C.PORTION	2001,2002,2004,2007,2009,2013,2016,2017
-./bin/win32/BINDInstall/AccountInfo.h		C	2001,2004,2007,2016
-./bin/win32/BINDInstall/BINDInstall.cpp		C.PORTION	2001,2004,2007,2009,2016
-./bin/win32/BINDInstall/BINDInstall.h		C.PORTION	2001,2004,2007,2016
-./bin/win32/BINDInstall/BINDInstall.rc		X	2001,2005,2009,2014
-./bin/win32/BINDInstall/BINDInstall.vcxproj.filters.in	X	2013,2015
-./bin/win32/BINDInstall/BINDInstall.vcxproj.in	X	2013,2014,2015,2016
-./bin/win32/BINDInstall/BINDInstall.vcxproj.user	X	2013
-./bin/win32/BINDInstall/BINDInstallDlg.cpp	C.PORTION	2001,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016,2017
-./bin/win32/BINDInstall/BINDInstallDlg.h	C.PORTION	2001,2004,2007,2009,2015,2016,2017
-./bin/win32/BINDInstall/DirBrowse.cpp		C.PORTION	2001,2004,2007,2016
-./bin/win32/BINDInstall/DirBrowse.h		C.PORTION	2001,2004,2007,2016
-./bin/win32/BINDInstall/StdAfx.cpp		X	2001
-./bin/win32/BINDInstall/StdAfx.h		X	2001,2006,2011,2013
-./bin/win32/BINDInstall/VersionInfo.cpp		X	2001,2008,2015,2017
-./bin/win32/BINDInstall/VersionInfo.h		X	2001
-./bin/win32/BINDInstall/res/BINDInstall.ico	X	2001
-./bin/win32/BINDInstall/res/BINDInstall.rc2	X	2001
-./bin/win32/BINDInstall/resource.h		X	2001,2005,2009
-./bind.keys					X	2009,2010,2011,2017
-./bind.keys.h					X	2009,2010,2011,2012,2014,2017
-./config.guess					X	1998,1999,2000,2001,2004,2009,2013
+./bin/tools/win32/arpaname.vcxproj.filters.in	X	2013,2015,2018
+./bin/tools/win32/arpaname.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tools/win32/arpaname.vcxproj.user		X	2013,2018
+./bin/tools/win32/genrandom.vcxproj.filters.in	X	2013,2015,2018
+./bin/tools/win32/genrandom.vcxproj.in		X	2013,2015,2016,2017,2018
+./bin/tools/win32/genrandom.vcxproj.user	X	2013,2018
+./bin/tools/win32/journalprint.vcxproj.filters.in	X	2013,2015,2018
+./bin/tools/win32/journalprint.vcxproj.in	X	2013,2015,2016,2017,2018
+./bin/tools/win32/journalprint.vcxproj.user	X	2013,2018
+./bin/tools/win32/mdig.vcxproj.filters.in	X	2015,2018
+./bin/tools/win32/mdig.vcxproj.in		X	2015,2016,2017,2018
+./bin/tools/win32/mdig.vcxproj.user		X	2015,2018
+./bin/tools/win32/nsec3hash.vcxproj.filters.in	X	2013,2015,2018
+./bin/tools/win32/nsec3hash.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/tools/win32/nsec3hash.vcxproj.user	X	2013,2018
+./bin/tools/win32/rrchecker.vcxproj.filters.in	X	2013,2015,2018
+./bin/tools/win32/rrchecker.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./bin/tools/win32/rrchecker.vcxproj.user	X	2013,2018
+./bin/win32/BINDInstall/AccountInfo.cpp		C.PORTION	2001,2002,2004,2007,2009,2013,2016,2017,2018
+./bin/win32/BINDInstall/AccountInfo.h		C	2001,2004,2007,2016,2018
+./bin/win32/BINDInstall/BINDInstall.cpp		C.PORTION	2001,2004,2007,2009,2016,2018
+./bin/win32/BINDInstall/BINDInstall.h		C.PORTION	2001,2004,2007,2016,2018
+./bin/win32/BINDInstall/BINDInstall.rc		X	2001,2005,2009,2014,2018
+./bin/win32/BINDInstall/BINDInstall.vcxproj.filters.in	X	2013,2015,2018
+./bin/win32/BINDInstall/BINDInstall.vcxproj.in	X	2013,2014,2015,2016,2018
+./bin/win32/BINDInstall/BINDInstall.vcxproj.user	X	2013,2018
+./bin/win32/BINDInstall/BINDInstallDlg.cpp	C.PORTION	2001,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016,2017,2018
+./bin/win32/BINDInstall/BINDInstallDlg.h	C.PORTION	2001,2004,2007,2009,2015,2016,2017,2018
+./bin/win32/BINDInstall/DirBrowse.cpp		C.PORTION	2001,2004,2007,2016,2018
+./bin/win32/BINDInstall/DirBrowse.h		C.PORTION	2001,2004,2007,2016,2018
+./bin/win32/BINDInstall/StdAfx.cpp		X	2001,2018
+./bin/win32/BINDInstall/StdAfx.h		X	2001,2006,2011,2013,2018
+./bin/win32/BINDInstall/VersionInfo.cpp		X	2001,2008,2015,2017,2018
+./bin/win32/BINDInstall/VersionInfo.h		X	2001,2018
+./bin/win32/BINDInstall/res/BINDInstall.ico	X	2001,2018
+./bin/win32/BINDInstall/res/BINDInstall.rc2	X	2001,2018
+./bin/win32/BINDInstall/resource.h		X	2001,2005,2009,2018
+./bind.keys					X	2009,2010,2011,2017,2018
+./bind.keys.h					X	2009,2010,2011,2012,2014,2017,2018
+./config.guess					X	1998,1999,2000,2001,2004,2009,2013,2018
 ./config.h.in					X	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./config.h.win32				C	1999,2000,2001,2004,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
-./config.sub					X	1998,1999,2000,2001,2004,2013
-./config.threads.in				X	2005,2006,2010,2011,2012,2013
+./config.sub					X	1998,1999,2000,2001,2004,2013,2018
+./config.threads.in				X	2005,2006,2010,2011,2012,2013,2018
 ./configure					X	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./configure.in					SH	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./conftools/perllib/dnsconf/DNSConf-macros.h	C	2000,2001,2004,2007,2016
-./conftools/perllib/dnsconf/DNSConf.i		C	2000,2001,2004,2007,2016
-./conftools/perllib/dnsconf/Makefile.PL		PERL	2000,2001,2004,2007,2012,2016
-./conftools/perllib/dnsconf/named1.conf		CONF-C	2000,2001,2004,2007,2016
-./conftools/perllib/dnsconf/test.pl		PERL	2000,2001,2004,2007,2012,2016
-./contrib/README				X	2014,2015,2016,2017
-./contrib/dane/mkdane.sh			X	2012
-./contrib/dane/tlsa6698.pem			X	2012
-./contrib/dlz/.gitignore			X	2014
-./contrib/dlz/bin/.gitignore			X	2014
-./contrib/dlz/bin/dlzbdb/Makefile.in		X	2005,2007,2009,2011,2012,2015,2016,2017
-./contrib/dlz/bin/dlzbdb/dlzbdb.c		X	2005,2016
+./conftools/perllib/dnsconf/DNSConf-macros.h	C	2000,2001,2004,2007,2016,2018
+./conftools/perllib/dnsconf/DNSConf.i		C	2000,2001,2004,2007,2016,2018
+./conftools/perllib/dnsconf/Makefile.PL		PERL	2000,2001,2004,2007,2012,2016,2018
+./conftools/perllib/dnsconf/named1.conf		CONF-C	2000,2001,2004,2007,2016,2018
+./conftools/perllib/dnsconf/test.pl		PERL	2000,2001,2004,2007,2012,2016,2018
+./contrib/README				X	2014,2015,2016,2017,2018
+./contrib/dane/mkdane.sh			X	2012,2018
+./contrib/dane/tlsa6698.pem			X	2012,2018
+./contrib/dlz/.gitignore			X	2014,2018
+./contrib/dlz/bin/.gitignore			X	2014,2018
+./contrib/dlz/bin/dlzbdb/Makefile.in		X	2005,2007,2009,2011,2012,2015,2016,2017,2018
+./contrib/dlz/bin/dlzbdb/dlzbdb.c		X	2005,2016,2018
 ./contrib/dlz/config.dlz.in			X	2005,2006,2008,2010,2011,2014,2016,2017,2018
-./contrib/dlz/drivers/.gitignore		X	2012
-./contrib/dlz/drivers/dlz_bdb_driver.c		X	2005,2008,2010,2011,2012,2016,2017
-./contrib/dlz/drivers/dlz_bdbhpt_driver.c	X	2005,2010,2011,2012,2016,2017
-./contrib/dlz/drivers/dlz_dlopen_driver.c	X	2010,2011
-./contrib/dlz/drivers/dlz_drivers.c		X	2005,2010,2011
-./contrib/dlz/drivers/dlz_filesystem_driver.c	X	2005,2010,2011,2012,2016,2017
-./contrib/dlz/drivers/dlz_ldap_driver.c		X	2005,2010,2011,2012,2016,2017
-./contrib/dlz/drivers/dlz_mysql_driver.c	X	2005,2007,2009,2010,2011,2012,2016,2017
-./contrib/dlz/drivers/dlz_odbc_driver.c		X	2005,2010,2011,2012,2014,2016,2017
-./contrib/dlz/drivers/dlz_postgres_driver.c	X	2005,2007,2010,2011,2012,2014,2016,2017
-./contrib/dlz/drivers/dlz_stub_driver.c		X	2005,2010,2011,2012,2016,2017
-./contrib/dlz/drivers/include/dlz/dlz_bdb_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_bdbhpt_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_dlopen_driver.h	X	2010,2011
-./contrib/dlz/drivers/include/dlz/dlz_drivers.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_filesystem_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_ldap_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_mysql_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_odbc_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_postgres_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/dlz_stub_driver.h	X	2005
-./contrib/dlz/drivers/include/dlz/sdlz_helper.h	X	2005,2017
-./contrib/dlz/drivers/rules.in			X	2005,2010
-./contrib/dlz/drivers/sdlz_helper.c		X	2005,2010,2011,2012,2016
-./contrib/dlz/example/Makefile			X	2010,2013
-./contrib/dlz/example/README			X	2011,2012,2013,2014
-./contrib/dlz/example/dlz_example.c		X	2010,2011,2012,2013,2014
-./contrib/dlz/example/named.conf		X	2011,2014
-./contrib/dlz/example/win32/DLLMain.c		X	2011,2016
-./contrib/dlz/example/win32/dxdriver.def	X	2011
-./contrib/dlz/example/win32/dxdriver.dsw	X	2011
-./contrib/dlz/modules/bdbhpt/Makefile		X	2013
-./contrib/dlz/modules/bdbhpt/README.md		X	2013,2015
-./contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c	X	2013,2015
-./contrib/dlz/modules/bdbhpt/testing/README	X	2015
-./contrib/dlz/modules/bdbhpt/testing/bdbhpt-populate.pl	X	2013
-./contrib/dlz/modules/bdbhpt/testing/dns-data.txt	X	2013,2015
-./contrib/dlz/modules/bdbhpt/testing/named.conf	X	2015
-./contrib/dlz/modules/common/dlz_dbi.c		X	2013,2014,2016
-./contrib/dlz/modules/filesystem/Makefile	X	2013
-./contrib/dlz/modules/filesystem/dir.c		X	2013
-./contrib/dlz/modules/filesystem/dir.h		X	2013
-./contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c	X	2013,2015,2016
-./contrib/dlz/modules/include/dlz_dbi.h		X	2013
-./contrib/dlz/modules/include/dlz_list.h	X	2013,2016
-./contrib/dlz/modules/include/dlz_minimal.h	X	2013,2014
-./contrib/dlz/modules/include/dlz_pthread.h	X	2013,2014,2015
-./contrib/dlz/modules/ldap/Makefile		X	2013
-./contrib/dlz/modules/ldap/dlz_ldap_dynamic.c	X	2013,2016
-./contrib/dlz/modules/ldap/testing/README	X	2013
-./contrib/dlz/modules/ldap/testing/dlz.schema	X	2013
-./contrib/dlz/modules/ldap/testing/example.ldif	X	2013
-./contrib/dlz/modules/ldap/testing/named.conf	X	2013
-./contrib/dlz/modules/ldap/testing/slapd.conf	X	2013
-./contrib/dlz/modules/mysql/.gitignore		X	2017
-./contrib/dlz/modules/mysql/Makefile.in		X	2013,2017
-./contrib/dlz/modules/mysql/dlz_mysql_dynamic.c	X	2013,2016
-./contrib/dlz/modules/mysql/testing/README	X	2013
-./contrib/dlz/modules/mysql/testing/dlz.data	X	2013,2017
-./contrib/dlz/modules/mysql/testing/dlz.schema	X	2013
-./contrib/dlz/modules/mysql/testing/named.conf	X	2013
-./contrib/dlz/modules/mysqldyn/.gitignore	X	2017
-./contrib/dlz/modules/mysqldyn/Makefile.in	X	2014,2015,2017
-./contrib/dlz/modules/mysqldyn/README		X	2014
-./contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c	X	2014,2015
-./contrib/dlz/modules/mysqldyn/testing/README	X	2014
-./contrib/dlz/modules/mysqldyn/testing/dlz.data	X	2014
-./contrib/dlz/modules/mysqldyn/testing/dlz.schema	X	2014
-./contrib/dlz/modules/mysqldyn/testing/named.conf	X	2014
-./contrib/dlz/modules/perl/Makefile		X	2013
-./contrib/dlz/modules/perl/README		X	2013
-./contrib/dlz/modules/perl/dlz_perl_callback.xs	X	2013
-./contrib/dlz/modules/perl/dlz_perl_callback_clientinfo.xs	X	2013
-./contrib/dlz/modules/perl/dlz_perl_driver.c	X	2013,2015,2016
-./contrib/dlz/modules/perl/dlz_perl_driver.h	X	2013
-./contrib/dlz/modules/perl/testing/dlz_perl_example.pm	X	2013
-./contrib/dlz/modules/perl/testing/named.conf	X	2013
-./contrib/dlz/modules/sqlite3/Makefile		X	2014
-./contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c	X	2014,2016
-./contrib/dlz/modules/sqlite3/testing/README	X	2014
-./contrib/dlz/modules/sqlite3/testing/dlz.data	X	2014
-./contrib/dlz/modules/sqlite3/testing/dlz.schema	X	2014
-./contrib/dlz/modules/sqlite3/testing/named.conf	X	2014
-./contrib/dlz/modules/wildcard/Makefile		X	2013
-./contrib/dlz/modules/wildcard/README		X	2013
-./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c	X	2013,2015,2016
-./contrib/dlz/modules/wildcard/testing/named.conf	X	2013
-./contrib/dnsperf-2.1.0.0-1/Makefile.in		X	2016
-./contrib/dnsperf-2.1.0.0-1/README		X	2016
-./contrib/dnsperf-2.1.0.0-1/RELEASE_NOTES	X	2016
-./contrib/dnsperf-2.1.0.0-1/aclocal.m4		X	2016
-./contrib/dnsperf-2.1.0.0-1/acx_pthread.m4	X	2016
-./contrib/dnsperf-2.1.0.0-1/config.guess	X	2016
-./contrib/dnsperf-2.1.0.0-1/config.sub		X	2016
-./contrib/dnsperf-2.1.0.0-1/configure		X	2016,2017
-./contrib/dnsperf-2.1.0.0-1/configure.in	X	2016,2017
-./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/INSTALL	X	2016
-./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/USAGE	X	2016
-./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/queryparse	X	2016
-./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/queryparse.1	X	2016
-./contrib/dnsperf-2.1.0.0-1/datafile.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/datafile.h		X	2016
-./contrib/dnsperf-2.1.0.0-1/dns.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/dns.h		X	2016
-./contrib/dnsperf-2.1.0.0-1/dnsperf.1		X	2016
-./contrib/dnsperf-2.1.0.0-1/dnsperf.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/doc/caching-dns-performance.pdf	X	2016
-./contrib/dnsperf-2.1.0.0-1/doc/dnsperf.pdf	X	2016
-./contrib/dnsperf-2.1.0.0-1/doc/resperf.pdf	X	2016
-./contrib/dnsperf-2.1.0.0-1/install-sh		X	2016
-./contrib/dnsperf-2.1.0.0-1/log.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/log.h		X	2016
-./contrib/dnsperf-2.1.0.0-1/net.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/net.h		X	2016
-./contrib/dnsperf-2.1.0.0-1/opt.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/opt.h		X	2016
-./contrib/dnsperf-2.1.0.0-1/os.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/os.h		X	2016
-./contrib/dnsperf-2.1.0.0-1/resperf-report	X	2016
-./contrib/dnsperf-2.1.0.0-1/resperf.1		X	2016
-./contrib/dnsperf-2.1.0.0-1/resperf.c		X	2016
-./contrib/dnsperf-2.1.0.0-1/util.h		X	2016
-./contrib/dnsperf-2.1.0.0-1/version.h		X	2016
-./contrib/dnsperf-patches/0001-Add-support-for-sending-EDNS-CLIENT-SUBNET-option-in.patch	X	2016
-./contrib/dnspriv/README.md			MKD	2017
-./contrib/dnspriv/named.conf			CONF-C	2017
-./contrib/dnspriv/nginx.conf			SH	2017
-./contrib/idn/README.idnkit			X	2005,2009
-./contrib/idn/idnkit-1.0-src/.gitignore		X	2014
-./contrib/idn/idnkit-1.0-src/ChangeLog		X	2003
-./contrib/idn/idnkit-1.0-src/DISTFILES		X	2003
-./contrib/idn/idnkit-1.0-src/INSTALL		X	2003
-./contrib/idn/idnkit-1.0-src/INSTALL.ja		X	2003
-./contrib/idn/idnkit-1.0-src/LICENSE.txt	X	2003
-./contrib/idn/idnkit-1.0-src/Makefile.in	X	2003,2004
-./contrib/idn/idnkit-1.0-src/NEWS		X	2003
-./contrib/idn/idnkit-1.0-src/README		X	2003
-./contrib/idn/idnkit-1.0-src/README.ja		X	2003
-./contrib/idn/idnkit-1.0-src/acconfig.h		X	2003
-./contrib/idn/idnkit-1.0-src/aclocal.m4		X	2003
-./contrib/idn/idnkit-1.0-src/config.guess	X	2003
-./contrib/idn/idnkit-1.0-src/config.sub		X	2003
-./contrib/idn/idnkit-1.0-src/configure		X	2003
-./contrib/idn/idnkit-1.0-src/configure.in	X	2003
-./contrib/idn/idnkit-1.0-src/include/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/include/config.h.in	X	2003
-./contrib/idn/idnkit-1.0-src/include/config.h.win	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/aliaslist.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/api.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/assert.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/checker.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/converter.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/debug.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/delimitermap.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/export.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/filechecker.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/filemapper.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/localencoding.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/log.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/logmacro.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/mapper.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/mapselector.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/nameprep.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/normalizer.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/punycode.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/race.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/res.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/resconf.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/result.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/strhash.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/ucs4.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/ucsmap.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/ucsset.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/unicode.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/unormalize.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/utf8.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/util.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/idn/version.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/api.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/localencoding.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/log.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/res.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/resconf.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/result.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/utf8.h	X	2003
-./contrib/idn/idnkit-1.0-src/include/mdn/version.h	X	2003
-./contrib/idn/idnkit-1.0-src/install-sh		X	2003
-./contrib/idn/idnkit-1.0-src/lib/Makefile.in	X	2003,2004
-./contrib/idn/idnkit-1.0-src/lib/aliaslist.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/aliaslist.sh	X	2003
-./contrib/idn/idnkit-1.0-src/lib/api.c		X	2003
-./contrib/idn/idnkit-1.0-src/lib/checker.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/converter.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/debug.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/delimitermap.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/filechecker.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/filemapper.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/idn.conf.sample.in	X	2003
-./contrib/idn/idnkit-1.0-src/lib/localencoding.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/log.c		X	2003
-./contrib/idn/idnkit-1.0-src/lib/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/lib/mapper.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/mapselector.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/nameprep.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/nameprep_template.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/nameprepdata.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/normalizer.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/punycode.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/race.c		X	2003
-./contrib/idn/idnkit-1.0-src/lib/res.c		X	2003
-./contrib/idn/idnkit-1.0-src/lib/resconf.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/result.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/strhash.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/Makefile.in	X	2003,2004
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init1.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init2.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init3.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init4-1.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init4-2.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init4-3.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init5-1.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init5-2.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api-init5-3.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/api.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/checker.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/codeset.h	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/converter.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/delimitermap.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/iconvchk.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/mapper.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/mapselector.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/nameprep.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/normalizer.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/res.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/resconf.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/setenv.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/setenv.h	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/testsuite.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/testsuite.h	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/testutil.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/testutil.h	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/testygen	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/ucs4.tsy	X	2003
-./contrib/idn/idnkit-1.0-src/lib/tests/utffilter	X	2003
-./contrib/idn/idnkit-1.0-src/lib/ucs4.c		X	2003
-./contrib/idn/idnkit-1.0-src/lib/ucsmap.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/ucsset.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/unicode.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/unicode_template.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/unicodedata_320.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/unormalize.c	X	2003
-./contrib/idn/idnkit-1.0-src/lib/utf8.c		X	2003
-./contrib/idn/idnkit-1.0-src/lib/util.c		X	2003
-./contrib/idn/idnkit-1.0-src/lib/version.c	X	2003
-./contrib/idn/idnkit-1.0-src/ltconfig		X	2003
-./contrib/idn/idnkit-1.0-src/ltmain.sh		X	2003
-./contrib/idn/idnkit-1.0-src/make.wnt		X	2003
-./contrib/idn/idnkit-1.0-src/man/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/man/idn.conf.5.in	X	2003
-./contrib/idn/idnkit-1.0-src/man/libidnkit.3.in	X	2003
-./contrib/idn/idnkit-1.0-src/map/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/map/jp.map		X	2003
-./contrib/idn/idnkit-1.0-src/mkinstalldirs	X	2003
-./contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.1-patch	X	2003
-./contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.2-patch	X	2003
-./contrib/idn/idnkit-1.0-src/tools/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.1	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.c	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/idnslookup.in	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/selectiveencode.c	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/selectiveencode.h	X	2003,2009
-./contrib/idn/idnkit-1.0-src/tools/idnconv/util.c	X	2003
-./contrib/idn/idnkit-1.0-src/tools/idnconv/util.h	X	2003
-./contrib/idn/idnkit-1.0-src/tools/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/tools/rpm/idnkit.spec	X	2003
-./contrib/idn/idnkit-1.0-src/tools/runidn/Makefile.in	X	2003
-./contrib/idn/idnkit-1.0-src/tools/runidn/resolver.c	X	2003
-./contrib/idn/idnkit-1.0-src/tools/runidn/resolver.h	X	2003
-./contrib/idn/idnkit-1.0-src/tools/runidn/runidn.1	X	2003
-./contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in	X	2003
-./contrib/idn/idnkit-1.0-src/tools/runidn/stub.c	X	2003
-./contrib/idn/idnkit-1.0-src/tools/runidn/stub.h	X	2003
-./contrib/idn/idnkit-1.0-src/util/.gitignore	X	2014
-./contrib/idn/idnkit-1.0-src/util/Makefile	X	2003
-./contrib/idn/idnkit-1.0-src/util/SparseMap.pm	X	2003
-./contrib/idn/idnkit-1.0-src/util/UCD.pm	X	2003
-./contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl	X	2003
-./contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl	X	2003
-./contrib/idn/idnkit-1.0-src/win/README.WIN	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/README.txt	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/README_j.txt	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/checkdll.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/convert.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/dump.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/encoding.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/hook.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/printf.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/common/wrapcommon.h	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/config/idnconf.tcl	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/config/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock11/dlldef.h	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllfunc.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllload.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllmain.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllstub.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock11/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock11/wsock32.def	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock20/dlldef.h	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllfunc.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllload.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllmain.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllstub.c	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock20/make.wnt	X	2003
-./contrib/idn/idnkit-1.0-src/wsock/wsock20/ws2_32.def	X	2003
-./contrib/kasp/README				X	2016
-./contrib/kasp/kasp.xml				X	2016
-./contrib/kasp/kasp2policy.py			X	2016
-./contrib/kasp/policy.good			X	2016
-./contrib/perftcpdns/.gitignore			X	2014
-./contrib/perftcpdns/Makefile.in		MAKE	2014,2016
-./contrib/perftcpdns/configure			X	2014
-./contrib/perftcpdns/configure.in		SH	2014,2016
-./contrib/perftcpdns/perftcpdns.c		C	2013,2014,2016
-./contrib/queryperf/.gitignore			X	2014
-./contrib/queryperf/Makefile.in			X	2001,2004
-./contrib/queryperf/README			X	2001
-./contrib/queryperf/config.h.in			X	2007
-./contrib/queryperf/configure			X	2001,2002,2004,2007,2012
-./contrib/queryperf/configure.in		X	2001,2004,2007,2012
-./contrib/queryperf/input/sample.0		X	2001
-./contrib/queryperf/input/sample.1		X	2001
-./contrib/queryperf/missing/addrinfo.h		X	2004
-./contrib/queryperf/missing/getaddrinfo.c	X	2004
-./contrib/queryperf/missing/getnameinfo.c	X	2004
-./contrib/queryperf/queryperf.c			X	2001,2002,2003,2004,2005,2007,2012,2013,2014
-./contrib/queryperf/utils/gen-data-queryperf.py	X	2003,2008,2016
-./contrib/scripts/.gitignore			X	2012,2014
-./contrib/scripts/check-secure-delegation.pl.in	PERL	2010,2012,2014,2016
-./contrib/scripts/check5011.pl			X	2013,2014,2017
-./contrib/scripts/dnssec-keyset.sh		X	2015
-./contrib/scripts/named-bootconf.sh		SH.PORTION	1999,2000,2001,2004,2006,2007,2012,2014,2016
-./contrib/scripts/nanny.pl			PERL	2000,2001,2004,2007,2012,2014,2016
-./contrib/scripts/zone-edit.sh.in		SH	2010,2012,2014,2016
-./contrib/sdb/bdb/README			X	2002
-./contrib/sdb/bdb/bdb.c				X	2002,2011,2014
-./contrib/sdb/bdb/bdb.h				X	2002
-./contrib/sdb/bdb/zone2bdb.c			X	2002,2008,2009
-./contrib/sdb/dir/dirdb.c			C	2000,2001,2004,2007,2011,2014,2016
-./contrib/sdb/dir/dirdb.h			C	2000,2001,2004,2007,2016
-./contrib/sdb/ldap/INSTALL.ldap			X	2001,2002,2004
-./contrib/sdb/ldap/README.ldap			X	2001,2002,2004
-./contrib/sdb/ldap/README.zone2ldap		X	2001,2015
-./contrib/sdb/ldap/ldapdb.c			X	2001,2002,2003,2004,2011,2014
-./contrib/sdb/ldap/ldapdb.h			X	2001
-./contrib/sdb/ldap/zone2ldap.1			X	2001
-./contrib/sdb/ldap/zone2ldap.c			X	2001,2005,2008,2009,2011,2015,2016
-./contrib/sdb/pgsql/pgsqldb.c			C	2000,2001,2004,2007,2011,2014,2016
-./contrib/sdb/pgsql/pgsqldb.h			C	2000,2001,2004,2007,2016
-./contrib/sdb/pgsql/zonetodb.c			C	2000,2001,2002,2004,2005,2007,2008,2009,2014,2016
-./contrib/sdb/sqlite/README.sdb_sqlite		X	2007
-./contrib/sdb/sqlite/sqlitedb.c			X	2007,2011,2014,2016
-./contrib/sdb/sqlite/sqlitedb.h			X	2007,2016
-./contrib/sdb/sqlite/zone2sqlite.c		X	2007,2008,2009,2010,2013,2014,2016
-./contrib/sdb/tcl/lookup.tcl			TCL	2000,2001,2004,2007,2012,2016
-./contrib/sdb/tcl/tcldb.c			C	2000,2001,2004,2007,2011,2014,2016
-./contrib/sdb/tcl/tcldb.h			C	2000,2001,2004,2007,2016
-./contrib/sdb/time/timedb.c			C	2000,2001,2004,2007,2011,2014,2016
-./contrib/sdb/time/timedb.h			C	2000,2001,2004,2007,2016
-./doc/Makefile.in				MAKE	2000,2001,2004,2005,2006,2007,2012,2015,2016
-./doc/arm/.gitignore				X	2015
+./contrib/dlz/drivers/.gitignore		X	2012,2018
+./contrib/dlz/drivers/dlz_bdb_driver.c		X	2005,2008,2010,2011,2012,2016,2017,2018
+./contrib/dlz/drivers/dlz_bdbhpt_driver.c	X	2005,2010,2011,2012,2016,2017,2018
+./contrib/dlz/drivers/dlz_dlopen_driver.c	X	2010,2011,2018
+./contrib/dlz/drivers/dlz_drivers.c		X	2005,2010,2011,2018
+./contrib/dlz/drivers/dlz_filesystem_driver.c	X	2005,2010,2011,2012,2016,2017,2018
+./contrib/dlz/drivers/dlz_ldap_driver.c		X	2005,2010,2011,2012,2016,2017,2018
+./contrib/dlz/drivers/dlz_mysql_driver.c	X	2005,2007,2009,2010,2011,2012,2016,2017,2018
+./contrib/dlz/drivers/dlz_odbc_driver.c		X	2005,2010,2011,2012,2014,2016,2017,2018
+./contrib/dlz/drivers/dlz_postgres_driver.c	X	2005,2007,2010,2011,2012,2014,2016,2017,2018
+./contrib/dlz/drivers/dlz_stub_driver.c		X	2005,2010,2011,2012,2016,2017,2018
+./contrib/dlz/drivers/include/dlz/dlz_bdb_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_bdbhpt_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_dlopen_driver.h	X	2010,2011,2018
+./contrib/dlz/drivers/include/dlz/dlz_drivers.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_filesystem_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_ldap_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_mysql_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_odbc_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_postgres_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/dlz_stub_driver.h	X	2005,2018
+./contrib/dlz/drivers/include/dlz/sdlz_helper.h	X	2005,2017,2018
+./contrib/dlz/drivers/rules.in			X	2005,2010,2018
+./contrib/dlz/drivers/sdlz_helper.c		X	2005,2010,2011,2012,2016,2018
+./contrib/dlz/example/Makefile			X	2010,2013,2018
+./contrib/dlz/example/README			X	2011,2012,2013,2014,2018
+./contrib/dlz/example/dlz_example.c		X	2010,2011,2012,2013,2014,2018
+./contrib/dlz/example/named.conf		X	2011,2014,2018
+./contrib/dlz/example/win32/DLLMain.c		X	2011,2016,2018
+./contrib/dlz/example/win32/dxdriver.def	X	2011,2018
+./contrib/dlz/example/win32/dxdriver.dsp	X	2018
+./contrib/dlz/example/win32/dxdriver.dsw	X	2011,2018
+./contrib/dlz/example/win32/dxdriver.mak	X	2018
+./contrib/dlz/modules/bdbhpt/Makefile		X	2013,2018
+./contrib/dlz/modules/bdbhpt/README.md		X	2013,2015,2018
+./contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c	X	2013,2015,2018
+./contrib/dlz/modules/bdbhpt/testing/README	X	2015,2018
+./contrib/dlz/modules/bdbhpt/testing/bdbhpt-populate.pl	X	2013,2018
+./contrib/dlz/modules/bdbhpt/testing/dns-data.txt	X	2013,2015,2018
+./contrib/dlz/modules/bdbhpt/testing/named.conf	X	2015,2018
+./contrib/dlz/modules/common/dlz_dbi.c		X	2013,2014,2016,2018
+./contrib/dlz/modules/filesystem/Makefile	X	2013,2018
+./contrib/dlz/modules/filesystem/dir.c		X	2013,2018
+./contrib/dlz/modules/filesystem/dir.h		X	2013,2018
+./contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c	X	2013,2015,2016,2018
+./contrib/dlz/modules/include/dlz_dbi.h		X	2013,2018
+./contrib/dlz/modules/include/dlz_list.h	X	2013,2016,2018
+./contrib/dlz/modules/include/dlz_minimal.h	X	2013,2014,2018
+./contrib/dlz/modules/include/dlz_pthread.h	X	2013,2014,2015,2018
+./contrib/dlz/modules/ldap/Makefile		X	2013,2018
+./contrib/dlz/modules/ldap/dlz_ldap_dynamic.c	X	2013,2016,2018
+./contrib/dlz/modules/ldap/testing/README	X	2013,2018
+./contrib/dlz/modules/ldap/testing/dlz.schema	X	2013,2018
+./contrib/dlz/modules/ldap/testing/example.ldif	X	2013,2018
+./contrib/dlz/modules/ldap/testing/named.conf	X	2013,2018
+./contrib/dlz/modules/ldap/testing/slapd.conf	X	2013,2018
+./contrib/dlz/modules/mysql/.gitignore		X	2017,2018
+./contrib/dlz/modules/mysql/Makefile.in		X	2013,2017,2018
+./contrib/dlz/modules/mysql/dlz_mysql_dynamic.c	X	2013,2016,2018
+./contrib/dlz/modules/mysql/testing/README	X	2013,2018
+./contrib/dlz/modules/mysql/testing/dlz.data	X	2013,2017,2018
+./contrib/dlz/modules/mysql/testing/dlz.schema	X	2013,2018
+./contrib/dlz/modules/mysql/testing/named.conf	X	2013,2018
+./contrib/dlz/modules/mysqldyn/.gitignore	X	2017,2018
+./contrib/dlz/modules/mysqldyn/Makefile.in	X	2014,2015,2017,2018
+./contrib/dlz/modules/mysqldyn/README		X	2014,2018
+./contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c	X	2014,2015,2018
+./contrib/dlz/modules/mysqldyn/testing/README	X	2014,2018
+./contrib/dlz/modules/mysqldyn/testing/dlz.data	X	2014,2018
+./contrib/dlz/modules/mysqldyn/testing/dlz.schema	X	2014,2018
+./contrib/dlz/modules/mysqldyn/testing/named.conf	X	2014,2018
+./contrib/dlz/modules/perl/Makefile		X	2013,2018
+./contrib/dlz/modules/perl/README		X	2013,2018
+./contrib/dlz/modules/perl/dlz_perl_callback.xs	X	2013,2018
+./contrib/dlz/modules/perl/dlz_perl_callback_clientinfo.xs	X	2013,2018
+./contrib/dlz/modules/perl/dlz_perl_driver.c	X	2013,2015,2016,2018
+./contrib/dlz/modules/perl/dlz_perl_driver.h	X	2013,2018
+./contrib/dlz/modules/perl/testing/dlz_perl_example.pm	X	2013,2018
+./contrib/dlz/modules/perl/testing/named.conf	X	2013,2018
+./contrib/dlz/modules/sqlite3/Makefile		X	2014,2018
+./contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c	X	2014,2016,2018
+./contrib/dlz/modules/sqlite3/testing/README	X	2014,2018
+./contrib/dlz/modules/sqlite3/testing/dlz.data	X	2014,2018
+./contrib/dlz/modules/sqlite3/testing/dlz.schema	X	2014,2018
+./contrib/dlz/modules/sqlite3/testing/named.conf	X	2014,2018
+./contrib/dlz/modules/wildcard/Makefile		X	2013,2018
+./contrib/dlz/modules/wildcard/README		X	2013,2018
+./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c	X	2013,2015,2016,2018
+./contrib/dlz/modules/wildcard/testing/named.conf	X	2013,2018
+./contrib/dnsperf-2.1.0.0-1/Makefile.in		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/README		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/RELEASE_NOTES	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/aclocal.m4		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/acx_pthread.m4	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/config.guess	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/config.sub		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/configure		X	2016,2017,2018
+./contrib/dnsperf-2.1.0.0-1/configure.in	X	2016,2017,2018
+./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/INSTALL	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/USAGE	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/queryparse	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/contrib/queryparse/queryparse.1	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/datafile.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/datafile.h		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/dns.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/dns.h		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/dnsperf.1		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/dnsperf.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/doc/caching-dns-performance.pdf	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/doc/dnsperf.pdf	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/doc/resperf.pdf	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/install-sh		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/log.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/log.h		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/net.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/net.h		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/opt.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/opt.h		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/os.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/os.h		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/resperf-report	X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/resperf.1		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/resperf.c		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/util.h		X	2016,2018
+./contrib/dnsperf-2.1.0.0-1/version.h		X	2016,2018
+./contrib/dnsperf-patches/0001-Add-support-for-sending-EDNS-CLIENT-SUBNET-option-in.patch	X	2016,2018
+./contrib/dnspriv/README.md			MKD	2017,2018
+./contrib/dnspriv/named.conf			CONF-C	2017,2018
+./contrib/dnspriv/nginx.conf			SH	2017,2018
+./contrib/idn/README.idnkit			X	2005,2009,2018
+./contrib/idn/idnkit-1.0-src/.gitignore		X	2014,2018
+./contrib/idn/idnkit-1.0-src/ChangeLog		X	2003,2018
+./contrib/idn/idnkit-1.0-src/DISTFILES		X	2003,2018
+./contrib/idn/idnkit-1.0-src/INSTALL		X	2003,2018
+./contrib/idn/idnkit-1.0-src/INSTALL.ja		X	2003,2018
+./contrib/idn/idnkit-1.0-src/LICENSE.txt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/Makefile.in	X	2003,2004,2018
+./contrib/idn/idnkit-1.0-src/NEWS		X	2003,2018
+./contrib/idn/idnkit-1.0-src/README		X	2003,2018
+./contrib/idn/idnkit-1.0-src/README.ja		X	2003,2018
+./contrib/idn/idnkit-1.0-src/acconfig.h		X	2003,2018
+./contrib/idn/idnkit-1.0-src/aclocal.m4		X	2003,2018
+./contrib/idn/idnkit-1.0-src/config.guess	X	2003,2018
+./contrib/idn/idnkit-1.0-src/config.sub		X	2003,2018
+./contrib/idn/idnkit-1.0-src/configure		X	2003,2018
+./contrib/idn/idnkit-1.0-src/configure.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/config.h.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/config.h.win	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/aliaslist.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/api.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/assert.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/checker.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/converter.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/debug.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/delimitermap.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/export.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/filechecker.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/filemapper.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/localencoding.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/log.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/logmacro.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/mapper.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/mapselector.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/nameprep.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/normalizer.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/punycode.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/race.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/res.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/resconf.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/result.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/strhash.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/ucs4.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/ucsmap.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/ucsset.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/unicode.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/unormalize.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/utf8.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/util.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/idn/version.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/api.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/localencoding.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/log.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/res.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/resconf.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/result.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/utf8.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/include/mdn/version.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/install-sh		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/Makefile.in	X	2003,2004,2018
+./contrib/idn/idnkit-1.0-src/lib/aliaslist.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/aliaslist.sh	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/api.c		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/checker.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/converter.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/debug.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/delimitermap.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/filechecker.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/filemapper.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/idn.conf.sample.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/localencoding.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/log.c		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/mapper.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/mapselector.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/nameprep.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/nameprep_template.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/nameprepdata.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/normalizer.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/punycode.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/race.c		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/res.c		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/resconf.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/result.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/strhash.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/Makefile.in	X	2003,2004,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init1.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init2.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init3.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init4-1.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init4-2.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init4-3.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init5-1.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init5-2.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api-init5-3.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/api.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/checker.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/codeset.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/converter.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/delimitermap.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/iconvchk.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/mapper.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/mapselector.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/nameprep.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/normalizer.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/res.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/resconf.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/setenv.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/setenv.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/testsuite.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/testsuite.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/testutil.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/testutil.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/testygen	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/ucs4.tsy	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/tests/utffilter	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/ucs4.c		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/ucsmap.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/ucsset.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/unicode.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/unicode_template.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/unicodedata_320.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/unormalize.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/utf8.c		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/util.c		X	2003,2018
+./contrib/idn/idnkit-1.0-src/lib/version.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/ltconfig		X	2003,2018
+./contrib/idn/idnkit-1.0-src/ltmain.sh		X	2003,2018
+./contrib/idn/idnkit-1.0-src/make.wnt		X	2003,2018
+./contrib/idn/idnkit-1.0-src/man/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/man/idn.conf.5.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/man/libidnkit.3.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/map/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/map/jp.map		X	2003,2018
+./contrib/idn/idnkit-1.0-src/mkinstalldirs	X	2003,2018
+./contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.1-patch	X	2003,2018
+./contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.2-patch	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.1	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/idnslookup.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/selectiveencode.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/selectiveencode.h	X	2003,2009,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/util.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/idnconv/util.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/rpm/idnkit.spec	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/runidn/Makefile.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/runidn/resolver.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/runidn/resolver.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/runidn/runidn.1	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/runidn/stub.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/tools/runidn/stub.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/util/.gitignore	X	2014,2018
+./contrib/idn/idnkit-1.0-src/util/Makefile	X	2003,2018
+./contrib/idn/idnkit-1.0-src/util/SparseMap.pm	X	2003,2018
+./contrib/idn/idnkit-1.0-src/util/UCD.pm	X	2003,2018
+./contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl	X	2003,2018
+./contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl	X	2003,2018
+./contrib/idn/idnkit-1.0-src/win/README.WIN	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/README.txt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/README_j.txt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/checkdll.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/convert.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/dump.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/encoding.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/hook.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/printf.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/common/wrapcommon.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/config/idnconf.tcl	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/config/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock11/dlldef.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllfunc.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllload.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllmain.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock11/dllstub.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock11/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock11/wsock32.def	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock20/dlldef.h	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllfunc.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllload.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllmain.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock20/dllstub.c	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock20/make.wnt	X	2003,2018
+./contrib/idn/idnkit-1.0-src/wsock/wsock20/ws2_32.def	X	2003,2018
+./contrib/kasp/README				X	2016,2018
+./contrib/kasp/kasp.xml				X	2016,2018
+./contrib/kasp/kasp2policy.py			X	2016,2018
+./contrib/kasp/policy.good			X	2016,2018
+./contrib/perftcpdns/.gitignore			X	2014,2018
+./contrib/perftcpdns/Makefile.in		MAKE	2014,2016,2018
+./contrib/perftcpdns/configure			X	2014,2018
+./contrib/perftcpdns/configure.in		SH	2014,2016,2018
+./contrib/perftcpdns/perftcpdns.c		C	2013,2014,2016,2018
+./contrib/queryperf/.gitignore			X	2014,2018
+./contrib/queryperf/Makefile.in			X	2001,2004,2018
+./contrib/queryperf/README			X	2001,2018
+./contrib/queryperf/config.h.in			X	2007,2018
+./contrib/queryperf/configure			X	2001,2002,2004,2007,2012,2018
+./contrib/queryperf/configure.in		X	2001,2004,2007,2012,2018
+./contrib/queryperf/input/sample.0		X	2001,2018
+./contrib/queryperf/input/sample.1		X	2001,2018
+./contrib/queryperf/missing/addrinfo.h		X	2004,2018
+./contrib/queryperf/missing/getaddrinfo.c	X	2004,2018
+./contrib/queryperf/missing/getnameinfo.c	X	2004,2018
+./contrib/queryperf/queryperf.c			X	2001,2002,2003,2004,2005,2007,2012,2013,2014,2018
+./contrib/queryperf/utils/gen-data-queryperf.py	X	2003,2008,2016,2018
+./contrib/scripts/.gitignore			X	2012,2014,2018
+./contrib/scripts/check-secure-delegation.pl.in	PERL	2010,2012,2014,2016,2018
+./contrib/scripts/check5011.pl			X	2013,2014,2017,2018
+./contrib/scripts/dnssec-keyset.sh		X	2015,2018
+./contrib/scripts/named-bootconf.sh		SH.PORTION	1999,2000,2001,2004,2006,2007,2012,2014,2016,2018
+./contrib/scripts/nanny.pl			PERL	2000,2001,2004,2007,2012,2014,2016,2018
+./contrib/scripts/zone-edit.sh.in		SH	2010,2012,2014,2016,2018
+./contrib/sdb/bdb/README			X	2002,2018
+./contrib/sdb/bdb/bdb.c				X	2002,2011,2014,2018
+./contrib/sdb/bdb/bdb.h				X	2002,2018
+./contrib/sdb/bdb/zone2bdb.c			X	2002,2008,2009,2018
+./contrib/sdb/dir/dirdb.c			C	2000,2001,2004,2007,2011,2014,2016,2018
+./contrib/sdb/dir/dirdb.h			C	2000,2001,2004,2007,2016,2018
+./contrib/sdb/ldap/INSTALL.ldap			X	2001,2002,2004,2018
+./contrib/sdb/ldap/README.ldap			X	2001,2002,2004,2018
+./contrib/sdb/ldap/README.zone2ldap		X	2001,2015,2018
+./contrib/sdb/ldap/ldapdb.c			X	2001,2002,2003,2004,2011,2014,2018
+./contrib/sdb/ldap/ldapdb.h			X	2001,2018
+./contrib/sdb/ldap/zone2ldap.1			X	2001,2018
+./contrib/sdb/ldap/zone2ldap.c			X	2001,2005,2008,2009,2011,2015,2016,2018
+./contrib/sdb/pgsql/pgsqldb.c			C	2000,2001,2004,2007,2011,2014,2016,2018
+./contrib/sdb/pgsql/pgsqldb.h			C	2000,2001,2004,2007,2016,2018
+./contrib/sdb/pgsql/zonetodb.c			C	2000,2001,2002,2004,2005,2007,2008,2009,2014,2016,2018
+./contrib/sdb/sqlite/README.sdb_sqlite		X	2007,2018
+./contrib/sdb/sqlite/sqlitedb.c			X	2007,2011,2014,2016,2018
+./contrib/sdb/sqlite/sqlitedb.h			X	2007,2016,2018
+./contrib/sdb/sqlite/zone2sqlite.c		X	2007,2008,2009,2010,2013,2014,2016,2018
+./contrib/sdb/tcl/lookup.tcl			TCL	2000,2001,2004,2007,2012,2016,2018
+./contrib/sdb/tcl/tcldb.c			C	2000,2001,2004,2007,2011,2014,2016,2018
+./contrib/sdb/tcl/tcldb.h			C	2000,2001,2004,2007,2016,2018
+./contrib/sdb/time/timedb.c			C	2000,2001,2004,2007,2011,2014,2016,2018
+./contrib/sdb/time/timedb.h			C	2000,2001,2004,2007,2016,2018
+./doc/Makefile.in				MAKE	2000,2001,2004,2005,2006,2007,2012,2015,2016,2018
+./doc/arm/.gitignore				X	2015,2018
 ./doc/arm/Bv9ARM-book.xml			SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/Bv9ARM.ch01.html			X	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/Bv9ARM.ch02.html			X	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -3103,26 +3107,26 @@
 ./doc/arm/Bv9ARM.ch10.html			X	2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/Bv9ARM.ch11.html			X	2015,2016,2017,2018
 ./doc/arm/Bv9ARM.ch12.html			X	2015,2016,2017,2018
-./doc/arm/Bv9ARM.conf				X	2015
+./doc/arm/Bv9ARM.conf				X	2015,2018
 ./doc/arm/Bv9ARM.html				X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/Bv9ARM.pdf				X	2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./doc/arm/Makefile.in				MAKE	2001,2002,2004,2005,2006,2007,2009,2012,2014,2015,2016
-./doc/arm/README-SGML				TXT.BRIEF	2000,2001,2004,2015,2016
+./doc/arm/Makefile.in				MAKE	2001,2002,2004,2005,2006,2007,2009,2012,2014,2015,2016,2018
+./doc/arm/README-SGML				TXT.BRIEF	2000,2001,2004,2015,2016,2018
 ./doc/arm/acl.grammar.xml			SGML	2018
-./doc/arm/catz.xml				SGML	2016,2017
+./doc/arm/catz.xml				SGML	2016,2017,2018
 ./doc/arm/controls.grammar.xml			SGML	2018
 ./doc/arm/delegation-only.zoneopt.xml		SGML	2018
-./doc/arm/dlz.xml				SGML	2012,2013,2014,2015,2016
-./doc/arm/dnssec.xml				SGML	2010,2011,2015,2016,2017
-./doc/arm/dyndb.xml				SGML	2015,2016
+./doc/arm/dlz.xml				SGML	2012,2013,2014,2015,2016,2018
+./doc/arm/dnssec.xml				SGML	2010,2011,2015,2016,2017,2018
+./doc/arm/dyndb.xml				SGML	2015,2016,2018
 ./doc/arm/forward.zoneopt.xml			SGML	2018
 ./doc/arm/hint.zoneopt.xml			SGML	2018
 ./doc/arm/in-view.zoneopt.xml			SGML	2018
-./doc/arm/isc-logo.eps				X	2005,2010
-./doc/arm/isc-logo.pdf				X	2005,2010
+./doc/arm/isc-logo.eps				X	2005,2010,2018
+./doc/arm/isc-logo.pdf				X	2005,2010,2018
 ./doc/arm/key.grammar.xml			SGML	2018
-./doc/arm/libdns.xml				SGML	2010,2014,2015,2016,2017
-./doc/arm/logging-categories.xml		SGML	2015,2016,2017
+./doc/arm/libdns.xml				SGML	2010,2014,2015,2016,2017,2018
+./doc/arm/logging-categories.xml		SGML	2015,2016,2017,2018
 ./doc/arm/logging.grammar.xml			SGML	2018
 ./doc/arm/man.arpaname.html			X	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/man.ddns-confgen.html			X	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -3162,1218 +3166,1218 @@
 ./doc/arm/man.rndc.conf.html			X	2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/man.rndc.html				X	2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/managed-keys.grammar.xml		SGML	2018
-./doc/arm/managed-keys.xml			SGML	2010,2014,2015,2016,2017
+./doc/arm/managed-keys.xml			SGML	2010,2014,2015,2016,2017,2018
 ./doc/arm/master.zoneopt.xml			SGML	2018
 ./doc/arm/masters.grammar.xml			SGML	2018
-./doc/arm/notes-wrapper.xml			SGML	2014,2015,2016
-./doc/arm/notes.conf				X	2015
+./doc/arm/notes-wrapper.xml			SGML	2014,2015,2016,2018
+./doc/arm/notes.conf				X	2015,2018
 ./doc/arm/notes.html				X	2014,2015,2016,2017,2018
 ./doc/arm/notes.pdf				X	2014,2015,2016,2017,2018
 ./doc/arm/notes.xml				SGML	2014,2015,2016,2017,2018
-./doc/arm/noteversion.xml.in			SGML	2015,2016
+./doc/arm/noteversion.xml.in			SGML	2015,2016,2018
 ./doc/arm/options.grammar.xml			SGML	2018
-./doc/arm/pkcs11.xml				SGML	2010,2012,2013,2014,2015,2016
-./doc/arm/pkgversion.xml.in			SGML	2015,2016
+./doc/arm/pkcs11.xml				SGML	2010,2012,2013,2014,2015,2016,2018
+./doc/arm/pkgversion.xml.in			SGML	2015,2016,2018
 ./doc/arm/redirect.zoneopt.xml			SGML	2018
-./doc/arm/releaseinfo.xml.in			SGML	2015,2016
+./doc/arm/releaseinfo.xml.in			SGML	2015,2016,2018
 ./doc/arm/server.grammar.xml			SGML	2018
 ./doc/arm/slave.zoneopt.xml			SGML	2018
 ./doc/arm/static-stub.zoneopt.xml		SGML	2018
 ./doc/arm/statistics-channels.grammar.xml	SGML	2018
 ./doc/arm/stub.zoneopt.xml			SGML	2018
 ./doc/arm/trusted-keys.grammar.xml		SGML	2018
-./doc/design/addressdb				TXT.BRIEF	2000,2001,2004,2016
-./doc/design/cds-child				TXT.BRIEF	2015,2016
-./doc/design/compression			TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/database				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/db_rules				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/decompression			TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/dispatch				TXT.BRIEF	2000,2001,2004,2016
-./doc/design/dscp				TXT.BRIEF	2013,2016
-./doc/design/keydone				TXT.BRIEF	2011,2016
-./doc/design/logging				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/ncache				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/rdataset				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/red-black				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/resolver				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/search				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/tasks				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/verify				TXT.BRIEF	2012,2016
-./doc/design/windows-nt				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/design/zone				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/dev/DBC					TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/dev/HOW-ADB-WORKS.txt			TXT.BRIEF	2003,2004,2016
-./doc/dev/autoconf				TXT.BRIEF	2001,2002,2004,2016
-./doc/dev/coding.html				HTML	1999,2000,2001,2002,2004,2007,2016
-./doc/dev/contrib.md				MKD	2017
-./doc/dev/cvs-usage				TXT.BRIEF	2000,2001,2004,2016
-./doc/dev/dev.md				MKD	2017
-./doc/dev/magic_numbers				TXT.BRIEF	1999,2000,2001,2002,2004,2016
-./doc/dev/rdata.md				MKD	1999,2000,2001,2004,2007,2016,2017
-./doc/dev/release				TXT.BRIEF	2000,2001,2002,2003,2004,2005,2006,2007,2009,2014,2016
-./doc/dev/results				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/dev/style.md				MKD	2017
-./doc/dev/tests					TXT.BRIEF	2000,2001,2004,2016
-./doc/dev/unexpected				TXT.BRIEF	1999,2000,2001,2004,2016
-./doc/doxygen/.gitignore			X	2012
-./doc/doxygen/Doxyfile.in			X	2006,2017
-./doc/doxygen/Makefile.in			MAKE	2006,2007,2012,2015,2016
-./doc/doxygen/doxygen-input-filter.in		PERL	2006,2007,2012,2016
-./doc/doxygen/isc-footer.html			HTML	2006,2007,2016
-./doc/doxygen/isc-header.html			HTML	2006,2007,2016
-./doc/doxygen/mainpage				X	2006
+./doc/design/addressdb				TXT.BRIEF	2000,2001,2004,2016,2018
+./doc/design/cds-child				TXT.BRIEF	2015,2016,2018
+./doc/design/compression			TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/database				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/db_rules				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/decompression			TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/dispatch				TXT.BRIEF	2000,2001,2004,2016,2018
+./doc/design/dscp				TXT.BRIEF	2013,2016,2018
+./doc/design/keydone				TXT.BRIEF	2011,2016,2018
+./doc/design/logging				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/ncache				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/rdataset				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/red-black				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/resolver				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/search				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/tasks				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/verify				TXT.BRIEF	2012,2016,2018
+./doc/design/windows-nt				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/design/zone				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/dev/DBC					TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/dev/HOW-ADB-WORKS.txt			TXT.BRIEF	2003,2004,2016,2018
+./doc/dev/autoconf				TXT.BRIEF	2001,2002,2004,2016,2018
+./doc/dev/coding.html				HTML	1999,2000,2001,2002,2004,2007,2016,2018
+./doc/dev/contrib.md				MKD	2017,2018
+./doc/dev/cvs-usage				TXT.BRIEF	2000,2001,2004,2016,2018
+./doc/dev/dev.md				MKD	2017,2018
+./doc/dev/magic_numbers				TXT.BRIEF	1999,2000,2001,2002,2004,2016,2018
+./doc/dev/rdata.md				MKD	1999,2000,2001,2004,2007,2016,2017,2018
+./doc/dev/release				TXT.BRIEF	2000,2001,2002,2003,2004,2005,2006,2007,2009,2014,2016,2018
+./doc/dev/results				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/dev/style.md				MKD	2017,2018
+./doc/dev/tests					TXT.BRIEF	2000,2001,2004,2016,2018
+./doc/dev/unexpected				TXT.BRIEF	1999,2000,2001,2004,2016,2018
+./doc/doxygen/.gitignore			X	2012,2018
+./doc/doxygen/Doxyfile.in			X	2006,2017,2018
+./doc/doxygen/Makefile.in			MAKE	2006,2007,2012,2015,2016,2018
+./doc/doxygen/doxygen-input-filter.in		PERL	2006,2007,2012,2016,2018
+./doc/doxygen/isc-footer.html			HTML	2006,2007,2016,2018
+./doc/doxygen/isc-header.html			HTML	2006,2007,2016,2018
+./doc/doxygen/mainpage				X	2006,2018
 ./doc/misc/Makefile.in				MAKE	2001,2004,2007,2009,2012,2016,2017,2018
 ./doc/misc/delegation-only.zoneopt		X	2018
-./doc/misc/dnssec				TXT.BRIEF	2000,2001,2002,2004,2016
+./doc/misc/dnssec				TXT.BRIEF	2000,2001,2002,2004,2016,2018
 ./doc/misc/docbook-grammars.pl			PERL	2018
 ./doc/misc/docbook-options.pl			PERL	2017,2018
 ./doc/misc/docbook-zoneopt.pl			PERL	2018
-./doc/misc/format-options.pl			PERL	2001,2004,2007,2012,2016
+./doc/misc/format-options.pl			PERL	2001,2004,2007,2012,2016,2018
 ./doc/misc/forward.zoneopt			X	2018
 ./doc/misc/hint.zoneopt				X	2018
 ./doc/misc/in-view.zoneopt			X	2018
-./doc/misc/ipv6					TXT.BRIEF	2000,2001,2004,2016
+./doc/misc/ipv6					TXT.BRIEF	2000,2001,2004,2016,2018
 ./doc/misc/master.zoneopt			X	2018
-./doc/misc/migration				TXT.BRIEF	2000,2001,2003,2004,2007,2008,2016
-./doc/misc/migration-4to9			TXT.BRIEF	2001,2004,2016
-./doc/misc/options				X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./doc/misc/migration				TXT.BRIEF	2000,2001,2003,2004,2007,2008,2016,2018
+./doc/misc/migration-4to9			TXT.BRIEF	2001,2004,2016,2018
+./doc/misc/options				X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/misc/redirect.zoneopt			X	2018
-./doc/misc/rfc-compliance			TXT.BRIEF	2001,2004,2015,2016
-./doc/misc/roadmap				TXT.BRIEF	2000,2001,2004,2016,2017
-./doc/misc/sdb					TXT.BRIEF	2000,2001,2004,2016,2017
+./doc/misc/rfc-compliance			TXT.BRIEF	2001,2004,2015,2016,2018
+./doc/misc/roadmap				TXT.BRIEF	2000,2001,2004,2016,2017,2018
+./doc/misc/sdb					TXT.BRIEF	2000,2001,2004,2016,2017,2018
 ./doc/misc/slave.zoneopt			X	2018
-./doc/misc/sort-options.pl			PERL	2007,2012,2016
+./doc/misc/sort-options.pl			PERL	2007,2012,2016,2018
 ./doc/misc/static-stub.zoneopt			X	2018
 ./doc/misc/stub.zoneopt				X	2018
-./doc/misc/tcp-fast-open			TXT.BRIEF	2016,2017
-./doc/tex/.gitignore				X	2015
-./doc/tex/Makefile.in				MAKE	2015,2016
-./doc/tex/armstyle.sty.in			X	2015
-./doc/tex/notestyle.sty				X	2015
-./doc/xsl/.gitignore				X	2012,2014,2015
-./doc/xsl/Makefile.in				MAKE	2005,2007,2012,2014,2015,2016
+./doc/misc/tcp-fast-open			TXT.BRIEF	2016,2017,2018
+./doc/tex/.gitignore				X	2015,2018
+./doc/tex/Makefile.in				MAKE	2015,2016,2018
+./doc/tex/armstyle.sty.in			X	2015,2018
+./doc/tex/notestyle.sty				X	2015,2018
+./doc/xsl/.gitignore				X	2012,2014,2015,2018
+./doc/xsl/Makefile.in				MAKE	2005,2007,2012,2014,2015,2016,2018
 ./doc/xsl/arm-param.xsl				SGML	2015,2016,2018
-./doc/xsl/copyright.xsl				SGML	2005,2007,2009,2015,2016
-./doc/xsl/graphics/caution.eps			X	2015
-./doc/xsl/graphics/caution.pdf			X	2015
-./doc/xsl/graphics/important.eps		X	2015
-./doc/xsl/graphics/important.pdf		X	2015
-./doc/xsl/graphics/note.eps			X	2015
-./doc/xsl/graphics/note.pdf			X	2015
-./doc/xsl/graphics/tip.eps			X	2015
-./doc/xsl/graphics/tip.pdf			X	2015
-./doc/xsl/graphics/warning.eps			X	2015
-./doc/xsl/graphics/warning.pdf			X	2015
-./doc/xsl/isc-docbook-chunk.xsl.in		SGML	2005,2007,2014,2015,2016
-./doc/xsl/isc-docbook-html.xsl.in		SGML	2005,2007,2014,2015,2016
-./doc/xsl/isc-docbook-text.xsl			SGML	2005,2007,2015,2016
-./doc/xsl/isc-manpage.xsl.in			SGML	2005,2007,2015,2016
-./doc/xsl/isc-notes-html.xsl.in			SGML	2015,2016
-./doc/xsl/notes-param.xsl			SGML	2015,2016
-./doc/xsl/pre-latex.xsl				SGML	2005,2007,2015,2016
-./docutil/HTML_COPYRIGHT			X	2001,2004,2016
-./docutil/MAN_COPYRIGHT				X	2001,2004,2016
-./docutil/patch-db2latex-duplicate-template-bug	X	2007
-./docutil/patch-db2latex-nested-param-bug	X	2007
-./docutil/patch-db2latex-xsltproc-title-bug	X	2007
-./install-sh					X	1998,1999,2000,2001
+./doc/xsl/copyright.xsl				SGML	2005,2007,2009,2015,2016,2018
+./doc/xsl/graphics/caution.eps			X	2015,2018
+./doc/xsl/graphics/caution.pdf			X	2015,2018
+./doc/xsl/graphics/important.eps		X	2015,2018
+./doc/xsl/graphics/important.pdf		X	2015,2018
+./doc/xsl/graphics/note.eps			X	2015,2018
+./doc/xsl/graphics/note.pdf			X	2015,2018
+./doc/xsl/graphics/tip.eps			X	2015,2018
+./doc/xsl/graphics/tip.pdf			X	2015,2018
+./doc/xsl/graphics/warning.eps			X	2015,2018
+./doc/xsl/graphics/warning.pdf			X	2015,2018
+./doc/xsl/isc-docbook-chunk.xsl.in		SGML	2005,2007,2014,2015,2016,2018
+./doc/xsl/isc-docbook-html.xsl.in		SGML	2005,2007,2014,2015,2016,2018
+./doc/xsl/isc-docbook-text.xsl			SGML	2005,2007,2015,2016,2018
+./doc/xsl/isc-manpage.xsl.in			SGML	2005,2007,2015,2016,2018
+./doc/xsl/isc-notes-html.xsl.in			SGML	2015,2016,2018
+./doc/xsl/notes-param.xsl			SGML	2015,2016,2018
+./doc/xsl/pre-latex.xsl				SGML	2005,2007,2015,2016,2018
+./docutil/HTML_COPYRIGHT			X	2001,2004,2016,2018
+./docutil/MAN_COPYRIGHT				X	2001,2004,2016,2018
+./docutil/patch-db2latex-duplicate-template-bug	X	2007,2018
+./docutil/patch-db2latex-nested-param-bug	X	2007,2018
+./docutil/patch-db2latex-xsltproc-title-bug	X	2007,2018
+./install-sh					X	1998,1999,2000,2001,2018
 ./isc-config.sh.1				MAN	DOCBOOK
-./isc-config.sh.docbook				SGML	2009,2014,2015,2016,2017
+./isc-config.sh.docbook				SGML	2009,2014,2015,2016,2017,2018
 ./isc-config.sh.html				HTML	DOCBOOK
-./isc-config.sh.in				SH	2000,2001,2003,2004,2007,2012,2013,2015,2016,2017
-./lib/.gitignore				X	2012
-./lib/Atffile					X	2011,2014,2016,2017
-./lib/Kyuafile					X	2017
-./lib/Makefile.in				MAKE	1998,1999,2000,2001,2003,2004,2007,2012,2013,2014,2016,2017
-./lib/bind9/Makefile.in				MAKE	2001,2004,2007,2009,2012,2014,2015,2016,2017
+./isc-config.sh.in				SH	2000,2001,2003,2004,2007,2012,2013,2015,2016,2017,2018
+./lib/.gitignore				X	2012,2018
+./lib/Atffile					X	2011,2014,2016,2017,2018
+./lib/Kyuafile					X	2017,2018
+./lib/Makefile.in				MAKE	1998,1999,2000,2001,2003,2004,2007,2012,2013,2014,2016,2017,2018
+./lib/bind9/Makefile.in				MAKE	2001,2004,2007,2009,2012,2014,2015,2016,2017,2018
 ./lib/bind9/api					X	2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/bind9/check.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/bind9/getaddresses.c			C	2001,2002,2004,2005,2007,2014,2015,2016,2017
-./lib/bind9/include/Makefile.in			MAKE	2001,2004,2007,2012,2016
-./lib/bind9/include/bind9/Makefile.in		MAKE	2001,2004,2007,2012,2015,2016
-./lib/bind9/include/bind9/check.h		C	2001,2004,2005,2006,2007,2016
-./lib/bind9/include/bind9/getaddresses.h	C	2001,2004,2005,2006,2007,2009,2016,2017
-./lib/bind9/include/bind9/version.h		C	2001,2004,2005,2006,2007,2016
-./lib/bind9/version.c				C	2001,2004,2005,2007,2016
-./lib/bind9/win32/DLLMain.c			C	2001,2004,2007,2016
-./lib/bind9/win32/libbind9.def			X	2001
-./lib/bind9/win32/libbind9.vcxproj.filters.in	X	2013,2015,2016
-./lib/bind9/win32/libbind9.vcxproj.in		X	2013,2014,2015,2016,2017
-./lib/bind9/win32/libbind9.vcxproj.user		X	2013
-./lib/bind9/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016
-./lib/dns/.gitignore				X	2012,2013,2016
-./lib/dns/Atffile				X	2011
-./lib/dns/Kyuafile				X	2017
-./lib/dns/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/acl.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016,2017
+./lib/bind9/getaddresses.c			C	2001,2002,2004,2005,2007,2014,2015,2016,2017,2018
+./lib/bind9/include/Makefile.in			MAKE	2001,2004,2007,2012,2016,2018
+./lib/bind9/include/bind9/Makefile.in		MAKE	2001,2004,2007,2012,2015,2016,2018
+./lib/bind9/include/bind9/check.h		C	2001,2004,2005,2006,2007,2016,2018
+./lib/bind9/include/bind9/getaddresses.h	C	2001,2004,2005,2006,2007,2009,2016,2017,2018
+./lib/bind9/include/bind9/version.h		C	2001,2004,2005,2006,2007,2016,2018
+./lib/bind9/version.c				C	2001,2004,2005,2007,2016,2018
+./lib/bind9/win32/DLLMain.c			C	2001,2004,2007,2016,2018
+./lib/bind9/win32/libbind9.def			X	2001,2018
+./lib/bind9/win32/libbind9.vcxproj.filters.in	X	2013,2015,2016,2018
+./lib/bind9/win32/libbind9.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./lib/bind9/win32/libbind9.vcxproj.user		X	2013,2018
+./lib/bind9/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016,2018
+./lib/dns/.gitignore				X	2012,2013,2016,2018
+./lib/dns/Atffile				X	2011,2018
+./lib/dns/Kyuafile				X	2017,2018
+./lib/dns/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/acl.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016,2017,2018
 ./lib/dns/adb.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/badcache.c				C	2014,2015,2016
+./lib/dns/badcache.c				C	2014,2015,2016,2018
 ./lib/dns/byaddr.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2013,2016,2017,2018
-./lib/dns/cache.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/callbacks.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2015,2016
+./lib/dns/cache.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/callbacks.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2015,2016,2018
 ./lib/dns/catz.c				C	2016,2017,2018
-./lib/dns/client.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/clientinfo.c				C	2011,2014,2016
-./lib/dns/compress.c				C	1999,2000,2001,2004,2005,2006,2007,2015,2016,2017
+./lib/dns/client.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/clientinfo.c				C	2011,2014,2016,2018
+./lib/dns/compress.c				C	1999,2000,2001,2004,2005,2006,2007,2015,2016,2017,2018
 ./lib/dns/db.c					C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016,2017,2018
-./lib/dns/dbiterator.c				C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/dbtable.c				C	1999,2000,2001,2004,2005,2007,2013,2016
+./lib/dns/dbiterator.c				C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/dbtable.c				C	1999,2000,2001,2004,2005,2007,2013,2016,2018
 ./lib/dns/diff.c				C	2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2013,2014,2015,2016,2017,2018
-./lib/dns/dispatch.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/dlz.c					C.PORTION	1999,2000,2001,2005,2007,2009,2010,2011,2012,2013,2015,2016
-./lib/dns/dns64.c				C	2010,2011,2014,2016,2017
-./lib/dns/dnsrps.c				C	2017
-./lib/dns/dnssec.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/dispatch.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/dlz.c					C.PORTION	1999,2000,2001,2005,2007,2009,2010,2011,2012,2013,2015,2016,2018
+./lib/dns/dns64.c				C	2010,2011,2014,2016,2017,2018
+./lib/dns/dnsrps.c				C	2017,2018
+./lib/dns/dnssec.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/dnstap.c				C	2015,2016,2017,2018
-./lib/dns/dnstap.proto				X	2015
-./lib/dns/ds.c					C	2002,2003,2004,2005,2006,2007,2010,2012,2014,2016
+./lib/dns/dnstap.proto				X	2015,2018
+./lib/dns/ds.c					C	2002,2003,2004,2005,2006,2007,2010,2012,2014,2016,2018
 ./lib/dns/dst_api.c				C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/dst_gost.h				C	2014,2016
-./lib/dns/dst_internal.h			C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017
-./lib/dns/dst_lib.c				C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/dst_openssl.h				C	2002,2004,2005,2007,2008,2009,2011,2012,2015,2016
+./lib/dns/dst_gost.h				C	2014,2016,2018
+./lib/dns/dst_internal.h			C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018
+./lib/dns/dst_lib.c				C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/dst_openssl.h				C	2002,2004,2005,2007,2008,2009,2011,2012,2015,2016,2018
 ./lib/dns/dst_parse.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/dst_parse.h				C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2014,2016,2017
-./lib/dns/dst_pkcs11.h				C	2014,2016
-./lib/dns/dst_result.c				C	1999,2000,2001,2004,2005,2007,2008,2012,2013,2014,2015,2016
-./lib/dns/dyndb.c				C	2015,2016,2017
-./lib/dns/ecdb.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/ecs.c					C	2017
-./lib/dns/forward.c				C	2000,2001,2004,2005,2007,2009,2013,2016
-./lib/dns/gen-unix.h				C	1999,2000,2001,2004,2005,2007,2009,2016
-./lib/dns/gen-win32.h				C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016
-./lib/dns/gen.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
+./lib/dns/dst_parse.h				C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2014,2016,2017,2018
+./lib/dns/dst_pkcs11.h				C	2014,2016,2018
+./lib/dns/dst_result.c				C	1999,2000,2001,2004,2005,2007,2008,2012,2013,2014,2015,2016,2018
+./lib/dns/dyndb.c				C	2015,2016,2017,2018
+./lib/dns/ecdb.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/ecs.c					C	2017,2018
+./lib/dns/forward.c				C	2000,2001,2004,2005,2007,2009,2013,2016,2018
+./lib/dns/gen-unix.h				C	1999,2000,2001,2004,2005,2007,2009,2016,2018
+./lib/dns/gen-win32.h				C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016,2018
+./lib/dns/gen.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/geoip.c				C	2013,2014,2015,2016,2018
-./lib/dns/gssapi_link.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
-./lib/dns/gssapictx.c				C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/gssapi_link.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018
+./lib/dns/gssapictx.c				C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/hmac_link.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2016
-./lib/dns/include/dns/Makefile.in		MAKE	1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/acl.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014,2016,2017
-./lib/dns/include/dns/adb.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014,2015,2016
-./lib/dns/include/dns/badcache.h		C	2014,2016
-./lib/dns/include/dns/bit.h			C	2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/byaddr.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2016
-./lib/dns/include/dns/cache.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013,2016,2017
-./lib/dns/include/dns/callbacks.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2016
-./lib/dns/include/dns/catz.h			C	2016
-./lib/dns/include/dns/cert.h			C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/client.h			C	2009,2013,2014,2016,2017
-./lib/dns/include/dns/clientinfo.h		C	2011,2014,2016
-./lib/dns/include/dns/compress.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2015,2016,2017
+./lib/dns/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2016,2018
+./lib/dns/include/dns/Makefile.in		MAKE	1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/acl.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014,2016,2017,2018
+./lib/dns/include/dns/adb.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014,2015,2016,2018
+./lib/dns/include/dns/badcache.h		C	2014,2016,2018
+./lib/dns/include/dns/bit.h			C	2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/byaddr.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/cache.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013,2016,2017,2018
+./lib/dns/include/dns/callbacks.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2016,2018
+./lib/dns/include/dns/catz.h			C	2016,2018
+./lib/dns/include/dns/cert.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/client.h			C	2009,2013,2014,2016,2017,2018
+./lib/dns/include/dns/clientinfo.h		C	2011,2014,2016,2018
+./lib/dns/include/dns/compress.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2015,2016,2017,2018
 ./lib/dns/include/dns/db.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/include/dns/dbiterator.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/dbtable.h			C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/diff.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2013,2016
-./lib/dns/include/dns/dispatch.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/dlz.h			C.PORTION	1999,2000,2001,2005,2006,2007,2009,2010,2011,2012,2013,2016
-./lib/dns/include/dns/dlz_dlopen.h		C	2011,2012,2013,2016,2017
-./lib/dns/include/dns/dns64.h			C	2010,2014,2016
-./lib/dns/include/dns/dnsrps.h			C	2017
-./lib/dns/include/dns/dnssec.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016
+./lib/dns/include/dns/dbiterator.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/dbtable.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/diff.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2013,2016,2018
+./lib/dns/include/dns/dispatch.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/dlz.h			C.PORTION	1999,2000,2001,2005,2006,2007,2009,2010,2011,2012,2013,2016,2018
+./lib/dns/include/dns/dlz_dlopen.h		C	2011,2012,2013,2016,2017,2018
+./lib/dns/include/dns/dns64.h			C	2010,2014,2016,2018
+./lib/dns/include/dns/dnsrps.h			C	2017,2018
+./lib/dns/include/dns/dnssec.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2018
 ./lib/dns/include/dns/dnstap.h			C	2015,2016,2017,2018
-./lib/dns/include/dns/ds.h			C	2002,2004,2005,2006,2007,2010,2012,2014,2016
-./lib/dns/include/dns/dsdigest.h		C	2012,2016
-./lib/dns/include/dns/dyndb.h			C	2015,2016
-./lib/dns/include/dns/ecdb.h			C	2009,2012,2016
-./lib/dns/include/dns/ecs.h			C	2017
-./lib/dns/include/dns/edns.h			C	2014,2015,2016
-./lib/dns/include/dns/events.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2014,2016,2017
-./lib/dns/include/dns/fixedname.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/forward.h			C	2000,2001,2004,2005,2006,2007,2009,2013,2016
-./lib/dns/include/dns/geoip.h			C	2013,2014,2016
-./lib/dns/include/dns/ipkeylist.h		C	2016
-./lib/dns/include/dns/iptable.h			C	2007,2012,2014,2016
-./lib/dns/include/dns/journal.h			C	1999,2000,2001,2004,2005,2006,2007,2008,2009,2011,2013,2016,2017
-./lib/dns/include/dns/keydata.h			C	2009,2016
-./lib/dns/include/dns/keyflags.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/keytable.h		C	2000,2001,2004,2005,2007,2009,2010,2014,2015,2016,2017
-./lib/dns/include/dns/keyvalues.h		C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2012,2016,2017
-./lib/dns/include/dns/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016,2017
-./lib/dns/include/dns/librpz.h			C	2017
-./lib/dns/include/dns/log.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/lookup.h			C	2000,2001,2004,2005,2006,2007,2009,2016
-./lib/dns/include/dns/master.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016
-./lib/dns/include/dns/masterdump.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2011,2013,2014,2015,2016,2017
-./lib/dns/include/dns/message.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/name.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2015,2016,2017
-./lib/dns/include/dns/ncache.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2013,2016
-./lib/dns/include/dns/nsec.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2011,2012,2016
-./lib/dns/include/dns/nsec3.h			C	2008,2009,2010,2011,2012,2013,2016,2017
+./lib/dns/include/dns/ds.h			C	2002,2004,2005,2006,2007,2010,2012,2014,2016,2018
+./lib/dns/include/dns/dsdigest.h		C	2012,2016,2018
+./lib/dns/include/dns/dyndb.h			C	2015,2016,2018
+./lib/dns/include/dns/ecdb.h			C	2009,2012,2016,2018
+./lib/dns/include/dns/ecs.h			C	2017,2018
+./lib/dns/include/dns/edns.h			C	2014,2015,2016,2018
+./lib/dns/include/dns/events.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2014,2016,2017,2018
+./lib/dns/include/dns/fixedname.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/forward.h			C	2000,2001,2004,2005,2006,2007,2009,2013,2016,2018
+./lib/dns/include/dns/geoip.h			C	2013,2014,2016,2018
+./lib/dns/include/dns/ipkeylist.h		C	2016,2018
+./lib/dns/include/dns/iptable.h			C	2007,2012,2014,2016,2018
+./lib/dns/include/dns/journal.h			C	1999,2000,2001,2004,2005,2006,2007,2008,2009,2011,2013,2016,2017,2018
+./lib/dns/include/dns/keydata.h			C	2009,2016,2018
+./lib/dns/include/dns/keyflags.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/keytable.h		C	2000,2001,2004,2005,2007,2009,2010,2014,2015,2016,2017,2018
+./lib/dns/include/dns/keyvalues.h		C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2012,2016,2017,2018
+./lib/dns/include/dns/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016,2017,2018
+./lib/dns/include/dns/librpz.h			C	2017,2018
+./lib/dns/include/dns/log.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/lookup.h			C	2000,2001,2004,2005,2006,2007,2009,2016,2018
+./lib/dns/include/dns/master.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016,2018
+./lib/dns/include/dns/masterdump.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2011,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/message.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/name.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2015,2016,2017,2018
+./lib/dns/include/dns/ncache.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2013,2016,2018
+./lib/dns/include/dns/nsec.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2011,2012,2016,2018
+./lib/dns/include/dns/nsec3.h			C	2008,2009,2010,2011,2012,2013,2016,2017,2018
 ./lib/dns/include/dns/nta.h			C	2014,2015,2016,2018
-./lib/dns/include/dns/opcode.h			C	2002,2004,2005,2006,2007,2016
-./lib/dns/include/dns/order.h			C	2002,2004,2005,2006,2007,2016,2017
-./lib/dns/include/dns/peer.h			C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2013,2014,2015,2016,2017
-./lib/dns/include/dns/portlist.h		C	2003,2004,2005,2006,2007,2016
-./lib/dns/include/dns/private.h			C	2009,2011,2012,2016
-./lib/dns/include/dns/rbt.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/rcode.h			C	1999,2000,2001,2004,2005,2006,2007,2008,2016
-./lib/dns/include/dns/rdata.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2016,2017
-./lib/dns/include/dns/rdataclass.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/rdatalist.h		C	1999,2000,2001,2004,2005,2006,2007,2008,2015,2016
-./lib/dns/include/dns/rdataset.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017
-./lib/dns/include/dns/rdatasetiter.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/rdataslab.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2016
-./lib/dns/include/dns/rdatatype.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2008,2016
-./lib/dns/include/dns/request.h			C	2000,2001,2002,2004,2005,2006,2007,2009,2010,2013,2014,2015,2016
-./lib/dns/include/dns/resolver.h		C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/result.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
-./lib/dns/include/dns/rootns.h			C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/rpz.h			C	2011,2012,2013,2015,2016,2017
+./lib/dns/include/dns/opcode.h			C	2002,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/order.h			C	2002,2004,2005,2006,2007,2016,2017,2018
+./lib/dns/include/dns/peer.h			C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/portlist.h		C	2003,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/private.h			C	2009,2011,2012,2016,2018
+./lib/dns/include/dns/rbt.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/rcode.h			C	1999,2000,2001,2004,2005,2006,2007,2008,2016,2018
+./lib/dns/include/dns/rdata.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2016,2017,2018
+./lib/dns/include/dns/rdataclass.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/rdatalist.h		C	1999,2000,2001,2004,2005,2006,2007,2008,2015,2016,2018
+./lib/dns/include/dns/rdataset.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/include/dns/rdatasetiter.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/rdataslab.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2016,2018
+./lib/dns/include/dns/rdatatype.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2008,2016,2018
+./lib/dns/include/dns/request.h			C	2000,2001,2002,2004,2005,2006,2007,2009,2010,2013,2014,2015,2016,2018
+./lib/dns/include/dns/resolver.h		C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/result.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
+./lib/dns/include/dns/rootns.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/rpz.h			C	2011,2012,2013,2015,2016,2017,2018
 ./lib/dns/include/dns/rriterator.h		C	2009,2011,2016,2018
-./lib/dns/include/dns/rrl.h			C	2013,2015,2016,2017
-./lib/dns/include/dns/sdb.h			C	2000,2001,2004,2005,2006,2007,2009,2011,2012,2016
-./lib/dns/include/dns/sdlz.h			C.PORTION	1999,2000,2001,2005,2006,2007,2009,2010,2011,2012,2016
-./lib/dns/include/dns/secalg.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016
-./lib/dns/include/dns/secproto.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/soa.h			C	2000,2001,2004,2005,2006,2007,2009,2016
+./lib/dns/include/dns/rrl.h			C	2013,2015,2016,2017,2018
+./lib/dns/include/dns/sdb.h			C	2000,2001,2004,2005,2006,2007,2009,2011,2012,2016,2018
+./lib/dns/include/dns/sdlz.h			C.PORTION	1999,2000,2001,2005,2006,2007,2009,2010,2011,2012,2016,2018
+./lib/dns/include/dns/secalg.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016,2018
+./lib/dns/include/dns/secproto.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/soa.h			C	2000,2001,2004,2005,2006,2007,2009,2016,2018
 ./lib/dns/include/dns/ssu.h			C	2000,2001,2003,2004,2005,2006,2007,2008,2010,2011,2016,2017,2018
-./lib/dns/include/dns/stats.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017
-./lib/dns/include/dns/tcpmsg.h			C	1999,2000,2001,2004,2005,2006,2007,2015,2016
-./lib/dns/include/dns/time.h			C	1999,2000,2001,2004,2005,2006,2007,2012,2016
-./lib/dns/include/dns/timer.h			C	2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/tkey.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2010,2011,2016
-./lib/dns/include/dns/tsec.h			C	2009,2010,2012,2016
-./lib/dns/include/dns/tsig.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2016
-./lib/dns/include/dns/ttl.h			C	1999,2000,2001,2004,2005,2006,2007,2014,2016
-./lib/dns/include/dns/types.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/update.h			C	2011,2015,2016
-./lib/dns/include/dns/validator.h		C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2016
-./lib/dns/include/dns/version.h			C	2001,2004,2005,2006,2007,2012,2013,2016
-./lib/dns/include/dns/view.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dns/xfrin.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2013,2016
+./lib/dns/include/dns/stats.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018
+./lib/dns/include/dns/tcpmsg.h			C	1999,2000,2001,2004,2005,2006,2007,2015,2016,2018
+./lib/dns/include/dns/time.h			C	1999,2000,2001,2004,2005,2006,2007,2012,2016,2018
+./lib/dns/include/dns/timer.h			C	2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/tkey.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2010,2011,2016,2018
+./lib/dns/include/dns/tsec.h			C	2009,2010,2012,2016,2018
+./lib/dns/include/dns/tsig.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2016,2018
+./lib/dns/include/dns/ttl.h			C	1999,2000,2001,2004,2005,2006,2007,2014,2016,2018
+./lib/dns/include/dns/types.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/update.h			C	2011,2015,2016,2018
+./lib/dns/include/dns/validator.h		C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2016,2018
+./lib/dns/include/dns/version.h			C	2001,2004,2005,2006,2007,2012,2013,2016,2018
+./lib/dns/include/dns/view.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dns/xfrin.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2013,2016,2018
 ./lib/dns/include/dns/zone.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/include/dns/zonekey.h			C	2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/zt.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2016,2017
-./lib/dns/include/dst/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2015,2016
-./lib/dns/include/dst/dst.h			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/include/dst/gssapi.h			C	2000,2001,2004,2005,2006,2007,2009,2010,2011,2013,2016,2017
-./lib/dns/include/dst/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dst/result.h			C	1999,2000,2001,2004,2005,2006,2007,2008,2012,2014,2016
+./lib/dns/include/dns/zonekey.h			C	2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dns/zt.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2016,2017,2018
+./lib/dns/include/dst/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2015,2016,2018
+./lib/dns/include/dst/dst.h			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/include/dst/gssapi.h			C	2000,2001,2004,2005,2006,2007,2009,2010,2011,2013,2016,2017,2018
+./lib/dns/include/dst/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/dns/include/dst/result.h			C	1999,2000,2001,2004,2005,2006,2007,2008,2012,2014,2016,2018
 ./lib/dns/ipkeylist.c				C	2016,2018
-./lib/dns/iptable.c				C	2007,2008,2009,2013,2014,2016,2017
-./lib/dns/journal.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017
-./lib/dns/key.c					C	2001,2004,2005,2006,2007,2011,2016
-./lib/dns/keydata.c				C	2009,2014,2016
+./lib/dns/iptable.c				C	2007,2008,2009,2013,2014,2016,2017,2018
+./lib/dns/journal.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
+./lib/dns/key.c					C	2001,2004,2005,2006,2007,2011,2016,2018
+./lib/dns/keydata.c				C	2009,2014,2016,2018
 ./lib/dns/keytable.c				C	2000,2001,2004,2005,2007,2009,2010,2013,2014,2015,2016,2017,2018
-./lib/dns/lib.c					C	1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016,2017
-./lib/dns/log.c					C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/lookup.c				C	2000,2001,2003,2004,2005,2007,2013,2016
-./lib/dns/mapapi				X	2013,2017
+./lib/dns/lib.c					C	1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016,2017,2018
+./lib/dns/log.c					C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/lookup.c				C	2000,2001,2003,2004,2005,2007,2013,2016,2018
+./lib/dns/mapapi				X	2013,2017,2018
 ./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/name.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/ncache.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/nsec.c				C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016
-./lib/dns/nsec3.c				C	2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/name.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/ncache.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/nsec.c				C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018
+./lib/dns/nsec3.c				C	2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/nta.c					C	2014,2015,2016,2017,2018
-./lib/dns/openssl_link.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017
-./lib/dns/openssldh_link.c			C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/openssldsa_link.c			C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/opensslecdsa_link.c			C	2012,2013,2014,2015,2016,2017
-./lib/dns/openssleddsa_link.c			C	2017
-./lib/dns/opensslgost_link.c			C	2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/opensslrsa_link.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/order.c				C	2002,2004,2005,2007,2015,2016,2017
-./lib/dns/peer.c				C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
-./lib/dns/pkcs11.c				C	2014,2016,2017
-./lib/dns/pkcs11dh_link.c			C	2014,2015,2016,2017
-./lib/dns/pkcs11dsa_link.c			C	2014,2015,2016,2017
-./lib/dns/pkcs11ecdsa_link.c			C	2014,2015,2016,2017
-./lib/dns/pkcs11eddsa_link.c			C	2017
-./lib/dns/pkcs11gost_link.c			C	2014,2015,2016,2017
-./lib/dns/pkcs11rsa_link.c			C	2014,2015,2016,2017
-./lib/dns/portlist.c				C	2003,2004,2005,2006,2007,2014,2016
-./lib/dns/private.c				C	2009,2011,2012,2015,2016,2017
+./lib/dns/openssl_link.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/openssldh_link.c			C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/openssldsa_link.c			C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/opensslecdsa_link.c			C	2012,2013,2014,2015,2016,2017,2018
+./lib/dns/openssleddsa_link.c			C	2017,2018
+./lib/dns/opensslgost_link.c			C	2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/opensslrsa_link.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/order.c				C	2002,2004,2005,2007,2015,2016,2017,2018
+./lib/dns/peer.c				C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/pkcs11.c				C	2014,2016,2017,2018
+./lib/dns/pkcs11dh_link.c			C	2014,2015,2016,2017,2018
+./lib/dns/pkcs11dsa_link.c			C	2014,2015,2016,2017,2018
+./lib/dns/pkcs11ecdsa_link.c			C	2014,2015,2016,2017,2018
+./lib/dns/pkcs11eddsa_link.c			C	2017,2018
+./lib/dns/pkcs11gost_link.c			C	2014,2015,2016,2017,2018
+./lib/dns/pkcs11rsa_link.c			C	2014,2015,2016,2017,2018
+./lib/dns/portlist.c				C	2003,2004,2005,2006,2007,2014,2016,2018
+./lib/dns/private.c				C	2009,2011,2012,2015,2016,2017,2018
 ./lib/dns/rbt.c					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rbtdb.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/rbtdb.h				C	1999,2000,2001,2004,2005,2007,2011,2012,2016
-./lib/dns/rbtdb64.c				C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rbtdb64.h				C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rcode.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/rbtdb.h				C	1999,2000,2001,2004,2005,2007,2011,2012,2016,2018
+./lib/dns/rbtdb64.c				C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rbtdb64.h				C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rcode.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rdata.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/rdata/any_255/tsig_250.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017
-./lib/dns/rdata/any_255/tsig_250.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/ch_3/a_1.c			C	2005,2007,2009,2014,2015,2016,2017
-./lib/dns/rdata/ch_3/a_1.h			C	2005,2007,2016
-./lib/dns/rdata/generic/afsdb_18.c		C	1999,2000,2001,2003,2004,2005,2007,2009,2014,2015,2016,2017
-./lib/dns/rdata/generic/afsdb_18.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/avc_258.c		C	2016
-./lib/dns/rdata/generic/avc_258.h		C	2016
-./lib/dns/rdata/generic/caa_257.c		C	2014,2015,2016,2017
+./lib/dns/rdata/any_255/tsig_250.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017,2018
+./lib/dns/rdata/any_255/tsig_250.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/ch_3/a_1.c			C	2005,2007,2009,2014,2015,2016,2017,2018
+./lib/dns/rdata/ch_3/a_1.h			C	2005,2007,2016,2018
+./lib/dns/rdata/generic/afsdb_18.c		C	1999,2000,2001,2003,2004,2005,2007,2009,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/afsdb_18.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/avc_258.c		C	2016,2018
+./lib/dns/rdata/generic/avc_258.h		C	2016,2018
+./lib/dns/rdata/generic/caa_257.c		C	2014,2015,2016,2017,2018
 ./lib/dns/rdata/generic/caa_257.h		C	2014,2016,2018
-./lib/dns/rdata/generic/cdnskey_60.c		C	2014,2015,2016
-./lib/dns/rdata/generic/cdnskey_60.h		C	2014,2015,2016
-./lib/dns/rdata/generic/cds_59.c		C	2014,2015,2016
-./lib/dns/rdata/generic/cds_59.h		C	2014,2015,2016
-./lib/dns/rdata/generic/cert_37.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017
-./lib/dns/rdata/generic/cert_37.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/cname_5.c		C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/cname_5.h		C	1998,1999,2000,2001,2004,2007,2016
-./lib/dns/rdata/generic/csync_62.c		C	2015,2016,2017
-./lib/dns/rdata/generic/csync_62.h		C	2015,2016
-./lib/dns/rdata/generic/dlv_32769.c		C	2004,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016
-./lib/dns/rdata/generic/dlv_32769.h		C	2004,2006,2007,2015,2016
-./lib/dns/rdata/generic/dname_39.c		C	1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/dname_39.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/dnskey_48.c		C	2003,2004,2005,2007,2009,2011,2012,2013,2015,2016
-./lib/dns/rdata/generic/dnskey_48.h		C	2003,2004,2005,2007,2015,2016
-./lib/dns/rdata/generic/doa_259.c		C	2017
-./lib/dns/rdata/generic/doa_259.h		C	2017
-./lib/dns/rdata/generic/ds_43.c			C	2002,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/ds_43.h			C	2002,2004,2005,2007,2016
-./lib/dns/rdata/generic/eui48_108.c		C	2013,2014,2015,2016
-./lib/dns/rdata/generic/eui48_108.h		C	2013,2016
-./lib/dns/rdata/generic/eui64_109.c		C	2013,2014,2015,2016
-./lib/dns/rdata/generic/eui64_109.h		C	2013,2016
-./lib/dns/rdata/generic/gpos_27.c		C	1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016
-./lib/dns/rdata/generic/gpos_27.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/hinfo_13.c		C	1998,1999,2000,2001,2002,2004,2007,2009,2014,2015,2016
-./lib/dns/rdata/generic/hinfo_13.h		C	1998,1999,2000,2001,2004,2007,2016
-./lib/dns/rdata/generic/hip_55.c		C	2009,2011,2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/hip_55.h		C	2009,2016
-./lib/dns/rdata/generic/ipseckey_45.c		C	2005,2007,2009,2011,2012,2014,2015,2016,2017
-./lib/dns/rdata/generic/ipseckey_45.h		C	2005,2007,2016
-./lib/dns/rdata/generic/isdn_20.c		C	1999,2000,2001,2002,2004,2005,2007,2009,2013,2014,2015,2016
-./lib/dns/rdata/generic/isdn_20.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/key_25.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2013,2015,2016,2017
-./lib/dns/rdata/generic/key_25.h		C	1999,2000,2001,2004,2005,2007,2015,2016
-./lib/dns/rdata/generic/keydata_65533.c		C	2009,2011,2012,2013,2015,2016,2017
-./lib/dns/rdata/generic/keydata_65533.h		C	2009,2016
-./lib/dns/rdata/generic/l32_105.c		C	2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/l32_105.h		C	2013,2016
-./lib/dns/rdata/generic/l64_106.c		C	2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/l64_106.h		C	2013,2016
+./lib/dns/rdata/generic/cdnskey_60.c		C	2014,2015,2016,2018
+./lib/dns/rdata/generic/cdnskey_60.h		C	2014,2015,2016,2018
+./lib/dns/rdata/generic/cds_59.c		C	2014,2015,2016,2018
+./lib/dns/rdata/generic/cds_59.h		C	2014,2015,2016,2018
+./lib/dns/rdata/generic/cert_37.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017,2018
+./lib/dns/rdata/generic/cert_37.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/cname_5.c		C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/cname_5.h		C	1998,1999,2000,2001,2004,2007,2016,2018
+./lib/dns/rdata/generic/csync_62.c		C	2015,2016,2017,2018
+./lib/dns/rdata/generic/csync_62.h		C	2015,2016,2018
+./lib/dns/rdata/generic/dlv_32769.c		C	2004,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2018
+./lib/dns/rdata/generic/dlv_32769.h		C	2004,2006,2007,2015,2016,2018
+./lib/dns/rdata/generic/dname_39.c		C	1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/dname_39.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/dnskey_48.c		C	2003,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
+./lib/dns/rdata/generic/dnskey_48.h		C	2003,2004,2005,2007,2015,2016,2018
+./lib/dns/rdata/generic/doa_259.c		C	2017,2018
+./lib/dns/rdata/generic/doa_259.h		C	2017,2018
+./lib/dns/rdata/generic/ds_43.c			C	2002,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/ds_43.h			C	2002,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/eui48_108.c		C	2013,2014,2015,2016,2018
+./lib/dns/rdata/generic/eui48_108.h		C	2013,2016,2018
+./lib/dns/rdata/generic/eui64_109.c		C	2013,2014,2015,2016,2018
+./lib/dns/rdata/generic/eui64_109.h		C	2013,2016,2018
+./lib/dns/rdata/generic/gpos_27.c		C	1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016,2018
+./lib/dns/rdata/generic/gpos_27.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/hinfo_13.c		C	1998,1999,2000,2001,2002,2004,2007,2009,2014,2015,2016,2018
+./lib/dns/rdata/generic/hinfo_13.h		C	1998,1999,2000,2001,2004,2007,2016,2018
+./lib/dns/rdata/generic/hip_55.c		C	2009,2011,2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/hip_55.h		C	2009,2016,2018
+./lib/dns/rdata/generic/ipseckey_45.c		C	2005,2007,2009,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/ipseckey_45.h		C	2005,2007,2016,2018
+./lib/dns/rdata/generic/isdn_20.c		C	1999,2000,2001,2002,2004,2005,2007,2009,2013,2014,2015,2016,2018
+./lib/dns/rdata/generic/isdn_20.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/key_25.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2013,2015,2016,2017,2018
+./lib/dns/rdata/generic/key_25.h		C	1999,2000,2001,2004,2005,2007,2015,2016,2018
+./lib/dns/rdata/generic/keydata_65533.c		C	2009,2011,2012,2013,2015,2016,2017,2018
+./lib/dns/rdata/generic/keydata_65533.h		C	2009,2016,2018
+./lib/dns/rdata/generic/l32_105.c		C	2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/l32_105.h		C	2013,2016,2018
+./lib/dns/rdata/generic/l64_106.c		C	2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/l64_106.h		C	2013,2016,2018
 ./lib/dns/rdata/generic/loc_29.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2015,2016,2017,2018
-./lib/dns/rdata/generic/loc_29.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/lp_107.c		C	2013,2015,2016,2017
-./lib/dns/rdata/generic/lp_107.h		C	2013,2016
-./lib/dns/rdata/generic/mb_7.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/mb_7.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/md_3.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/md_3.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/mf_4.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/mf_4.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/mg_8.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/mg_8.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/minfo_14.c		C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/minfo_14.h		C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/mr_9.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/mr_9.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/mx_15.c			C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2012,2015,2016,2017
-./lib/dns/rdata/generic/mx_15.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/naptr_35.c		C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/naptr_35.h		C	1999,2000,2001,2004,2005,2007,2011,2012,2016
-./lib/dns/rdata/generic/nid_104.c		C	2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/nid_104.h		C	2013,2016
-./lib/dns/rdata/generic/ninfo_56.c		C	2015,2016
-./lib/dns/rdata/generic/ninfo_56.h		C	2015,2016
-./lib/dns/rdata/generic/ns_2.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/ns_2.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/nsec3_50.c		C	2008,2009,2011,2012,2014,2015,2016,2017
-./lib/dns/rdata/generic/nsec3_50.h		C	2008,2011,2012,2016
-./lib/dns/rdata/generic/nsec3param_51.c		C	2008,2009,2015,2016,2017
-./lib/dns/rdata/generic/nsec3param_51.h		C	2008,2016
-./lib/dns/rdata/generic/nsec_47.c		C	2003,2004,2007,2008,2009,2011,2015,2016
-./lib/dns/rdata/generic/nsec_47.h		C	2003,2004,2005,2007,2008,2016
-./lib/dns/rdata/generic/null_10.c		C	1998,1999,2000,2001,2002,2004,2007,2009,2011,2012,2015,2016
-./lib/dns/rdata/generic/null_10.h		C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/nxt_30.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2015,2016,2017
-./lib/dns/rdata/generic/nxt_30.h		C	1999,2000,2001,2002,2004,2005,2007,2016
-./lib/dns/rdata/generic/openpgpkey_61.c		C	2014,2015,2016
-./lib/dns/rdata/generic/openpgpkey_61.h		C	2014,2016
-./lib/dns/rdata/generic/opt_41.c		C	1998,1999,2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/opt_41.h		C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/proforma.c		C	1998,1999,2000,2001,2002,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/proforma.h		C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/ptr_12.c		C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2017
-./lib/dns/rdata/generic/ptr_12.h		C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/rkey_57.c		C	2015,2016
-./lib/dns/rdata/generic/rkey_57.h		C	2015,2016
-./lib/dns/rdata/generic/rp_17.c			C	1999,2000,2001,2004,2005,2007,2009,2015,2016
-./lib/dns/rdata/generic/rp_17.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/rrsig_46.c		C	2003,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rdata/generic/rrsig_46.h		C	2003,2004,2005,2007,2016
-./lib/dns/rdata/generic/rt_21.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2014,2015,2016,2017
-./lib/dns/rdata/generic/rt_21.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/sig_24.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017
-./lib/dns/rdata/generic/sig_24.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/sink_40.c		C	2015,2016,2017
-./lib/dns/rdata/generic/sink_40.h		C	2015,2016
-./lib/dns/rdata/generic/smimea_53.c		C	2015,2016
-./lib/dns/rdata/generic/smimea_53.h		C	2015,2016
-./lib/dns/rdata/generic/soa_6.c			C	1998,1999,2000,2001,2002,2004,2007,2009,2011,2012,2014,2015,2016,2017
-./lib/dns/rdata/generic/soa_6.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/spf_99.c		C	1998,1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016
-./lib/dns/rdata/generic/spf_99.h		C	1998,1999,2000,2001,2004,2005,2007,2014,2016
-./lib/dns/rdata/generic/sshfp_44.c		C	2003,2004,2006,2007,2009,2011,2012,2013,2015,2016,2017
-./lib/dns/rdata/generic/sshfp_44.h		C	2003,2004,2005,2006,2007,2016
-./lib/dns/rdata/generic/ta_32768.c		C	2015,2016
-./lib/dns/rdata/generic/ta_32768.h		C	2015,2016
-./lib/dns/rdata/generic/talink_58.c		C	2015,2016
-./lib/dns/rdata/generic/talink_58.h		C	2015,2016
-./lib/dns/rdata/generic/tkey_249.c		C	1999,2000,2001,2002,2003,2004,2007,2009,2011,2012,2014,2015,2016,2017
-./lib/dns/rdata/generic/tkey_249.h		C	1999,2000,2001,2003,2004,2005,2007,2016
-./lib/dns/rdata/generic/tlsa_52.c		C	2012,2014,2015,2016,2017
-./lib/dns/rdata/generic/tlsa_52.h		C	2012,2014,2016
-./lib/dns/rdata/generic/txt_16.c		C	1998,1999,2000,2001,2002,2004,2007,2008,2009,2012,2014,2015,2016
-./lib/dns/rdata/generic/txt_16.h		C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/unspec_103.c		C	1999,2000,2001,2002,2004,2007,2009,2015,2016
-./lib/dns/rdata/generic/unspec_103.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/uri_256.c		C	2011,2012,2014,2015,2016,2017
-./lib/dns/rdata/generic/uri_256.h		C	2011,2012,2016
-./lib/dns/rdata/generic/x25_19.c		C	1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016
-./lib/dns/rdata/generic/x25_19.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/hs_4/a_1.c			C	1999,2000,2001,2002,2004,2007,2009,2014,2015,2016
-./lib/dns/rdata/hs_4/a_1.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/a6_38.c			C	1999,2000,2001,2002,2003,2004,2007,2009,2014,2015,2016,2017
-./lib/dns/rdata/in_1/a6_38.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/a_1.c			C	1998,1999,2000,2001,2002,2004,2007,2009,2014,2015,2016
-./lib/dns/rdata/in_1/a_1.h			C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/aaaa_28.c			C	1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016
-./lib/dns/rdata/in_1/aaaa_28.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/apl_42.c			C	2002,2004,2005,2007,2008,2009,2014,2015,2016
-./lib/dns/rdata/in_1/apl_42.h			C	2002,2004,2005,2007,2016
+./lib/dns/rdata/generic/loc_29.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/lp_107.c		C	2013,2015,2016,2017,2018
+./lib/dns/rdata/generic/lp_107.h		C	2013,2016,2018
+./lib/dns/rdata/generic/mb_7.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/mb_7.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/md_3.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/md_3.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/mf_4.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/mf_4.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/mg_8.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/mg_8.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/minfo_14.c		C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/minfo_14.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/mr_9.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/mr_9.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/mx_15.c			C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2012,2015,2016,2017,2018
+./lib/dns/rdata/generic/mx_15.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/naptr_35.c		C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/naptr_35.h		C	1999,2000,2001,2004,2005,2007,2011,2012,2016,2018
+./lib/dns/rdata/generic/nid_104.c		C	2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/nid_104.h		C	2013,2016,2018
+./lib/dns/rdata/generic/ninfo_56.c		C	2015,2016,2018
+./lib/dns/rdata/generic/ninfo_56.h		C	2015,2016,2018
+./lib/dns/rdata/generic/ns_2.c			C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/ns_2.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/nsec3_50.c		C	2008,2009,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/nsec3_50.h		C	2008,2011,2012,2016,2018
+./lib/dns/rdata/generic/nsec3param_51.c		C	2008,2009,2015,2016,2017,2018
+./lib/dns/rdata/generic/nsec3param_51.h		C	2008,2016,2018
+./lib/dns/rdata/generic/nsec_47.c		C	2003,2004,2007,2008,2009,2011,2015,2016,2018
+./lib/dns/rdata/generic/nsec_47.h		C	2003,2004,2005,2007,2008,2016,2018
+./lib/dns/rdata/generic/null_10.c		C	1998,1999,2000,2001,2002,2004,2007,2009,2011,2012,2015,2016,2018
+./lib/dns/rdata/generic/null_10.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/nxt_30.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2015,2016,2017,2018
+./lib/dns/rdata/generic/nxt_30.h		C	1999,2000,2001,2002,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/openpgpkey_61.c		C	2014,2015,2016,2018
+./lib/dns/rdata/generic/openpgpkey_61.h		C	2014,2016,2018
+./lib/dns/rdata/generic/opt_41.c		C	1998,1999,2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/opt_41.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/proforma.c		C	1998,1999,2000,2001,2002,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/proforma.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/ptr_12.c		C	1998,1999,2000,2001,2004,2007,2009,2015,2016,2017,2018
+./lib/dns/rdata/generic/ptr_12.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/rkey_57.c		C	2015,2016,2018
+./lib/dns/rdata/generic/rkey_57.h		C	2015,2016,2018
+./lib/dns/rdata/generic/rp_17.c			C	1999,2000,2001,2004,2005,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/rp_17.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/rrsig_46.c		C	2003,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/rrsig_46.h		C	2003,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/rt_21.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/rt_21.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/sig_24.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017,2018
+./lib/dns/rdata/generic/sig_24.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/sink_40.c		C	2015,2016,2017,2018
+./lib/dns/rdata/generic/sink_40.h		C	2015,2016,2018
+./lib/dns/rdata/generic/smimea_53.c		C	2015,2016,2018
+./lib/dns/rdata/generic/smimea_53.h		C	2015,2016,2018
+./lib/dns/rdata/generic/soa_6.c			C	1998,1999,2000,2001,2002,2004,2007,2009,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/soa_6.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/spf_99.c		C	1998,1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016,2018
+./lib/dns/rdata/generic/spf_99.h		C	1998,1999,2000,2001,2004,2005,2007,2014,2016,2018
+./lib/dns/rdata/generic/sshfp_44.c		C	2003,2004,2006,2007,2009,2011,2012,2013,2015,2016,2017,2018
+./lib/dns/rdata/generic/sshfp_44.h		C	2003,2004,2005,2006,2007,2016,2018
+./lib/dns/rdata/generic/ta_32768.c		C	2015,2016,2018
+./lib/dns/rdata/generic/ta_32768.h		C	2015,2016,2018
+./lib/dns/rdata/generic/talink_58.c		C	2015,2016,2018
+./lib/dns/rdata/generic/talink_58.h		C	2015,2016,2018
+./lib/dns/rdata/generic/tkey_249.c		C	1999,2000,2001,2002,2003,2004,2007,2009,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/tkey_249.h		C	1999,2000,2001,2003,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/tlsa_52.c		C	2012,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/tlsa_52.h		C	2012,2014,2016,2018
+./lib/dns/rdata/generic/txt_16.c		C	1998,1999,2000,2001,2002,2004,2007,2008,2009,2012,2014,2015,2016,2018
+./lib/dns/rdata/generic/txt_16.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/unspec_103.c		C	1999,2000,2001,2002,2004,2007,2009,2015,2016,2018
+./lib/dns/rdata/generic/unspec_103.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/generic/uri_256.c		C	2011,2012,2014,2015,2016,2017,2018
+./lib/dns/rdata/generic/uri_256.h		C	2011,2012,2016,2018
+./lib/dns/rdata/generic/x25_19.c		C	1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016,2018
+./lib/dns/rdata/generic/x25_19.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/hs_4/a_1.c			C	1999,2000,2001,2002,2004,2007,2009,2014,2015,2016,2018
+./lib/dns/rdata/hs_4/a_1.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/a6_38.c			C	1999,2000,2001,2002,2003,2004,2007,2009,2014,2015,2016,2017,2018
+./lib/dns/rdata/in_1/a6_38.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/a_1.c			C	1998,1999,2000,2001,2002,2004,2007,2009,2014,2015,2016,2018
+./lib/dns/rdata/in_1/a_1.h			C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/aaaa_28.c			C	1999,2000,2001,2002,2004,2005,2007,2009,2014,2015,2016,2018
+./lib/dns/rdata/in_1/aaaa_28.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/apl_42.c			C	2002,2004,2005,2007,2008,2009,2014,2015,2016,2018
+./lib/dns/rdata/in_1/apl_42.h			C	2002,2004,2005,2007,2016,2018
 ./lib/dns/rdata/in_1/dhcid_49.c			C	2006,2007,2009,2011,2012,2015,2016,2017,2018
-./lib/dns/rdata/in_1/dhcid_49.h			C	2006,2007,2016
-./lib/dns/rdata/in_1/kx_36.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017
-./lib/dns/rdata/in_1/kx_36.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/nsap-ptr_23.c		C	1999,2000,2001,2004,2005,2007,2009,2015,2016
-./lib/dns/rdata/in_1/nsap-ptr_23.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/nsap_22.c			C	1999,2000,2001,2002,2004,2005,2007,2009,2013,2015,2016,2017
-./lib/dns/rdata/in_1/nsap_22.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/px_26.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017
-./lib/dns/rdata/in_1/px_26.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/srv_33.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2015,2016
-./lib/dns/rdata/in_1/srv_33.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/in_1/wks_11.c			C	1999,2000,2001,2002,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rdata/in_1/wks_11.h			C	1999,2000,2001,2004,2007,2016
-./lib/dns/rdata/rdatastructpre.h		C	1999,2000,2001,2004,2007,2016
-./lib/dns/rdata/rdatastructsuf.h		C	1999,2000,2001,2004,2007,2016
-./lib/dns/rdatalist.c				C	1999,2000,2001,2003,2004,2005,2007,2008,2010,2011,2012,2014,2015,2016,2017
-./lib/dns/rdatalist_p.h				C	2000,2001,2004,2005,2007,2008,2015,2016
-./lib/dns/rdataset.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017
-./lib/dns/rdatasetiter.c			C	1999,2000,2001,2004,2005,2007,2016
+./lib/dns/rdata/in_1/dhcid_49.h			C	2006,2007,2016,2018
+./lib/dns/rdata/in_1/kx_36.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017,2018
+./lib/dns/rdata/in_1/kx_36.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/nsap-ptr_23.c		C	1999,2000,2001,2004,2005,2007,2009,2015,2016,2018
+./lib/dns/rdata/in_1/nsap-ptr_23.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/nsap_22.c			C	1999,2000,2001,2002,2004,2005,2007,2009,2013,2015,2016,2017,2018
+./lib/dns/rdata/in_1/nsap_22.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/px_26.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017,2018
+./lib/dns/rdata/in_1/px_26.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/srv_33.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2018
+./lib/dns/rdata/in_1/srv_33.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/dns/rdata/in_1/wks_11.c			C	1999,2000,2001,2002,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/rdata/in_1/wks_11.h			C	1999,2000,2001,2004,2007,2016,2018
+./lib/dns/rdata/rdatastructpre.h		C	1999,2000,2001,2004,2007,2016,2018
+./lib/dns/rdata/rdatastructsuf.h		C	1999,2000,2001,2004,2007,2016,2018
+./lib/dns/rdatalist.c				C	1999,2000,2001,2003,2004,2005,2007,2008,2010,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/rdatalist_p.h				C	2000,2001,2004,2005,2007,2008,2015,2016,2018
+./lib/dns/rdataset.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
+./lib/dns/rdatasetiter.c			C	1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/dns/rdataslab.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/request.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
 ./lib/dns/resolver.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/result.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rootns.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2010,2012,2013,2014,2015,2016,2017
+./lib/dns/result.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/rootns.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2010,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rpz.c					C	2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/rriterator.c				C	2009,2011,2012,2015,2016
+./lib/dns/rriterator.c				C	2009,2011,2012,2015,2016,2018
 ./lib/dns/rrl.c					C	2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/sdb.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/sdlz.c				C.PORTION	1999,2000,2001,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/soa.c					C	2000,2001,2004,2005,2007,2009,2016
-./lib/dns/spnego.asn1				X	2006
+./lib/dns/soa.c					C	2000,2001,2004,2005,2007,2009,2016,2018
+./lib/dns/spnego.asn1				X	2006,2018
 ./lib/dns/spnego.c				C	2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/spnego.h				C	2006,2007,2016
+./lib/dns/spnego.h				C	2006,2007,2016,2018
 ./lib/dns/spnego_asn1.c				C	2006,2007,2012,2013,2015,2016,2018
-./lib/dns/spnego_asn1.pl			PERL	2006,2007,2012,2016
+./lib/dns/spnego_asn1.pl			PERL	2006,2007,2012,2016,2018
 ./lib/dns/ssu.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2010,2011,2013,2014,2016,2017,2018
-./lib/dns/ssu_external.c			C	2011,2012,2013,2016,2017
-./lib/dns/stats.c				C	2000,2001,2004,2005,2007,2008,2009,2012,2016
+./lib/dns/ssu_external.c			C	2011,2012,2013,2016,2017,2018
+./lib/dns/stats.c				C	2000,2001,2004,2005,2007,2008,2009,2012,2016,2018
 ./lib/dns/tcpmsg.c				C	1999,2000,2001,2004,2005,2006,2007,2015,2016,2018
-./lib/dns/tests/Atffile				X	2011,2017
-./lib/dns/tests/Kdh.+002+18602.key		X	2014
-./lib/dns/tests/Krsa.+005+29235.key		X	2016
-./lib/dns/tests/Kyuafile			X	2017
-./lib/dns/tests/Makefile.in			MAKE	2011,2012,2013,2014,2015,2016,2017
-./lib/dns/tests/acl_test.c			C	2016
-./lib/dns/tests/db_test.c			C	2013,2015,2016,2017
-./lib/dns/tests/dbdiff_test.c			C	2011,2012,2016,2017
-./lib/dns/tests/dbiterator_test.c		C	2011,2012,2016
-./lib/dns/tests/dbversion_test.c		C	2011,2012,2014,2015,2016
-./lib/dns/tests/dh_test.c			C	2014,2016
+./lib/dns/tests/Atffile				X	2011,2017,2018
+./lib/dns/tests/Kdh.+002+18602.key		X	2014,2018
+./lib/dns/tests/Krsa.+005+29235.key		X	2016,2018
+./lib/dns/tests/Kyuafile			X	2017,2018
+./lib/dns/tests/Makefile.in			MAKE	2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/tests/acl_test.c			C	2016,2018
+./lib/dns/tests/db_test.c			C	2013,2015,2016,2017,2018
+./lib/dns/tests/dbdiff_test.c			C	2011,2012,2016,2017,2018
+./lib/dns/tests/dbiterator_test.c		C	2011,2012,2016,2018
+./lib/dns/tests/dbversion_test.c		C	2011,2012,2014,2015,2016,2018
+./lib/dns/tests/dh_test.c			C	2014,2016,2018
 ./lib/dns/tests/dispatch_test.c			C	2012,2014,2016,2018
-./lib/dns/tests/dnstap_test.c			C	2015,2016,2017
-./lib/dns/tests/dnstest.c			C	2011,2012,2013,2014,2015,2016,2017
-./lib/dns/tests/dnstest.h			C	2011,2012,2014,2015,2016,2017
-./lib/dns/tests/dstrandom_test.c		C	2017
-./lib/dns/tests/geoip_test.c			C	2013,2014,2015,2016,2017
-./lib/dns/tests/gost_test.c			C	2014,2015,2016,2017
-./lib/dns/tests/keytable_test.c			C	2014,2015,2016,2017
-./lib/dns/tests/master_test.c			C	2011,2012,2013,2015,2016,2017
-./lib/dns/tests/mkraw.pl			PERL	2011,2012,2016
+./lib/dns/tests/dnstap_test.c			C	2015,2016,2017,2018
+./lib/dns/tests/dnstest.c			C	2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/tests/dnstest.h			C	2011,2012,2014,2015,2016,2017,2018
+./lib/dns/tests/dstrandom_test.c		C	2017,2018
+./lib/dns/tests/geoip_test.c			C	2013,2014,2015,2016,2017,2018
+./lib/dns/tests/gost_test.c			C	2014,2015,2016,2017,2018
+./lib/dns/tests/keytable_test.c			C	2014,2015,2016,2017,2018
+./lib/dns/tests/master_test.c			C	2011,2012,2013,2015,2016,2017,2018
+./lib/dns/tests/mkraw.pl			PERL	2011,2012,2016,2018
 ./lib/dns/tests/name_test.c			C	2014,2015,2016,2017,2018
-./lib/dns/tests/nsec3_test.c			C	2012,2014,2015,2016,2017
-./lib/dns/tests/peer_test.c			C	2014,2016
-./lib/dns/tests/private_test.c			C	2011,2012,2016
-./lib/dns/tests/rbt_serialize_test.c		C	2014,2015,2016
-./lib/dns/tests/rbt_test.c			C	2012,2013,2014,2015,2016,2017
-./lib/dns/tests/rdata_test.c			C	2012,2013,2015,2016,2017
-./lib/dns/tests/rdataset_test.c			C	2012,2016
+./lib/dns/tests/nsec3_test.c			C	2012,2014,2015,2016,2017,2018
+./lib/dns/tests/peer_test.c			C	2014,2016,2018
+./lib/dns/tests/private_test.c			C	2011,2012,2016,2018
+./lib/dns/tests/rbt_serialize_test.c		C	2014,2015,2016,2018
+./lib/dns/tests/rbt_test.c			C	2012,2013,2014,2015,2016,2017,2018
+./lib/dns/tests/rdata_test.c			C	2012,2013,2015,2016,2017,2018
+./lib/dns/tests/rdataset_test.c			C	2012,2016,2018
 ./lib/dns/tests/rdatasetstats_test.c		C	2012,2015,2016,2018
-./lib/dns/tests/rsa_test.c			C	2016
-./lib/dns/tests/testdata/dbiterator/zone1.data	ZONE	2011,2012,2016
-./lib/dns/tests/testdata/dbiterator/zone2.data	X	2011
-./lib/dns/tests/testdata/diff/zone1.data	ZONE	2011,2012,2016
-./lib/dns/tests/testdata/diff/zone2.data	ZONE	2011,2012,2016
-./lib/dns/tests/testdata/diff/zone3.data	ZONE	2011,2012,2016
-./lib/dns/tests/testdata/dnstap/dnstap.saved	X	2015,2017
-./lib/dns/tests/testdata/dnstap/dnstap.text	X	2015,2017
-./lib/dns/tests/testdata/dnstap/query.auth	X	2015
-./lib/dns/tests/testdata/dnstap/query.recursive	X	2015
-./lib/dns/tests/testdata/dnstap/response.auth	X	2015
-./lib/dns/tests/testdata/dnstap/response.recursive	X	2015
-./lib/dns/tests/testdata/dstrandom/random.data	X	2017
-./lib/dns/tests/testdata/master/.gitignore	X	2012
-./lib/dns/tests/testdata/master/master1.data	X	2011
-./lib/dns/tests/testdata/master/master10.data	X	2011
-./lib/dns/tests/testdata/master/master11.data	X	2011
-./lib/dns/tests/testdata/master/master12.data.in	X	2011
-./lib/dns/tests/testdata/master/master13.data.in	X	2011
-./lib/dns/tests/testdata/master/master14.data.in	X	2011
-./lib/dns/tests/testdata/master/master15.data	X	2012
-./lib/dns/tests/testdata/master/master16.data	X	2012
-./lib/dns/tests/testdata/master/master17.data	X	2012
-./lib/dns/tests/testdata/master/master2.data	X	2011
-./lib/dns/tests/testdata/master/master3.data	X	2011
-./lib/dns/tests/testdata/master/master4.data	X	2011
-./lib/dns/tests/testdata/master/master5.data	X	2011
-./lib/dns/tests/testdata/master/master6.data	X	2011
-./lib/dns/tests/testdata/master/master7.data	X	2011
-./lib/dns/tests/testdata/master/master8.data	X	2011
-./lib/dns/tests/testdata/master/master9.data	X	2011
-./lib/dns/tests/testdata/nsec3/1024.db		ZONE	2012,2016
-./lib/dns/tests/testdata/nsec3/2048.db		ZONE	2012,2016
-./lib/dns/tests/testdata/nsec3/4096.db		ZONE	2012,2016
-./lib/dns/tests/testdata/nsec3/min-1024.db	ZONE	2012,2016
-./lib/dns/tests/testdata/nsec3/min-2048.db	ZONE	2012,2016
-./lib/dns/tests/testdata/zt/zone1.db		ZONE	2011,2012,2016
-./lib/dns/tests/time_test.c			C	2011,2012,2016
-./lib/dns/tests/tsig_test.c			C	2017
-./lib/dns/tests/update_test.c			C	2011,2012,2014,2016,2017
-./lib/dns/tests/zonemgr_test.c			C	2011,2012,2013,2015,2016
-./lib/dns/tests/zt_test.c			C	2011,2012,2016
-./lib/dns/time.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2014,2016,2017
-./lib/dns/timer.c				C	2000,2001,2004,2005,2007,2016
-./lib/dns/tkey.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
-./lib/dns/tsec.c				C	2009,2010,2016,2017
-./lib/dns/tsig.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/tsig_p.h				C	2017
-./lib/dns/ttl.c					C	1999,2000,2001,2004,2005,2007,2011,2012,2013,2014,2016,2017
+./lib/dns/tests/rsa_test.c			C	2016,2018
+./lib/dns/tests/testdata/dbiterator/zone1.data	ZONE	2011,2012,2016,2018
+./lib/dns/tests/testdata/dbiterator/zone2.data	X	2011,2018
+./lib/dns/tests/testdata/diff/zone1.data	ZONE	2011,2012,2016,2018
+./lib/dns/tests/testdata/diff/zone2.data	ZONE	2011,2012,2016,2018
+./lib/dns/tests/testdata/diff/zone3.data	ZONE	2011,2012,2016,2018
+./lib/dns/tests/testdata/dnstap/dnstap.saved	X	2015,2017,2018
+./lib/dns/tests/testdata/dnstap/dnstap.text	X	2015,2017,2018
+./lib/dns/tests/testdata/dnstap/query.auth	X	2015,2018
+./lib/dns/tests/testdata/dnstap/query.recursive	X	2015,2018
+./lib/dns/tests/testdata/dnstap/response.auth	X	2015,2018
+./lib/dns/tests/testdata/dnstap/response.recursive	X	2015,2018
+./lib/dns/tests/testdata/dstrandom/random.data	X	2017,2018
+./lib/dns/tests/testdata/master/.gitignore	X	2012,2018
+./lib/dns/tests/testdata/master/master1.data	X	2011,2018
+./lib/dns/tests/testdata/master/master10.data	X	2011,2018
+./lib/dns/tests/testdata/master/master11.data	X	2011,2018
+./lib/dns/tests/testdata/master/master12.data.in	X	2011,2018
+./lib/dns/tests/testdata/master/master13.data.in	X	2011,2018
+./lib/dns/tests/testdata/master/master14.data.in	X	2011,2018
+./lib/dns/tests/testdata/master/master15.data	X	2012,2018
+./lib/dns/tests/testdata/master/master16.data	X	2012,2018
+./lib/dns/tests/testdata/master/master17.data	X	2012,2018
+./lib/dns/tests/testdata/master/master2.data	X	2011,2018
+./lib/dns/tests/testdata/master/master3.data	X	2011,2018
+./lib/dns/tests/testdata/master/master4.data	X	2011,2018
+./lib/dns/tests/testdata/master/master5.data	X	2011,2018
+./lib/dns/tests/testdata/master/master6.data	X	2011,2018
+./lib/dns/tests/testdata/master/master7.data	X	2011,2018
+./lib/dns/tests/testdata/master/master8.data	X	2011,2018
+./lib/dns/tests/testdata/master/master9.data	X	2011,2018
+./lib/dns/tests/testdata/nsec3/1024.db		ZONE	2012,2016,2018
+./lib/dns/tests/testdata/nsec3/2048.db		ZONE	2012,2016,2018
+./lib/dns/tests/testdata/nsec3/4096.db		ZONE	2012,2016,2018
+./lib/dns/tests/testdata/nsec3/min-1024.db	ZONE	2012,2016,2018
+./lib/dns/tests/testdata/nsec3/min-2048.db	ZONE	2012,2016,2018
+./lib/dns/tests/testdata/zt/zone1.db		ZONE	2011,2012,2016,2018
+./lib/dns/tests/time_test.c			C	2011,2012,2016,2018
+./lib/dns/tests/tsig_test.c			C	2017,2018
+./lib/dns/tests/update_test.c			C	2011,2012,2014,2016,2017,2018
+./lib/dns/tests/zonemgr_test.c			C	2011,2012,2013,2015,2016,2018
+./lib/dns/tests/zt_test.c			C	2011,2012,2016,2018
+./lib/dns/time.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2014,2016,2017,2018
+./lib/dns/timer.c				C	2000,2001,2004,2005,2007,2016,2018
+./lib/dns/tkey.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
+./lib/dns/tsec.c				C	2009,2010,2016,2017,2018
+./lib/dns/tsig.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/tsig_p.h				C	2017,2018
+./lib/dns/ttl.c					C	1999,2000,2001,2004,2005,2007,2011,2012,2013,2014,2016,2017,2018
 ./lib/dns/update.c				C	2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/validator.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/version.c				C	1998,1999,2000,2001,2004,2005,2007,2012,2013,2016
-./lib/dns/view.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/win32/DLLMain.c			C	2001,2004,2007,2016
-./lib/dns/win32/gen.vcxproj.filters.in		X	2013,2015
-./lib/dns/win32/gen.vcxproj.in			X	2013,2015,2016,2017
-./lib/dns/win32/gen.vcxproj.user		X	2013
+./lib/dns/version.c				C	1998,1999,2000,2001,2004,2005,2007,2012,2013,2016,2018
+./lib/dns/view.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/win32/DLLMain.c			C	2001,2004,2007,2016,2018
+./lib/dns/win32/gen.vcxproj.filters.in		X	2013,2015,2018
+./lib/dns/win32/gen.vcxproj.in			X	2013,2015,2016,2017,2018
+./lib/dns/win32/gen.vcxproj.user		X	2013,2018
 ./lib/dns/win32/libdns.def.in			X	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/win32/libdns.vcxproj.filters.in	X	2013,2014,2015,2016,2017
-./lib/dns/win32/libdns.vcxproj.in		X	2013,2014,2015,2016,2017
-./lib/dns/win32/libdns.vcxproj.user		X	2013
-./lib/dns/win32/version.c			C	1998,1999,2000,2001,2004,2007,2013,2016
-./lib/dns/xfrin.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/win32/libdns.vcxproj.filters.in	X	2013,2014,2015,2016,2017,2018
+./lib/dns/win32/libdns.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./lib/dns/win32/libdns.vcxproj.user		X	2013,2018
+./lib/dns/win32/version.c			C	1998,1999,2000,2001,2004,2007,2013,2016,2018
+./lib/dns/xfrin.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/zone.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/zonekey.c				C	2001,2003,2004,2005,2007,2016
-./lib/dns/zt.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016,2017
-./lib/irs/Atffile				X	2016
-./lib/irs/Kyuafile				X	2017
-./lib/irs/Makefile.in				MAKE	2009,2012,2014,2015,2016,2017
+./lib/dns/zonekey.c				C	2001,2003,2004,2005,2007,2016,2018
+./lib/dns/zt.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/irs/Atffile				X	2016,2018
+./lib/irs/Kyuafile				X	2017,2018
+./lib/irs/Makefile.in				MAKE	2009,2012,2014,2015,2016,2017,2018
 ./lib/irs/api					X	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/irs/context.c				C	2009,2014,2016
-./lib/irs/dnsconf.c				C	2009,2012,2016
-./lib/irs/gai_strerror.c			C	2009,2014,2016
-./lib/irs/getaddrinfo.c				C	2009,2012,2013,2014,2015,2016,2017
-./lib/irs/getnameinfo.c				C	2009,2011,2012,2013,2014,2016,2017
-./lib/irs/include/Makefile.in			MAKE	2009,2012,2016
-./lib/irs/include/irs/Makefile.in		MAKE	2009,2012,2014,2016
-./lib/irs/include/irs/context.h			C	2009,2016
-./lib/irs/include/irs/dnsconf.h			C	2009,2016
-./lib/irs/include/irs/netdb.h.in		C	2009,2016,2017
-./lib/irs/include/irs/platform.h.in		C	2009,2016
-./lib/irs/include/irs/resconf.h			C	2009,2014,2016
-./lib/irs/include/irs/types.h			C	2009,2016
-./lib/irs/include/irs/version.h			C	2009,2016
-./lib/irs/resconf.c				C	2009,2011,2012,2014,2015,2016,2017
-./lib/irs/tests/Atffile				X	2016,2017
-./lib/irs/tests/Kyuafile			X	2017
-./lib/irs/tests/Makefile.in			MAKE	2016,2017
-./lib/irs/tests/resconf_test.c			C	2016
-./lib/irs/tests/testdata/domain.conf		CONF-SH	2016
-./lib/irs/tests/testdata/nameserver-v4.conf	CONF-SH	2016
-./lib/irs/tests/testdata/nameserver-v6.conf	CONF-SH	2016
-./lib/irs/tests/testdata/options-debug.conf	CONF-SH	2016
-./lib/irs/tests/testdata/options-ndots.conf	CONF-SH	2016
-./lib/irs/tests/testdata/options-timeout.conf	CONF-SH	2016
-./lib/irs/tests/testdata/options-unknown.conf	CONF-SH	2016
-./lib/irs/tests/testdata/options.conf		CONF-SH	2016
-./lib/irs/tests/testdata/port.conf		CONF-SH	2016
-./lib/irs/tests/testdata/resolv.conf		CONF-SH	2016
-./lib/irs/tests/testdata/search.conf		CONF-SH	2016
-./lib/irs/tests/testdata/sortlist-v4.conf	CONF-SH	2016
-./lib/irs/tests/testdata/timeout.conf		CONF-SH	2016
-./lib/irs/tests/testdata/unknown.conf		CONF-SH	2016
-./lib/irs/version.c				C	2009,2016
-./lib/irs/win32/DLLMain.c			C	2014,2016
-./lib/irs/win32/Makefile.in			MAKE	2014,2016
-./lib/irs/win32/include/Makefile.in		MAKE	2014,2016
-./lib/irs/win32/include/irs/.gitignore		X	2014
-./lib/irs/win32/include/irs/Makefile.in		MAKE	2014,2016
-./lib/irs/win32/include/irs/netdb.h		C	2014,2016,2017
-./lib/irs/win32/include/irs/platform.h		C	2014,2016
-./lib/irs/win32/libirs.def			X	2014
-./lib/irs/win32/libirs.vcxproj.filters.in	X	2014,2015,2016
-./lib/irs/win32/libirs.vcxproj.in		X	2014,2015,2016,2017
-./lib/irs/win32/libirs.vcxproj.user		X	2014
-./lib/irs/win32/version.c			C	2014,2016
-./lib/isc/.gitignore				X	2014
-./lib/isc/Atffile				X	2011
-./lib/isc/Kyuafile				X	2017
+./lib/irs/context.c				C	2009,2014,2016,2018
+./lib/irs/dnsconf.c				C	2009,2012,2016,2018
+./lib/irs/gai_strerror.c			C	2009,2014,2016,2018
+./lib/irs/getaddrinfo.c				C	2009,2012,2013,2014,2015,2016,2017,2018
+./lib/irs/getnameinfo.c				C	2009,2011,2012,2013,2014,2016,2017,2018
+./lib/irs/include/Makefile.in			MAKE	2009,2012,2016,2018
+./lib/irs/include/irs/Makefile.in		MAKE	2009,2012,2014,2016,2018
+./lib/irs/include/irs/context.h			C	2009,2016,2018
+./lib/irs/include/irs/dnsconf.h			C	2009,2016,2018
+./lib/irs/include/irs/netdb.h.in		C	2009,2016,2017,2018
+./lib/irs/include/irs/platform.h.in		C	2009,2016,2018
+./lib/irs/include/irs/resconf.h			C	2009,2014,2016,2018
+./lib/irs/include/irs/types.h			C	2009,2016,2018
+./lib/irs/include/irs/version.h			C	2009,2016,2018
+./lib/irs/resconf.c				C	2009,2011,2012,2014,2015,2016,2017,2018
+./lib/irs/tests/Atffile				X	2016,2017,2018
+./lib/irs/tests/Kyuafile			X	2017,2018
+./lib/irs/tests/Makefile.in			MAKE	2016,2017,2018
+./lib/irs/tests/resconf_test.c			C	2016,2018
+./lib/irs/tests/testdata/domain.conf		CONF-SH	2016,2018
+./lib/irs/tests/testdata/nameserver-v4.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/nameserver-v6.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/options-debug.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/options-ndots.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/options-timeout.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/options-unknown.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/options.conf		CONF-SH	2016,2018
+./lib/irs/tests/testdata/port.conf		CONF-SH	2016,2018
+./lib/irs/tests/testdata/resolv.conf		CONF-SH	2016,2018
+./lib/irs/tests/testdata/search.conf		CONF-SH	2016,2018
+./lib/irs/tests/testdata/sortlist-v4.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/timeout.conf		CONF-SH	2016,2018
+./lib/irs/tests/testdata/unknown.conf		CONF-SH	2016,2018
+./lib/irs/version.c				C	2009,2016,2018
+./lib/irs/win32/DLLMain.c			C	2014,2016,2018
+./lib/irs/win32/Makefile.in			MAKE	2014,2016,2018
+./lib/irs/win32/include/Makefile.in		MAKE	2014,2016,2018
+./lib/irs/win32/include/irs/.gitignore		X	2014,2018
+./lib/irs/win32/include/irs/Makefile.in		MAKE	2014,2016,2018
+./lib/irs/win32/include/irs/netdb.h		C	2014,2016,2017,2018
+./lib/irs/win32/include/irs/platform.h		C	2014,2016,2018
+./lib/irs/win32/libirs.def			X	2014,2018
+./lib/irs/win32/libirs.vcxproj.filters.in	X	2014,2015,2016,2018
+./lib/irs/win32/libirs.vcxproj.in		X	2014,2015,2016,2017,2018
+./lib/irs/win32/libirs.vcxproj.user		X	2014,2018
+./lib/irs/win32/version.c			C	2014,2016,2018
+./lib/isc/.gitignore				X	2014,2018
+./lib/isc/Atffile				X	2011,2018
+./lib/isc/Kyuafile				X	2017,2018
 ./lib/isc/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/aes.c					C	2014,2016,2017
-./lib/isc/alpha/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/alpha/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/alpha/include/isc/Makefile.in		MAKE	2007,2012,2015,2016
-./lib/isc/alpha/include/isc/atomic.h		C	2005,2007,2009,2016
+./lib/isc/aes.c					C	2014,2016,2017,2018
+./lib/isc/alpha/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/alpha/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/alpha/include/isc/Makefile.in		MAKE	2007,2012,2015,2016,2018
+./lib/isc/alpha/include/isc/atomic.h		C	2005,2007,2009,2016,2018
 ./lib/isc/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/app_api.c				C	2009,2013,2014,2015,2016
-./lib/isc/assertions.c				C	1997,1998,1999,2000,2001,2004,2005,2007,2008,2009,2015,2016
-./lib/isc/backtrace-emptytbl.c			C	2009,2016
-./lib/isc/backtrace.c				C	2009,2013,2014,2015,2016
-./lib/isc/base32.c				C	2008,2009,2013,2014,2015,2016
-./lib/isc/base64.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2013,2014,2015,2016
-./lib/isc/bind9.c				C	2013,2016
-./lib/isc/buffer.c				C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015,2016,2017
-./lib/isc/bufferlist.c				C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/chacha_private.h			X	2014
-./lib/isc/commandline.c				C.PORTION	1999,2000,2001,2004,2005,2007,2008,2014,2015,2016
-./lib/isc/counter.c				C	2014,2016
-./lib/isc/crc64.c				C	2013,2016
-./lib/isc/entropy.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2014,2015,2016,2017
-./lib/isc/error.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016
-./lib/isc/event.c				C	1998,1999,2000,2001,2004,2005,2007,2014,2016,2017
-./lib/isc/fsaccess.c				C	2000,2001,2004,2005,2007,2016,2017
-./lib/isc/hash.c				C	2003,2004,2005,2006,2007,2009,2013,2014,2015,2016,2017
-./lib/isc/heap.c				C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/isc/hex.c					C	2000,2001,2002,2003,2004,2005,2007,2008,2013,2014,2015,2016
+./lib/isc/app_api.c				C	2009,2013,2014,2015,2016,2018
+./lib/isc/assertions.c				C	1997,1998,1999,2000,2001,2004,2005,2007,2008,2009,2015,2016,2018
+./lib/isc/backtrace-emptytbl.c			C	2009,2016,2018
+./lib/isc/backtrace.c				C	2009,2013,2014,2015,2016,2018
+./lib/isc/base32.c				C	2008,2009,2013,2014,2015,2016,2018
+./lib/isc/base64.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2013,2014,2015,2016,2018
+./lib/isc/bind9.c				C	2013,2016,2018
+./lib/isc/buffer.c				C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015,2016,2017,2018
+./lib/isc/bufferlist.c				C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/chacha_private.h			X	2014,2018
+./lib/isc/commandline.c				C.PORTION	1999,2000,2001,2004,2005,2007,2008,2014,2015,2016,2018
+./lib/isc/counter.c				C	2014,2016,2018
+./lib/isc/crc64.c				C	2013,2016,2018
+./lib/isc/entropy.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2014,2015,2016,2017,2018
+./lib/isc/error.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016,2018
+./lib/isc/event.c				C	1998,1999,2000,2001,2004,2005,2007,2014,2016,2017,2018
+./lib/isc/fsaccess.c				C	2000,2001,2004,2005,2007,2016,2017,2018
+./lib/isc/hash.c				C	2003,2004,2005,2006,2007,2009,2013,2014,2015,2016,2017,2018
+./lib/isc/heap.c				C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/hex.c					C	2000,2001,2002,2003,2004,2005,2007,2008,2013,2014,2015,2016,2018
 ./lib/isc/hmacmd5.c				C	2000,2001,2004,2005,2006,2007,2009,2013,2014,2015,2016,2017,2018
 ./lib/isc/hmacsha.c				C	2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/ht.c					C	2016,2017,2018
-./lib/isc/httpd.c				C	2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/isc/ia64/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/ia64/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/ia64/include/isc/Makefile.in		MAKE	2007,2012,2015,2016
-./lib/isc/ia64/include/isc/atomic.h		C	2006,2007,2009,2012,2016
-./lib/isc/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2014,2016
+./lib/isc/httpd.c				C	2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/ia64/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/ia64/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/ia64/include/isc/Makefile.in		MAKE	2007,2012,2015,2016,2018
+./lib/isc/ia64/include/isc/atomic.h		C	2006,2007,2009,2012,2016,2018
+./lib/isc/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2014,2016,2018
 ./lib/isc/include/isc/Makefile.in		MAKE	1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/include/isc/aes.h			C	2014,2016
-./lib/isc/include/isc/app.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2013,2014,2015,2016
-./lib/isc/include/isc/assertions.h		C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2016,2017
-./lib/isc/include/isc/backtrace.h		C	2009,2016
-./lib/isc/include/isc/base32.h			C	2008,2014,2016
-./lib/isc/include/isc/base64.h			C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/bind9.h			C	2009,2013,2016
-./lib/isc/include/isc/boolean.h			C	1998,1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/buffer.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2010,2012,2014,2016,2017
-./lib/isc/include/isc/bufferlist.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/commandline.h		C	1999,2000,2001,2004,2005,2006,2007,2015,2016
-./lib/isc/include/isc/counter.h			C	2014,2016
-./lib/isc/include/isc/crc64.h			C	2013,2016
+./lib/isc/include/isc/aes.h			C	2014,2016,2018
+./lib/isc/include/isc/app.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2013,2014,2015,2016,2018
+./lib/isc/include/isc/assertions.h		C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2016,2017,2018
+./lib/isc/include/isc/backtrace.h		C	2009,2016,2018
+./lib/isc/include/isc/base32.h			C	2008,2014,2016,2018
+./lib/isc/include/isc/base64.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/bind9.h			C	2009,2013,2016,2018
+./lib/isc/include/isc/boolean.h			C	1998,1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/buffer.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2010,2012,2014,2016,2017,2018
+./lib/isc/include/isc/bufferlist.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/commandline.h		C	1999,2000,2001,2004,2005,2006,2007,2015,2016,2018
+./lib/isc/include/isc/counter.h			C	2014,2016,2018
+./lib/isc/include/isc/crc64.h			C	2013,2016,2018
 ./lib/isc/include/isc/deprecated.h		C	2017,2018
-./lib/isc/include/isc/entropy.h			C	2000,2001,2004,2005,2006,2007,2009,2016,2017
-./lib/isc/include/isc/errno.h			C	2016
-./lib/isc/include/isc/error.h			C	1998,1999,2000,2001,2004,2005,2006,2007,2009,2016,2017
-./lib/isc/include/isc/event.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2014,2016,2017
-./lib/isc/include/isc/eventclass.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2017
-./lib/isc/include/isc/file.h			C	2000,2001,2004,2005,2006,2007,2009,2011,2012,2014,2015,2016,2017
-./lib/isc/include/isc/formatcheck.h		C	2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/fsaccess.h		C	2000,2001,2004,2005,2006,2007,2009,2016
-./lib/isc/include/isc/fuzz.h			C	2017
-./lib/isc/include/isc/hash.h			C	2003,2004,2005,2006,2007,2009,2013,2014,2015,2016,2017
-./lib/isc/include/isc/heap.h			C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2012,2016
-./lib/isc/include/isc/hex.h			C	2000,2001,2004,2005,2006,2007,2008,2016
+./lib/isc/include/isc/entropy.h			C	2000,2001,2004,2005,2006,2007,2009,2016,2017,2018
+./lib/isc/include/isc/errno.h			C	2016,2018
+./lib/isc/include/isc/error.h			C	1998,1999,2000,2001,2004,2005,2006,2007,2009,2016,2017,2018
+./lib/isc/include/isc/event.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2014,2016,2017,2018
+./lib/isc/include/isc/eventclass.h		C	1998,1999,2000,2001,2004,2005,2007,2016,2017,2018
+./lib/isc/include/isc/file.h			C	2000,2001,2004,2005,2006,2007,2009,2011,2012,2014,2015,2016,2017,2018
+./lib/isc/include/isc/formatcheck.h		C	2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/fsaccess.h		C	2000,2001,2004,2005,2006,2007,2009,2016,2018
+./lib/isc/include/isc/fuzz.h			C	2017,2018
+./lib/isc/include/isc/hash.h			C	2003,2004,2005,2006,2007,2009,2013,2014,2015,2016,2017,2018
+./lib/isc/include/isc/heap.h			C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2012,2016,2018
+./lib/isc/include/isc/hex.h			C	2000,2001,2004,2005,2006,2007,2008,2016,2018
 ./lib/isc/include/isc/hmacmd5.h			C	2000,2001,2004,2005,2006,2007,2009,2014,2016,2017,2018
 ./lib/isc/include/isc/hmacsha.h			C	2005,2006,2007,2009,2014,2016,2017,2018
-./lib/isc/include/isc/ht.h			C	2016,2017
-./lib/isc/include/isc/httpd.h			C	2006,2007,2008,2014,2016
-./lib/isc/include/isc/interfaceiter.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/ipv6.h			C	1999,2000,2001,2002,2004,2005,2007,2016,2017
-./lib/isc/include/isc/iterated_hash.h		C	2008,2014,2016
-./lib/isc/include/isc/json.h			C	2013,2015,2016
-./lib/isc/include/isc/lang.h			C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/lex.h			C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2015,2016,2017
-./lib/isc/include/isc/lfsr.h			C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016
-./lib/isc/include/isc/likely.h			C	2017
-./lib/isc/include/isc/list.h			C	1997,1998,1999,2000,2001,2002,2004,2006,2007,2011,2012,2013,2016
-./lib/isc/include/isc/log.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2014,2016,2017
-./lib/isc/include/isc/magic.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2017
+./lib/isc/include/isc/ht.h			C	2016,2017,2018
+./lib/isc/include/isc/httpd.h			C	2006,2007,2008,2014,2016,2018
+./lib/isc/include/isc/interfaceiter.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/ipv6.h			C	1999,2000,2001,2002,2004,2005,2007,2016,2017,2018
+./lib/isc/include/isc/iterated_hash.h		C	2008,2014,2016,2018
+./lib/isc/include/isc/json.h			C	2013,2015,2016,2018
+./lib/isc/include/isc/lang.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/lex.h			C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2015,2016,2017,2018
+./lib/isc/include/isc/lfsr.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016,2018
+./lib/isc/include/isc/likely.h			C	2017,2018
+./lib/isc/include/isc/list.h			C	1997,1998,1999,2000,2001,2002,2004,2006,2007,2011,2012,2013,2016,2018
+./lib/isc/include/isc/log.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2014,2016,2017,2018
+./lib/isc/include/isc/magic.h			C	1999,2000,2001,2004,2005,2006,2007,2016,2017,2018
 ./lib/isc/include/isc/md5.h			C	2000,2001,2004,2005,2006,2007,2009,2010,2014,2016,2017,2018
 ./lib/isc/include/isc/mem.h			C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2015,2016,2017,2018
-./lib/isc/include/isc/meminfo.h			C	2015,2016
-./lib/isc/include/isc/msgcat.h			C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/include/isc/msgs.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2016,2017
-./lib/isc/include/isc/mutexblock.h		C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/netaddr.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2009,2015,2016,2017
-./lib/isc/include/isc/netscope.h		C	2002,2004,2005,2006,2007,2009,2016
-./lib/isc/include/isc/os.h			C	2000,2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/parseint.h		C	2001,2002,2004,2005,2006,2007,2016
-./lib/isc/include/isc/platform.h.in		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016,2017
-./lib/isc/include/isc/pool.h			C	2013,2016
-./lib/isc/include/isc/portset.h			C	2008,2009,2016
-./lib/isc/include/isc/print.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2014,2015,2016
-./lib/isc/include/isc/queue.h			C	2011,2012,2013,2016
-./lib/isc/include/isc/quota.h			C	2000,2001,2004,2005,2007,2016
-./lib/isc/include/isc/radix.h			C	2007,2008,2013,2014,2016
-./lib/isc/include/isc/random.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016,2017
-./lib/isc/include/isc/ratelimiter.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2014,2016
-./lib/isc/include/isc/refcount.h		C	2001,2003,2004,2005,2006,2007,2009,2016,2017
-./lib/isc/include/isc/regex.h			C	2013,2016
-./lib/isc/include/isc/region.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2013,2016
-./lib/isc/include/isc/resource.h		C	2000,2001,2004,2005,2006,2007,2008,2016
-./lib/isc/include/isc/result.h			C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017
-./lib/isc/include/isc/resultclass.h		C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016
-./lib/isc/include/isc/rwlock.h			C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2016,2017
-./lib/isc/include/isc/safe.h			C	2013,2015,2016,2017
-./lib/isc/include/isc/serial.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016
+./lib/isc/include/isc/meminfo.h			C	2015,2016,2018
+./lib/isc/include/isc/msgcat.h			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/include/isc/msgs.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2016,2017,2018
+./lib/isc/include/isc/mutexblock.h		C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/netaddr.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2009,2015,2016,2017,2018
+./lib/isc/include/isc/netscope.h		C	2002,2004,2005,2006,2007,2009,2016,2018
+./lib/isc/include/isc/os.h			C	2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/parseint.h		C	2001,2002,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/platform.h.in		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016,2017,2018
+./lib/isc/include/isc/pool.h			C	2013,2016,2018
+./lib/isc/include/isc/portset.h			C	2008,2009,2016,2018
+./lib/isc/include/isc/print.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2014,2015,2016,2018
+./lib/isc/include/isc/queue.h			C	2011,2012,2013,2016,2018
+./lib/isc/include/isc/quota.h			C	2000,2001,2004,2005,2007,2016,2018
+./lib/isc/include/isc/radix.h			C	2007,2008,2013,2014,2016,2018
+./lib/isc/include/isc/random.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016,2017,2018
+./lib/isc/include/isc/ratelimiter.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2014,2016,2018
+./lib/isc/include/isc/refcount.h		C	2001,2003,2004,2005,2006,2007,2009,2016,2017,2018
+./lib/isc/include/isc/regex.h			C	2013,2016,2018
+./lib/isc/include/isc/region.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2013,2016,2018
+./lib/isc/include/isc/resource.h		C	2000,2001,2004,2005,2006,2007,2008,2016,2018
+./lib/isc/include/isc/result.h			C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018
+./lib/isc/include/isc/resultclass.h		C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016,2018
+./lib/isc/include/isc/rwlock.h			C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2016,2017,2018
+./lib/isc/include/isc/safe.h			C	2013,2015,2016,2017,2018
+./lib/isc/include/isc/serial.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2016,2018
 ./lib/isc/include/isc/sha1.h			C	2000,2001,2004,2005,2006,2007,2009,2014,2016,2017,2018
-./lib/isc/include/isc/sha2.h			C	2005,2006,2007,2009,2014,2016,2017
-./lib/isc/include/isc/sockaddr.h		C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2015,2016
-./lib/isc/include/isc/socket.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016
-./lib/isc/include/isc/stats.h			C	2009,2012,2016
-./lib/isc/include/isc/stdio.h			C	2000,2001,2004,2005,2006,2007,2013,2016
-./lib/isc/include/isc/stdlib.h			C	2003,2004,2005,2006,2007,2016
-./lib/isc/include/isc/string.h			C	2000,2001,2003,2004,2005,2006,2007,2014,2016
-./lib/isc/include/isc/symtab.h			C	1996,1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013,2016
-./lib/isc/include/isc/task.h			C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/isc/include/isc/taskpool.h		C	1999,2000,2001,2004,2005,2006,2007,2011,2012,2016
-./lib/isc/include/isc/timer.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2016
-./lib/isc/include/isc/tm.h			C	2014,2016
+./lib/isc/include/isc/sha2.h			C	2005,2006,2007,2009,2014,2016,2017,2018
+./lib/isc/include/isc/sockaddr.h		C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2015,2016,2018
+./lib/isc/include/isc/socket.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016,2018
+./lib/isc/include/isc/stats.h			C	2009,2012,2016,2018
+./lib/isc/include/isc/stdio.h			C	2000,2001,2004,2005,2006,2007,2013,2016,2018
+./lib/isc/include/isc/stdlib.h			C	2003,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/string.h			C	2000,2001,2003,2004,2005,2006,2007,2014,2016,2018
+./lib/isc/include/isc/symtab.h			C	1996,1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013,2016,2018
+./lib/isc/include/isc/task.h			C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/include/isc/taskpool.h		C	1999,2000,2001,2004,2005,2006,2007,2011,2012,2016,2018
+./lib/isc/include/isc/timer.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2016,2018
+./lib/isc/include/isc/tm.h			C	2014,2016,2018
 ./lib/isc/include/isc/types.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2016,2017,2018
-./lib/isc/include/isc/util.h			C	1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2015,2016,2017
-./lib/isc/include/isc/version.h			C	2001,2004,2005,2006,2007,2016
-./lib/isc/include/isc/xml.h			C	2006,2007,2016
-./lib/isc/include/pk11/Makefile.in		MAKE	2014,2015,2016
-./lib/isc/include/pk11/README.site		TXT.BRIEF	2016,2017
-./lib/isc/include/pk11/constants.h		C	2014,2016,2017
-./lib/isc/include/pk11/internal.h		C	2014,2016
-./lib/isc/include/pk11/pk11.h			C	2014,2016
-./lib/isc/include/pk11/result.h			C	2014,2016
-./lib/isc/include/pk11/site.h			C	2016,2017
-./lib/isc/include/pkcs11/Makefile.in		MAKE	2014,2015,2016,2017
-./lib/isc/include/pkcs11/eddsa.h		C	2017
-./lib/isc/include/pkcs11/pkcs11.h		X	2014,2016
-./lib/isc/include/pkcs11/pkcs11f.h		X	2014,2016
-./lib/isc/include/pkcs11/pkcs11t.h		X	2014,2016
-./lib/isc/inet_aton.c				C.PORTION	1996,1997,1998,1999,2000,2001,2004,2005,2007,2008,2012,2013,2014,2016,2017
-./lib/isc/inet_ntop.c				C	1996,1997,1998,1999,2000,2001,2004,2005,2007,2009,2016,2017
-./lib/isc/inet_pton.c				C	1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2007,2013,2014,2016,2017
-./lib/isc/iterated_hash.c			C	2006,2008,2009,2016
-./lib/isc/lex.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2013,2014,2015,2016,2017
-./lib/isc/lfsr.c				C	1999,2000,2001,2002,2004,2005,2007,2016
-./lib/isc/lib.c					C	1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016
+./lib/isc/include/isc/util.h			C	1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2015,2016,2017,2018
+./lib/isc/include/isc/version.h			C	2001,2004,2005,2006,2007,2016,2018
+./lib/isc/include/isc/xml.h			C	2006,2007,2016,2018
+./lib/isc/include/pk11/Makefile.in		MAKE	2014,2015,2016,2018
+./lib/isc/include/pk11/README.site		TXT.BRIEF	2016,2017,2018
+./lib/isc/include/pk11/constants.h		C	2014,2016,2017,2018
+./lib/isc/include/pk11/internal.h		C	2014,2016,2018
+./lib/isc/include/pk11/pk11.h			C	2014,2016,2018
+./lib/isc/include/pk11/result.h			C	2014,2016,2018
+./lib/isc/include/pk11/site.h			C	2016,2017,2018
+./lib/isc/include/pkcs11/Makefile.in		MAKE	2014,2015,2016,2017,2018
+./lib/isc/include/pkcs11/eddsa.h		C	2017,2018
+./lib/isc/include/pkcs11/pkcs11.h		X	2014,2016,2018
+./lib/isc/include/pkcs11/pkcs11f.h		X	2014,2016,2018
+./lib/isc/include/pkcs11/pkcs11t.h		X	2014,2016,2018
+./lib/isc/inet_aton.c				C.PORTION	1996,1997,1998,1999,2000,2001,2004,2005,2007,2008,2012,2013,2014,2016,2017,2018
+./lib/isc/inet_ntop.c				C	1996,1997,1998,1999,2000,2001,2004,2005,2007,2009,2016,2017,2018
+./lib/isc/inet_pton.c				C	1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2007,2013,2014,2016,2017,2018
+./lib/isc/iterated_hash.c			C	2006,2008,2009,2016,2018
+./lib/isc/lex.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2013,2014,2015,2016,2017,2018
+./lib/isc/lfsr.c				C	1999,2000,2001,2002,2004,2005,2007,2016,2018
+./lib/isc/lib.c					C	1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016,2018
 ./lib/isc/log.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2016,2017,2018
 ./lib/isc/md5.c					C	2000,2001,2004,2005,2007,2009,2014,2015,2016,2017,2018
 ./lib/isc/mem.c					C	1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/mips/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/mips/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/mips/include/isc/Makefile.in		MAKE	2007,2012,2015,2016
-./lib/isc/mips/include/isc/atomic.h		C	2005,2007,2016
-./lib/isc/mutexblock.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2016
-./lib/isc/netaddr.c				C	1999,2000,2001,2002,2004,2005,2007,2010,2011,2012,2014,2015,2016,2017
-./lib/isc/netscope.c				C	2002,2004,2005,2006,2007,2016
-./lib/isc/nls/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2012,2016
-./lib/isc/nls/msgcat.c				C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/noatomic/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/noatomic/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/noatomic/include/isc/Makefile.in	MAKE	2007,2012,2015,2016
-./lib/isc/noatomic/include/isc/atomic.h		C	2005,2007,2016
-./lib/isc/nothreads/Makefile.in			MAKE	2000,2001,2004,2007,2009,2010,2012,2013,2016
-./lib/isc/nothreads/condition.c			C	2000,2001,2004,2006,2007,2016
-./lib/isc/nothreads/include/Makefile.in		MAKE	2000,2001,2004,2007,2012,2016
-./lib/isc/nothreads/include/isc/Makefile.in	MAKE	2000,2001,2004,2007,2012,2015,2016
-./lib/isc/nothreads/include/isc/condition.h	C	2000,2001,2004,2007,2016
-./lib/isc/nothreads/include/isc/mutex.h		C	2000,2001,2004,2007,2015,2016
-./lib/isc/nothreads/include/isc/once.h		C	2000,2001,2004,2007,2016
-./lib/isc/nothreads/include/isc/thread.h	C	2000,2001,2004,2007,2013,2016,2017
-./lib/isc/nothreads/mutex.c			C	2000,2001,2004,2006,2007,2016
-./lib/isc/nothreads/thread.c			C	2000,2001,2004,2007,2016,2017
-./lib/isc/parseint.c				C	2001,2002,2003,2004,2005,2007,2012,2016
-./lib/isc/pk11.c				C	2014,2015,2016,2017
-./lib/isc/pk11_result.c				C	2014,2015,2016
-./lib/isc/pool.c				C	2013,2015,2016
-./lib/isc/portset.c				C	2008,2016,2017
-./lib/isc/powerpc/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/powerpc/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/powerpc/include/isc/Makefile.in	MAKE	2007,2012,2015,2016
-./lib/isc/powerpc/include/isc/atomic.h		C	2005,2007,2009,2011,2012,2016,2017
-./lib/isc/print.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2010,2014,2015,2016,2017
-./lib/isc/pthreads/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2016
-./lib/isc/pthreads/condition.c			C	1998,1999,2000,2001,2004,2005,2007,2012,2016
-./lib/isc/pthreads/include/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2016
-./lib/isc/pthreads/include/isc/Makefile.in	MAKE	1998,1999,2000,2001,2004,2007,2012,2015,2016
-./lib/isc/pthreads/include/isc/condition.h	C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/isc/pthreads/include/isc/mutex.h		C	1998,1999,2000,2001,2002,2004,2005,2007,2016
-./lib/isc/pthreads/include/isc/once.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/pthreads/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2013,2016,2017
-./lib/isc/pthreads/mutex.c			C	2000,2001,2002,2004,2005,2007,2008,2011,2012,2014,2015,2016
+./lib/isc/mips/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/mips/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/mips/include/isc/Makefile.in		MAKE	2007,2012,2015,2016,2018
+./lib/isc/mips/include/isc/atomic.h		C	2005,2007,2016,2018
+./lib/isc/mutexblock.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2016,2018
+./lib/isc/netaddr.c				C	1999,2000,2001,2002,2004,2005,2007,2010,2011,2012,2014,2015,2016,2017,2018
+./lib/isc/netscope.c				C	2002,2004,2005,2006,2007,2016,2018
+./lib/isc/nls/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2012,2016,2018
+./lib/isc/nls/msgcat.c				C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/noatomic/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/noatomic/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/noatomic/include/isc/Makefile.in	MAKE	2007,2012,2015,2016,2018
+./lib/isc/noatomic/include/isc/atomic.h		C	2005,2007,2016,2018
+./lib/isc/nothreads/Makefile.in			MAKE	2000,2001,2004,2007,2009,2010,2012,2013,2016,2018
+./lib/isc/nothreads/condition.c			C	2000,2001,2004,2006,2007,2016,2018
+./lib/isc/nothreads/include/Makefile.in		MAKE	2000,2001,2004,2007,2012,2016,2018
+./lib/isc/nothreads/include/isc/Makefile.in	MAKE	2000,2001,2004,2007,2012,2015,2016,2018
+./lib/isc/nothreads/include/isc/condition.h	C	2000,2001,2004,2007,2016,2018
+./lib/isc/nothreads/include/isc/mutex.h		C	2000,2001,2004,2007,2015,2016,2018
+./lib/isc/nothreads/include/isc/once.h		C	2000,2001,2004,2007,2016,2018
+./lib/isc/nothreads/include/isc/thread.h	C	2000,2001,2004,2007,2013,2016,2017,2018
+./lib/isc/nothreads/mutex.c			C	2000,2001,2004,2006,2007,2016,2018
+./lib/isc/nothreads/thread.c			C	2000,2001,2004,2007,2016,2017,2018
+./lib/isc/parseint.c				C	2001,2002,2003,2004,2005,2007,2012,2016,2018
+./lib/isc/pk11.c				C	2014,2015,2016,2017,2018
+./lib/isc/pk11_result.c				C	2014,2015,2016,2018
+./lib/isc/pool.c				C	2013,2015,2016,2018
+./lib/isc/portset.c				C	2008,2016,2017,2018
+./lib/isc/powerpc/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/powerpc/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/powerpc/include/isc/Makefile.in	MAKE	2007,2012,2015,2016,2018
+./lib/isc/powerpc/include/isc/atomic.h		C	2005,2007,2009,2011,2012,2016,2017,2018
+./lib/isc/print.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2010,2014,2015,2016,2017,2018
+./lib/isc/pthreads/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2016,2018
+./lib/isc/pthreads/condition.c			C	1998,1999,2000,2001,2004,2005,2007,2012,2016,2018
+./lib/isc/pthreads/include/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2016,2018
+./lib/isc/pthreads/include/isc/Makefile.in	MAKE	1998,1999,2000,2001,2004,2007,2012,2015,2016,2018
+./lib/isc/pthreads/include/isc/condition.h	C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/pthreads/include/isc/mutex.h		C	1998,1999,2000,2001,2002,2004,2005,2007,2016,2018
+./lib/isc/pthreads/include/isc/once.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/pthreads/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2013,2016,2017,2018
+./lib/isc/pthreads/mutex.c			C	2000,2001,2002,2004,2005,2007,2008,2011,2012,2014,2015,2016,2018
 ./lib/isc/pthreads/thread.c			C	2000,2001,2003,2004,2005,2007,2013,2016,2017,2018
-./lib/isc/quota.c				C	2000,2001,2004,2005,2007,2016
-./lib/isc/radix.c				C	2007,2008,2009,2011,2012,2013,2014,2015,2016
-./lib/isc/random.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2013,2014,2016,2017
-./lib/isc/ratelimiter.c				C	1999,2000,2001,2002,2004,2005,2007,2012,2014,2015,2016,2017
-./lib/isc/refcount.c				C	2005,2007,2016,2017
-./lib/isc/regex.c				C	2013,2014.2015,2015,2016
-./lib/isc/region.c				C	2002,2004,2005,2007,2016
-./lib/isc/result.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2008,2012,2014,2015,2016,2017
-./lib/isc/rwlock.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017
-./lib/isc/safe.c				C	2013,2015,2016,2017
-./lib/isc/serial.c				C	1999,2000,2001,2004,2005,2007,2016
+./lib/isc/quota.c				C	2000,2001,2004,2005,2007,2016,2018
+./lib/isc/radix.c				C	2007,2008,2009,2011,2012,2013,2014,2015,2016,2018
+./lib/isc/random.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2013,2014,2016,2017,2018
+./lib/isc/ratelimiter.c				C	1999,2000,2001,2002,2004,2005,2007,2012,2014,2015,2016,2017,2018
+./lib/isc/refcount.c				C	2005,2007,2016,2017,2018
+./lib/isc/regex.c				C	2013,2014.2015,2015,2016,2018
+./lib/isc/region.c				C	2002,2004,2005,2007,2016,2018
+./lib/isc/result.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2008,2012,2014,2015,2016,2017,2018
+./lib/isc/rwlock.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017,2018
+./lib/isc/safe.c				C	2013,2015,2016,2017,2018
+./lib/isc/serial.c				C	1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/sha1.c				C	2000,2001,2003,2004,2005,2007,2009,2011,2012,2014,2016,2017,2018
 ./lib/isc/sha2.c				C	2005,2006,2007,2009,2011,2012,2014,2016,2017,2018
-./lib/isc/sockaddr.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2010,2011,2012,2014,2015,2016,2017
-./lib/isc/socket_api.c				C	2009,2011,2012,2013,2014,2015,2016
-./lib/isc/sparc64/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/sparc64/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/sparc64/include/isc/Makefile.in	MAKE	2007,2012,2015,2016
-./lib/isc/sparc64/include/isc/atomic.h		C	2005,2007,2013,2016
-./lib/isc/stats.c				C	2009,2012,2013,2014,2015,2016,2017
-./lib/isc/string.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2011,2012,2014,2015,2016
-./lib/isc/strtoul.c				C	2003,2004,2005,2007,2014,2016
-./lib/isc/symtab.c				C	1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012,2013,2016
+./lib/isc/sockaddr.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2010,2011,2012,2014,2015,2016,2017,2018
+./lib/isc/socket_api.c				C	2009,2011,2012,2013,2014,2015,2016,2018
+./lib/isc/sparc64/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/sparc64/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/sparc64/include/isc/Makefile.in	MAKE	2007,2012,2015,2016,2018
+./lib/isc/sparc64/include/isc/atomic.h		C	2005,2007,2013,2016,2018
+./lib/isc/stats.c				C	2009,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/string.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2011,2012,2014,2015,2016,2018
+./lib/isc/strtoul.c				C	2003,2004,2005,2007,2014,2016,2018
+./lib/isc/symtab.c				C	1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012,2013,2016,2018
 ./lib/isc/task.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/taskpool.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2013,2016
-./lib/isc/tests/Atffile				X	2011,2017
-./lib/isc/tests/Kyuafile			X	2017
-./lib/isc/tests/Makefile.in			MAKE	2011,2012,2013,2014,2015,2016,2017
-./lib/isc/tests/aes_test.c			C	2014,2016
-./lib/isc/tests/buffer_test.c			C	2014,2015,2016,2017
-./lib/isc/tests/counter_test.c			C	2014,2016
-./lib/isc/tests/errno_test.c			C	2016
-./lib/isc/tests/file_test.c			C	2014,2016,2017
+./lib/isc/taskpool.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2013,2016,2018
+./lib/isc/tests/Atffile				X	2011,2017,2018
+./lib/isc/tests/Kyuafile			X	2017,2018
+./lib/isc/tests/Makefile.in			MAKE	2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/tests/aes_test.c			C	2014,2016,2018
+./lib/isc/tests/buffer_test.c			C	2014,2015,2016,2017,2018
+./lib/isc/tests/counter_test.c			C	2014,2016,2018
+./lib/isc/tests/errno_test.c			C	2016,2018
+./lib/isc/tests/file_test.c			C	2014,2016,2017,2018
 ./lib/isc/tests/hash_test.c			C	2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/tests/heap_test.c			C	2017
-./lib/isc/tests/ht_test.c			C	2016,2017
-./lib/isc/tests/inet_ntop_test.c		C	2017
-./lib/isc/tests/isctest.c			C	2011,2012,2013,2014,2016,2017
-./lib/isc/tests/isctest.h			C	2011,2012,2016
-./lib/isc/tests/lex_test.c			C	2013,2016
-./lib/isc/tests/mem_test.c			C	2015,2016,2017
-./lib/isc/tests/netaddr_test.c			C	2016
-./lib/isc/tests/parse_test.c			C	2012,2013,2016
-./lib/isc/tests/pool_test.c			C	2013,2016
-./lib/isc/tests/print_test.c			C	2014,2015,2016
-./lib/isc/tests/queue_test.c			C	2011,2012,2016
-./lib/isc/tests/radix_test.c			C	2014,2016
+./lib/isc/tests/heap_test.c			C	2017,2018
+./lib/isc/tests/ht_test.c			C	2016,2017,2018
+./lib/isc/tests/inet_ntop_test.c		C	2017,2018
+./lib/isc/tests/isctest.c			C	2011,2012,2013,2014,2016,2017,2018
+./lib/isc/tests/isctest.h			C	2011,2012,2016,2018
+./lib/isc/tests/lex_test.c			C	2013,2016,2018
+./lib/isc/tests/mem_test.c			C	2015,2016,2017,2018
+./lib/isc/tests/netaddr_test.c			C	2016,2018
+./lib/isc/tests/parse_test.c			C	2012,2013,2016,2018
+./lib/isc/tests/pool_test.c			C	2013,2016,2018
+./lib/isc/tests/print_test.c			C	2014,2015,2016,2018
+./lib/isc/tests/queue_test.c			C	2011,2012,2016,2018
+./lib/isc/tests/radix_test.c			C	2014,2016,2018
 ./lib/isc/tests/random_test.c			C	2014,2015,2016,2017,2018
-./lib/isc/tests/regex_test.c			C	2013,2015,2016
-./lib/isc/tests/result_test.c			C	2015,2016
-./lib/isc/tests/safe_test.c			C	2013,2015,2016,2017
-./lib/isc/tests/sockaddr_test.c			C	2012,2015,2016,2017
+./lib/isc/tests/regex_test.c			C	2013,2015,2016,2018
+./lib/isc/tests/result_test.c			C	2015,2016,2018
+./lib/isc/tests/safe_test.c			C	2013,2015,2016,2017,2018
+./lib/isc/tests/sockaddr_test.c			C	2012,2015,2016,2017,2018
 ./lib/isc/tests/socket_test.c			C	2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/tests/symtab_test.c			C	2011,2012,2013,2016
-./lib/isc/tests/task_test.c			C	2011,2012,2016,2017
-./lib/isc/tests/taskpool_test.c			C	2011,2012,2016
-./lib/isc/tests/testdata/file/keep		X	2014
+./lib/isc/tests/symtab_test.c			C	2011,2012,2013,2016,2018
+./lib/isc/tests/task_test.c			C	2011,2012,2016,2017,2018
+./lib/isc/tests/taskpool_test.c			C	2011,2012,2016,2018
+./lib/isc/tests/testdata/file/keep		X	2014,2018
 ./lib/isc/tests/time_test.c			C	2014,2015,2016,2018
-./lib/isc/timer.c				C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/isc/timer_p.h				C	2000,2001,2004,2005,2007,2009,2016,2017
-./lib/isc/tm.c					C	2014,2016
-./lib/isc/unix/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2014,2015,2016,2017
-./lib/isc/unix/app.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017
-./lib/isc/unix/dir.c				C	1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2016,2017
-./lib/isc/unix/entropy.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2012,2016,2017
-./lib/isc/unix/errno.c				C	2016
-./lib/isc/unix/errno2result.c			C	2000,2001,2002,2004,2005,2007,2011,2012,2013,2016
-./lib/isc/unix/errno2result.h			C	2000,2001,2004,2005,2007,2011,2012,2016
-./lib/isc/unix/file.c				C	2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/isc/unix/fsaccess.c			C	2000,2001,2004,2005,2006,2007,2016
-./lib/isc/unix/ifiter_getifaddrs.c		C	2003,2004,2005,2007,2008,2009,2014,2016
+./lib/isc/timer.c				C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/timer_p.h				C	2000,2001,2004,2005,2007,2009,2016,2017,2018
+./lib/isc/tm.c					C	2014,2016,2018
+./lib/isc/unix/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2014,2015,2016,2017,2018
+./lib/isc/unix/app.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017,2018
+./lib/isc/unix/dir.c				C	1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2016,2017,2018
+./lib/isc/unix/entropy.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2012,2016,2017,2018
+./lib/isc/unix/errno.c				C	2016,2018
+./lib/isc/unix/errno2result.c			C	2000,2001,2002,2004,2005,2007,2011,2012,2013,2016,2018
+./lib/isc/unix/errno2result.h			C	2000,2001,2004,2005,2007,2011,2012,2016,2018
+./lib/isc/unix/file.c				C	2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/unix/fsaccess.c			C	2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/unix/ifiter_getifaddrs.c		C	2003,2004,2005,2007,2008,2009,2014,2016,2018
 ./lib/isc/unix/ifiter_ioctl.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2014,2015,2016,2017,2018
-./lib/isc/unix/ifiter_sysctl.c			C	1999,2000,2001,2002,2003,2004,2005,2007,2014,2015,2016
-./lib/isc/unix/include/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2014,2016
-./lib/isc/unix/include/isc/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2013,2014,2015,2016
-./lib/isc/unix/include/isc/dir.h		C	1999,2000,2001,2004,2005,2007,2016
+./lib/isc/unix/ifiter_sysctl.c			C	1999,2000,2001,2002,2003,2004,2005,2007,2014,2015,2016,2018
+./lib/isc/unix/include/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2014,2016,2018
+./lib/isc/unix/include/isc/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2013,2014,2015,2016,2018
+./lib/isc/unix/include/isc/dir.h		C	1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/unix/include/isc/int.h		C	1999,2000,2001,2004,2005,2007,2016,2018
-./lib/isc/unix/include/isc/keyboard.h		C	2000,2001,2004,2005,2007,2016
-./lib/isc/unix/include/isc/net.h		C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014,2016,2017
-./lib/isc/unix/include/isc/netdb.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/unix/include/isc/offset.h		C	2000,2001,2004,2005,2007,2008,2016
-./lib/isc/unix/include/isc/stat.h		C	2004,2007,2014,2016
-./lib/isc/unix/include/isc/stdtime.h		C	1999,2000,2001,2004,2005,2007,2011,2012,2016
-./lib/isc/unix/include/isc/strerror.h		C	2001,2004,2005,2007,2008,2016
-./lib/isc/unix/include/isc/syslog.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/unix/include/isc/time.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017
-./lib/isc/unix/include/pkcs11/Makefile.in	MAKE	2014,2016
-./lib/isc/unix/include/pkcs11/cryptoki.h	X	2014
-./lib/isc/unix/interfaceiter.c			C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2014,2016,2017
-./lib/isc/unix/ipv6.c				C	1999,2000,2001,2004,2005,2006,2007,2016
-./lib/isc/unix/keyboard.c			C	2000,2001,2004,2007,2016
-./lib/isc/unix/meminfo.c			C	2015,2016
-./lib/isc/unix/net.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014,2015,2016,2017
-./lib/isc/unix/os.c				C	2000,2001,2004,2005,2007,2016
-./lib/isc/unix/pk11_api.c			C	2014,2016
-./lib/isc/unix/resource.c			C	2000,2001,2004,2007,2008,2009,2016
+./lib/isc/unix/include/isc/keyboard.h		C	2000,2001,2004,2005,2007,2016,2018
+./lib/isc/unix/include/isc/net.h		C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014,2016,2017,2018
+./lib/isc/unix/include/isc/netdb.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/unix/include/isc/offset.h		C	2000,2001,2004,2005,2007,2008,2016,2018
+./lib/isc/unix/include/isc/stat.h		C	2004,2007,2014,2016,2018
+./lib/isc/unix/include/isc/stdtime.h		C	1999,2000,2001,2004,2005,2007,2011,2012,2016,2018
+./lib/isc/unix/include/isc/strerror.h		C	2001,2004,2005,2007,2008,2016,2018
+./lib/isc/unix/include/isc/syslog.h		C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/unix/include/isc/time.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018
+./lib/isc/unix/include/pkcs11/Makefile.in	MAKE	2014,2016,2018
+./lib/isc/unix/include/pkcs11/cryptoki.h	X	2014,2018
+./lib/isc/unix/interfaceiter.c			C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2014,2016,2017,2018
+./lib/isc/unix/ipv6.c				C	1999,2000,2001,2004,2005,2006,2007,2016,2018
+./lib/isc/unix/keyboard.c			C	2000,2001,2004,2007,2016,2018
+./lib/isc/unix/meminfo.c			C	2015,2016,2018
+./lib/isc/unix/net.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/unix/os.c				C	2000,2001,2004,2005,2007,2016,2018
+./lib/isc/unix/pk11_api.c			C	2014,2016,2018
+./lib/isc/unix/resource.c			C	2000,2001,2004,2007,2008,2009,2016,2018
 ./lib/isc/unix/socket.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/unix/socket_p.h			C	2000,2001,2004,2005,2007,2008,2009,2016
-./lib/isc/unix/stdio.c				C	2000,2001,2004,2007,2011,2012,2013,2014,2016
-./lib/isc/unix/stdtime.c			C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/unix/strerror.c			C	2001,2004,2005,2007,2009,2016
-./lib/isc/unix/syslog.c				C	2001,2004,2005,2007,2016
+./lib/isc/unix/socket_p.h			C	2000,2001,2004,2005,2007,2008,2009,2016,2018
+./lib/isc/unix/stdio.c				C	2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
+./lib/isc/unix/stdtime.c			C	1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/unix/strerror.c			C	2001,2004,2005,2007,2009,2016,2018
+./lib/isc/unix/syslog.c				C	2001,2004,2005,2007,2016,2018
 ./lib/isc/unix/time.c				C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2011,2012,2014,2015,2016,2017,2018
-./lib/isc/version.c				C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/isc/win32/DLLMain.c			C	2001,2004,2007,2016
-./lib/isc/win32/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2012,2014,2015,2016
-./lib/isc/win32/app.c				C	1999,2000,2001,2004,2007,2009,2013,2014,2016
-./lib/isc/win32/condition.c			C	1998,1999,2000,2001,2004,2006,2007,2016
-./lib/isc/win32/dir.c				C	1999,2000,2001,2004,2007,2008,2009,2011,2012,2013,2016,2017
-./lib/isc/win32/entropy.c			C	2000,2001,2002,2004,2007,2009,2013,2016
-./lib/isc/win32/errno.c				C	2016
-./lib/isc/win32/errno2result.c			C	2000,2001,2002,2004,2005,2007,2008,2013,2016
-./lib/isc/win32/errno2result.h			C	2000,2001,2004,2005,2007,2016
-./lib/isc/win32/file.c				C	2000,2001,2002,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/isc/win32/fsaccess.c			C	2000,2001,2002,2004,2007,2013,2016,2017
-./lib/isc/win32/include/Makefile.in		MAKE	1999,2000,2001,2004,2007,2012,2014,2016
-./lib/isc/win32/include/isc/Makefile.in		MAKE	1999,2000,2001,2004,2007,2012,2013,2014,2015,2016
-./lib/isc/win32/include/isc/atomic.h		C	2013,2015,2016
-./lib/isc/win32/include/isc/bind_registry.h	C	2001,2004,2007,2016
-./lib/isc/win32/include/isc/bindevt.h		C	2001,2004,2007,2016
-./lib/isc/win32/include/isc/condition.h		C	1998,1999,2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/dir.h		C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/int.h		C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/ipv6.h		C	1999,2000,2001,2002,2004,2005,2007,2011,2012,2016
-./lib/isc/win32/include/isc/keyboard.h		C	2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/mutex.h		C	1998,1999,2000,2001,2004,2007,2008,2009,2016
-./lib/isc/win32/include/isc/net.h		C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2016,2017
-./lib/isc/win32/include/isc/netdb.h		C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/ntgroups.h		C	2001,2004,2007,2016
-./lib/isc/win32/include/isc/ntpaths.h		C	2000,2001,2004,2007,2009,2015,2016,2017
-./lib/isc/win32/include/isc/offset.h		C	2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/once.h		C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/platform.h.in	C	2001,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017
-./lib/isc/win32/include/isc/stat.h		C	2000,2001,2003,2004,2007,2009,2012,2016
-./lib/isc/win32/include/isc/stdtime.h		C	1999,2000,2001,2004,2005,2007,2011,2012,2016
-./lib/isc/win32/include/isc/strerror.h		C	2001,2004,2007,2016
-./lib/isc/win32/include/isc/syslog.h		C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2009,2013,2016,2017
-./lib/isc/win32/include/isc/time.h		C	1998,1999,2000,2001,2004,2006,2007,2008,2009,2012,2014,2015,2016,2017
-./lib/isc/win32/include/isc/win32os.h		C	2002,2004,2007,2009,2015,2016
-./lib/isc/win32/include/pkcs11/Makefile.in	MAKE	2014,2016
-./lib/isc/win32/include/pkcs11/cryptoki.h	X	2014
+./lib/isc/version.c				C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isc/win32/DLLMain.c			C	2001,2004,2007,2016,2018
+./lib/isc/win32/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2012,2014,2015,2016,2018
+./lib/isc/win32/app.c				C	1999,2000,2001,2004,2007,2009,2013,2014,2016,2018
+./lib/isc/win32/condition.c			C	1998,1999,2000,2001,2004,2006,2007,2016,2018
+./lib/isc/win32/dir.c				C	1999,2000,2001,2004,2007,2008,2009,2011,2012,2013,2016,2017,2018
+./lib/isc/win32/entropy.c			C	2000,2001,2002,2004,2007,2009,2013,2016,2018
+./lib/isc/win32/errno.c				C	2016,2018
+./lib/isc/win32/errno2result.c			C	2000,2001,2002,2004,2005,2007,2008,2013,2016,2018
+./lib/isc/win32/errno2result.h			C	2000,2001,2004,2005,2007,2016,2018
+./lib/isc/win32/file.c				C	2000,2001,2002,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isc/win32/fsaccess.c			C	2000,2001,2002,2004,2007,2013,2016,2017,2018
+./lib/isc/win32/include/Makefile.in		MAKE	1999,2000,2001,2004,2007,2012,2014,2016,2018
+./lib/isc/win32/include/isc/Makefile.in		MAKE	1999,2000,2001,2004,2007,2012,2013,2014,2015,2016,2018
+./lib/isc/win32/include/isc/atomic.h		C	2013,2015,2016,2018
+./lib/isc/win32/include/isc/bind_registry.h	C	2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/bindevt.h		C	2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/condition.h		C	1998,1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/dir.h		C	1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/int.h		C	1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/ipv6.h		C	1999,2000,2001,2002,2004,2005,2007,2011,2012,2016,2018
+./lib/isc/win32/include/isc/keyboard.h		C	2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/mutex.h		C	1998,1999,2000,2001,2004,2007,2008,2009,2016,2018
+./lib/isc/win32/include/isc/net.h		C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2016,2017,2018
+./lib/isc/win32/include/isc/netdb.h		C	1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/ntgroups.h		C	2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/ntpaths.h		C	2000,2001,2004,2007,2009,2015,2016,2017,2018
+./lib/isc/win32/include/isc/offset.h		C	2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/once.h		C	1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/platform.h.in	C	2001,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017,2018
+./lib/isc/win32/include/isc/stat.h		C	2000,2001,2003,2004,2007,2009,2012,2016,2018
+./lib/isc/win32/include/isc/stdtime.h		C	1999,2000,2001,2004,2005,2007,2011,2012,2016,2018
+./lib/isc/win32/include/isc/strerror.h		C	2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/syslog.h		C	1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2009,2013,2016,2017,2018
+./lib/isc/win32/include/isc/time.h		C	1998,1999,2000,2001,2004,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018
+./lib/isc/win32/include/isc/win32os.h		C	2002,2004,2007,2009,2015,2016,2018
+./lib/isc/win32/include/pkcs11/Makefile.in	MAKE	2014,2016,2018
+./lib/isc/win32/include/pkcs11/cryptoki.h	X	2014,2018
 ./lib/isc/win32/interfaceiter.c			C	1999,2000,2001,2004,2007,2008,2009,2013,2014,2015,2016,2018
-./lib/isc/win32/ipv6.c				C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/keyboard.c			C	2000,2001,2004,2007,2016
-./lib/isc/win32/libgen.h			C	2009,2016
-./lib/isc/win32/libisc.def.exclude		X	2015,2017
+./lib/isc/win32/ipv6.c				C	1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/keyboard.c			C	2000,2001,2004,2007,2016,2018
+./lib/isc/win32/libgen.h			C	2009,2016,2018
+./lib/isc/win32/libisc.def.exclude		X	2015,2017,2018
 ./lib/isc/win32/libisc.def.in			X	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/win32/libisc.vcxproj.filters.in	X	2013,2014,2015,2016,2018
 ./lib/isc/win32/libisc.vcxproj.in		X	2013,2014,2015,2016,2017,2018
-./lib/isc/win32/libisc.vcxproj.user		X	2013
-./lib/isc/win32/meminfo.c			C	2015,2016
-./lib/isc/win32/net.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016
-./lib/isc/win32/netdb.h				C	2000,2001,2004,2006,2007,2009,2013,2016
-./lib/isc/win32/ntgroups.c			C	2001,2004,2006,2007,2009,2013,2016
-./lib/isc/win32/ntpaths.c			C	2001,2004,2007,2009,2014,2015,2016,2017
-./lib/isc/win32/once.c				C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/os.c				C	2000,2001,2002,2004,2007,2013,2016
-./lib/isc/win32/pk11_api.c			C	2014,2016
-./lib/isc/win32/resource.c			C	2000,2001,2004,2007,2008,2016
+./lib/isc/win32/libisc.vcxproj.user		X	2013,2018
+./lib/isc/win32/meminfo.c			C	2015,2016,2018
+./lib/isc/win32/net.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018
+./lib/isc/win32/netdb.h				C	2000,2001,2004,2006,2007,2009,2013,2016,2018
+./lib/isc/win32/ntgroups.c			C	2001,2004,2006,2007,2009,2013,2016,2018
+./lib/isc/win32/ntpaths.c			C	2001,2004,2007,2009,2014,2015,2016,2017,2018
+./lib/isc/win32/once.c				C	1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/os.c				C	2000,2001,2002,2004,2007,2013,2016,2018
+./lib/isc/win32/pk11_api.c			C	2014,2016,2018
+./lib/isc/win32/resource.c			C	2000,2001,2004,2007,2008,2016,2018
 ./lib/isc/win32/socket.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/win32/stdio.c				C	2000,2001,2004,2007,2013,2016
-./lib/isc/win32/stdtime.c			C	1999,2000,2001,2004,2007,2013,2016
-./lib/isc/win32/strerror.c			C	2001,2002,2004,2007,2016
-./lib/isc/win32/syslog.c			C	2001,2002,2003,2004,2007,2014,2016
-./lib/isc/win32/syslog.h			C	2001,2002,2004,2007,2016
-./lib/isc/win32/thread.c			C	1998,1999,2000,2001,2004,2005,2007,2016,2017
+./lib/isc/win32/stdio.c				C	2000,2001,2004,2007,2013,2016,2018
+./lib/isc/win32/stdtime.c			C	1999,2000,2001,2004,2007,2013,2016,2018
+./lib/isc/win32/strerror.c			C	2001,2002,2004,2007,2016,2018
+./lib/isc/win32/syslog.c			C	2001,2002,2003,2004,2007,2014,2016,2018
+./lib/isc/win32/syslog.h			C	2001,2002,2004,2007,2016,2018
+./lib/isc/win32/thread.c			C	1998,1999,2000,2001,2004,2005,2007,2016,2017,2018
 ./lib/isc/win32/time.c				C	1998,1999,2000,2001,2003,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/win32/unistd.h			C	2000,2001,2004,2007,2008,2009,2016
-./lib/isc/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016
-./lib/isc/win32/win32os.c			C	2002,2004,2007,2013,2014,2015,2016
-./lib/isc/x86_32/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/x86_32/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/x86_32/include/isc/Makefile.in	MAKE	2007,2012,2015,2016
-./lib/isc/x86_32/include/isc/atomic.h		C	2005,2007,2008,2015,2016,2017
-./lib/isc/x86_64/Makefile.in			MAKE	2007,2012,2016
-./lib/isc/x86_64/include/Makefile.in		MAKE	2007,2012,2016
-./lib/isc/x86_64/include/isc/Makefile.in	MAKE	2007,2012,2015,2016
-./lib/isc/x86_64/include/isc/atomic.h		C	2005,2007,2008,2015,2016,2017
-./lib/isccc/Makefile.in				MAKE	2001,2003,2004,2007,2009,2011,2012,2014,2015,2016,2017
-./lib/isccc/alist.c				C.NOM	2001,2004,2005,2007,2015,2016
+./lib/isc/win32/unistd.h			C	2000,2001,2004,2007,2008,2009,2016,2018
+./lib/isc/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016,2018
+./lib/isc/win32/win32os.c			C	2002,2004,2007,2013,2014,2015,2016,2018
+./lib/isc/x86_32/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/x86_32/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/x86_32/include/isc/Makefile.in	MAKE	2007,2012,2015,2016,2018
+./lib/isc/x86_32/include/isc/atomic.h		C	2005,2007,2008,2015,2016,2017,2018
+./lib/isc/x86_64/Makefile.in			MAKE	2007,2012,2016,2018
+./lib/isc/x86_64/include/Makefile.in		MAKE	2007,2012,2016,2018
+./lib/isc/x86_64/include/isc/Makefile.in	MAKE	2007,2012,2015,2016,2018
+./lib/isc/x86_64/include/isc/atomic.h		C	2005,2007,2008,2015,2016,2017,2018
+./lib/isccc/Makefile.in				MAKE	2001,2003,2004,2007,2009,2011,2012,2014,2015,2016,2017,2018
+./lib/isccc/alist.c				C.NOM	2001,2004,2005,2007,2015,2016,2018
 ./lib/isccc/api					X	2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isccc/base64.c				C.NOM	2001,2004,2005,2007,2013,2016
-./lib/isccc/cc.c				C.NOM	2001,2002,2003,2004,2005,2006,2007,2012,2013,2014,2015,2016
-./lib/isccc/ccmsg.c				C.NOM	2001,2004,2005,2007,2016
-./lib/isccc/include/Makefile.in			MAKE	2001,2004,2007,2012,2016
-./lib/isccc/include/isccc/Makefile.in		MAKE	2001,2004,2007,2012,2015,2016
-./lib/isccc/include/isccc/alist.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/base64.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/cc.h			C.NOM	2001,2004,2005,2006,2007,2013,2014,2016
-./lib/isccc/include/isccc/ccmsg.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/events.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/lib.h			C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/result.h		C.NOM	2001,2003,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/sexpr.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/symtab.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/symtype.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/types.h		C.NOM	2001,2004,2005,2006,2007,2016
-./lib/isccc/include/isccc/util.h		C.NOM	2001,2004,2005,2006,2007,2014,2016
-./lib/isccc/include/isccc/version.h		C	2001,2004,2005,2006,2007,2016
-./lib/isccc/lib.c				C.NOM	2001,2004,2005,2007,2016
-./lib/isccc/result.c				C.NOM	2001,2003,2004,2005,2007,2015,2016
-./lib/isccc/sexpr.c				C.NOM	2001,2004,2005,2007,2014,2015,2016
-./lib/isccc/symtab.c				C.NOM	2001,2004,2005,2007,2016
-./lib/isccc/version.c				C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/isccc/win32/DLLMain.c			C	2001,2004,2007,2016
-./lib/isccc/win32/libisccc.def			X	2001,2016
-./lib/isccc/win32/libisccc.vcxproj.filters.in	X	2013,2015,2016
-./lib/isccc/win32/libisccc.vcxproj.in		X	2013,2014,2015,2016,2017
-./lib/isccc/win32/libisccc.vcxproj.user		X	2013
-./lib/isccc/win32/version.c			C	2001,2004,2007,2016
-./lib/isccfg/Atffile				X	2016
-./lib/isccfg/Kyuafile				X	2017
-./lib/isccfg/Makefile.in			MAKE	2001,2002,2003,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/isccfg/aclconf.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/isccc/base64.c				C.NOM	2001,2004,2005,2007,2013,2016,2018
+./lib/isccc/cc.c				C.NOM	2001,2002,2003,2004,2005,2006,2007,2012,2013,2014,2015,2016,2018
+./lib/isccc/ccmsg.c				C.NOM	2001,2004,2005,2007,2016,2018
+./lib/isccc/include/Makefile.in			MAKE	2001,2004,2007,2012,2016,2018
+./lib/isccc/include/isccc/Makefile.in		MAKE	2001,2004,2007,2012,2015,2016,2018
+./lib/isccc/include/isccc/alist.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/base64.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/cc.h			C.NOM	2001,2004,2005,2006,2007,2013,2014,2016,2018
+./lib/isccc/include/isccc/ccmsg.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/events.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/lib.h			C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/result.h		C.NOM	2001,2003,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/sexpr.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/symtab.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/symtype.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/types.h		C.NOM	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/include/isccc/util.h		C.NOM	2001,2004,2005,2006,2007,2014,2016,2018
+./lib/isccc/include/isccc/version.h		C	2001,2004,2005,2006,2007,2016,2018
+./lib/isccc/lib.c				C.NOM	2001,2004,2005,2007,2016,2018
+./lib/isccc/result.c				C.NOM	2001,2003,2004,2005,2007,2015,2016,2018
+./lib/isccc/sexpr.c				C.NOM	2001,2004,2005,2007,2014,2015,2016,2018
+./lib/isccc/symtab.c				C.NOM	2001,2004,2005,2007,2016,2018
+./lib/isccc/version.c				C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isccc/win32/DLLMain.c			C	2001,2004,2007,2016,2018
+./lib/isccc/win32/libisccc.def			X	2001,2016,2018
+./lib/isccc/win32/libisccc.vcxproj.filters.in	X	2013,2015,2016,2018
+./lib/isccc/win32/libisccc.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./lib/isccc/win32/libisccc.vcxproj.user		X	2013,2018
+./lib/isccc/win32/version.c			C	2001,2004,2007,2016,2018
+./lib/isccfg/Atffile				X	2016,2018
+./lib/isccfg/Kyuafile				X	2017,2018
+./lib/isccfg/Makefile.in			MAKE	2001,2002,2003,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/isccfg/aclconf.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isccfg/api				X	2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isccfg/dnsconf.c				C	2009,2016
-./lib/isccfg/include/Makefile.in		MAKE	2001,2004,2007,2012,2016
-./lib/isccfg/include/isccfg/Makefile.in		MAKE	2001,2002,2004,2005,2007,2012,2014,2015,2016
-./lib/isccfg/include/isccfg/aclconf.h		C	1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013,2014,2016
+./lib/isccfg/dnsconf.c				C	2009,2016,2018
+./lib/isccfg/include/Makefile.in		MAKE	2001,2004,2007,2012,2016,2018
+./lib/isccfg/include/isccfg/Makefile.in		MAKE	2001,2002,2004,2005,2007,2012,2014,2015,2016,2018
+./lib/isccfg/include/isccfg/aclconf.h		C	1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013,2014,2016,2018
 ./lib/isccfg/include/isccfg/cfg.h		C	2000,2001,2002,2004,2005,2006,2007,2010,2013,2014,2015,2016,2018
-./lib/isccfg/include/isccfg/dnsconf.h		C	2009,2016
+./lib/isccfg/include/isccfg/dnsconf.h		C	2009,2016,2018
 ./lib/isccfg/include/isccfg/grammar.h		C	2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
-./lib/isccfg/include/isccfg/log.h		C	2001,2004,2005,2006,2007,2009,2016
+./lib/isccfg/include/isccfg/log.h		C	2001,2004,2005,2006,2007,2009,2016,2018
 ./lib/isccfg/include/isccfg/namedconf.h		C	2002,2004,2005,2006,2007,2009,2010,2014,2016,2018
-./lib/isccfg/include/isccfg/version.h		C	2001,2004,2005,2006,2007,2016
-./lib/isccfg/log.c				C	2001,2004,2005,2006,2007,2016
+./lib/isccfg/include/isccfg/version.h		C	2001,2004,2005,2006,2007,2016,2018
+./lib/isccfg/log.c				C	2001,2004,2005,2006,2007,2016,2018
 ./lib/isccfg/namedconf.c			C	2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isccfg/parser.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isccfg/tests/Atffile			X	2016,2017
-./lib/isccfg/tests/Kyuafile			X	2017
-./lib/isccfg/tests/Makefile.in			MAKE	2016,2017
+./lib/isccfg/tests/Atffile			X	2016,2017,2018
+./lib/isccfg/tests/Kyuafile			X	2017,2018
+./lib/isccfg/tests/Makefile.in			MAKE	2016,2017,2018
 ./lib/isccfg/tests/parser_test.c		C	2016,2018
-./lib/isccfg/version.c				C	1998,1999,2000,2001,2004,2005,2007,2016
-./lib/isccfg/win32/DLLMain.c			C	2001,2004,2007,2016
+./lib/isccfg/version.c				C	1998,1999,2000,2001,2004,2005,2007,2016,2018
+./lib/isccfg/win32/DLLMain.c			C	2001,2004,2007,2016,2018
 ./lib/isccfg/win32/libisccfg.def		X	2001,2002,2005,2009,2010,2011,2013,2014,2015,2016,2018
-./lib/isccfg/win32/libisccfg.vcxproj.filters.in	X	2013,2014,2015,2016
-./lib/isccfg/win32/libisccfg.vcxproj.in		X	2013,2014,2015,2016,2017
-./lib/isccfg/win32/libisccfg.vcxproj.user	X	2013
-./lib/isccfg/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016
-./lib/ns/Atffile				X	2017
-./lib/ns/Kyuafile				X	2017
-./lib/ns/Makefile.in				MAKE	2017
-./lib/ns/api					X	2017
+./lib/isccfg/win32/libisccfg.vcxproj.filters.in	X	2013,2014,2015,2016,2018
+./lib/isccfg/win32/libisccfg.vcxproj.in		X	2013,2014,2015,2016,2017,2018
+./lib/isccfg/win32/libisccfg.vcxproj.user	X	2013,2018
+./lib/isccfg/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016,2018
+./lib/ns/Atffile				X	2017,2018
+./lib/ns/Kyuafile				X	2017,2018
+./lib/ns/Makefile.in				MAKE	2017,2018
+./lib/ns/api					X	2017,2018
 ./lib/ns/client.c				C	2017,2018
 ./lib/ns/hooks.h				C	2017,2018
-./lib/ns/include/Makefile.in			MAKE	2017
-./lib/ns/include/ns/Makefile.in			MAKE	2017
+./lib/ns/include/Makefile.in			MAKE	2017,2018
+./lib/ns/include/ns/Makefile.in			MAKE	2017,2018
 ./lib/ns/include/ns/client.h			C	2017,2018
-./lib/ns/include/ns/interfacemgr.h		C	2017
-./lib/ns/include/ns/lib.h			C	2017
-./lib/ns/include/ns/listenlist.h		C	2017
-./lib/ns/include/ns/log.h			C	2017
-./lib/ns/include/ns/notify.h			C	2017
-./lib/ns/include/ns/query.h			C	2017
+./lib/ns/include/ns/interfacemgr.h		C	2017,2018
+./lib/ns/include/ns/lib.h			C	2017,2018
+./lib/ns/include/ns/listenlist.h		C	2017,2018
+./lib/ns/include/ns/log.h			C	2017,2018
+./lib/ns/include/ns/notify.h			C	2017,2018
+./lib/ns/include/ns/query.h			C	2017,2018
 ./lib/ns/include/ns/server.h			C	2017,2018
-./lib/ns/include/ns/sortlist.h			C	2017
-./lib/ns/include/ns/stats.h			C	2017
-./lib/ns/include/ns/types.h			C	2017
-./lib/ns/include/ns/update.h			C	2017
-./lib/ns/include/ns/version.h			C	2017
-./lib/ns/include/ns/xfrout.h			C	2017
-./lib/ns/interfacemgr.c				C	2017
-./lib/ns/lib.c					C	2017
-./lib/ns/listenlist.c				C	2017
-./lib/ns/log.c					C	2017
+./lib/ns/include/ns/sortlist.h			C	2017,2018
+./lib/ns/include/ns/stats.h			C	2017,2018
+./lib/ns/include/ns/types.h			C	2017,2018
+./lib/ns/include/ns/update.h			C	2017,2018
+./lib/ns/include/ns/version.h			C	2017,2018
+./lib/ns/include/ns/xfrout.h			C	2017,2018
+./lib/ns/interfacemgr.c				C	2017,2018
+./lib/ns/lib.c					C	2017,2018
+./lib/ns/listenlist.c				C	2017,2018
+./lib/ns/log.c					C	2017,2018
 ./lib/ns/notify.c				C	2017,2018
 ./lib/ns/query.c				C	2017,2018
-./lib/ns/server.c				C	2017
-./lib/ns/sortlist.c				C	2017
-./lib/ns/stats.c				C	2017
-./lib/ns/tests/Atffile				X	2017
-./lib/ns/tests/Kyuafile				X	2017
-./lib/ns/tests/Makefile.in			MAKE	2017
-./lib/ns/tests/listenlist_test.c		C	2017
-./lib/ns/tests/notify_test.c			C	2017
+./lib/ns/server.c				C	2017,2018
+./lib/ns/sortlist.c				C	2017,2018
+./lib/ns/stats.c				C	2017,2018
+./lib/ns/tests/Atffile				X	2017,2018
+./lib/ns/tests/Kyuafile				X	2017,2018
+./lib/ns/tests/Makefile.in			MAKE	2017,2018
+./lib/ns/tests/listenlist_test.c		C	2017,2018
+./lib/ns/tests/notify_test.c			C	2017,2018
 ./lib/ns/tests/nstest.c				C	2017,2018
-./lib/ns/tests/nstest.h				C	2017
+./lib/ns/tests/nstest.h				C	2017,2018
 ./lib/ns/tests/query_test.c			C	2017,2018
-./lib/ns/tests/testdata/notify/notify1.msg	X	2017
-./lib/ns/tests/testdata/notify/zone1.db		ZONE	2017
-./lib/ns/tests/testdata/query/foo.db		ZONE	2017
+./lib/ns/tests/testdata/notify/notify1.msg	X	2017,2018
+./lib/ns/tests/testdata/notify/zone1.db		ZONE	2017,2018
+./lib/ns/tests/testdata/query/foo.db		ZONE	2017,2018
 ./lib/ns/update.c				C	2017,2018
-./lib/ns/version.c				C	2017
-./lib/ns/win32/DLLMain.c			C	2017
+./lib/ns/version.c				C	2017,2018
+./lib/ns/win32/DLLMain.c			C	2017,2018
 ./lib/ns/win32/libns.def			X	2017,2018
-./lib/ns/win32/libns.vcxproj.filters		X	2017
-./lib/ns/win32/libns.vcxproj.in			X	2017
-./lib/ns/win32/libns.vcxproj.user		X	2017
-./lib/ns/win32/version.c			C	2017
-./lib/ns/xfrout.c				C	2017
-./lib/samples/.gitignore			X	2013,2014
-./lib/samples/Makefile-postinstall.in		MAKE	2009,2012,2013,2014,2016,2017
-./lib/samples/Makefile.in			MAKE	2009,2012,2013,2014,2015,2016,2017
+./lib/ns/win32/libns.vcxproj.filters		X	2017,2018
+./lib/ns/win32/libns.vcxproj.in			X	2017,2018
+./lib/ns/win32/libns.vcxproj.user		X	2017,2018
+./lib/ns/win32/version.c			C	2017,2018
+./lib/ns/xfrout.c				C	2017,2018
+./lib/samples/.gitignore			X	2013,2014,2018
+./lib/samples/Makefile-postinstall.in		MAKE	2009,2012,2013,2014,2016,2017,2018
+./lib/samples/Makefile.in			MAKE	2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/samples/nsprobe.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2018
 ./lib/samples/resolve.c				C	2009,2012,2013,2014,2015,2016,2017,2018
-./lib/samples/rootkey.sh			SH	2013,2016
+./lib/samples/rootkey.sh			SH	2013,2016,2018
 ./lib/samples/sample-async.c			C	2009,2013,2014,2015,2016,2018
-./lib/samples/sample-gai.c			C	2009,2012,2013,2014,2015,2016
+./lib/samples/sample-gai.c			C	2009,2012,2013,2014,2015,2016,2018
 ./lib/samples/sample-request.c			C	2009,2012,2013,2014,2015,2016,2018
 ./lib/samples/sample-update.c			C	2009,2010,2012,2013,2014,2015,2016,2017,2018
-./lib/samples/win32/async.vcxproj.filters.in	X	2014,2015
-./lib/samples/win32/async.vcxproj.in		X	2014,2015,2016,2017
-./lib/samples/win32/async.vcxproj.user		X	2014
-./lib/samples/win32/gai.vcxproj.filters.in	X	2014,2015
-./lib/samples/win32/gai.vcxproj.in		X	2014,2015,2016,2017
-./lib/samples/win32/gai.vcxproj.user		X	2014
-./lib/samples/win32/nsprobe.vcxproj.filters.in	X	2014,2015
-./lib/samples/win32/nsprobe.vcxproj.in		X	2014,2015,2016,2017
-./lib/samples/win32/nsprobe.vcxproj.user	X	2014
-./lib/samples/win32/request.vcxproj.filters.in	X	2014,2015
-./lib/samples/win32/request.vcxproj.in		X	2014,2015,2016,2017
-./lib/samples/win32/request.vcxproj.user	X	2014
-./lib/samples/win32/resolve.vcxproj.filters.in	X	2014,2015
-./lib/samples/win32/resolve.vcxproj.in		X	2014,2015,2016,2017
-./lib/samples/win32/resolve.vcxproj.user	X	2014
-./lib/samples/win32/update.vcxproj.filters.in	X	2014,2015
-./lib/samples/win32/update.vcxproj.in		X	2014,2015,2016,2017
-./lib/samples/win32/update.vcxproj.user		X	2014
-./lib/tests/Makefile.in				MAKE	1998,1999,2000,2001,2003,2004,2007,2009,2012,2016,2017
-./lib/tests/T_testlist.imp			X	2004
-./lib/tests/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2016
-./lib/tests/include/tests/Makefile.in		MAKE	1999,2000,2001,2004,2007,2012,2015,2016
-./lib/tests/include/tests/t_api.h		C	1999,2000,2001,2004,2005,2006,2007,2010,2013,2014,2016,2017
-./lib/tests/t_api.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2013,2014,2016,2017
-./lib/tests/win32/DLLMain.c			C	2013,2016
-./lib/tests/win32/libtests.def			X	2013
-./lib/tests/win32/libtests.vcxproj.filters.in	X	2013,2015
-./lib/tests/win32/libtests.vcxproj.in		X	2013,2015,2016,2017
-./lib/tests/win32/libtests.vcxproj.user		X	2013
-./lib/win32/bindevt/bindevt.c			C	2000,2001,2004,2007,2016
-./lib/win32/bindevt/bindevt.mc			MC	2001,2004,2007,2016
-./lib/win32/bindevt/bindevt.vcxproj.filters.in	X	2013,2015
-./lib/win32/bindevt/bindevt.vcxproj.in		X	2013,2014,2015,2016
-./lib/win32/bindevt/bindevt.vcxproj.user	X	2013
-./libtool.m4/libtool.m4				X	2012
-./libtool.m4/ltoptions.m4			X	2012
-./libtool.m4/ltsugar.m4				X	2012
-./libtool.m4/ltversion.m4			X	2012
-./libtool.m4/lt~obsolete.m4			X	2012
-./ltmain.sh					X	1999,2000,2001,2003,2004,2006,2009,2012
-./make/.gitignore				X	2012
-./make/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2012,2016
-./make/includes.in				MAKE	1999,2000,2001,2004,2005,2007,2012,2014,2016,2017
-./make/mkdep.in					X	1999,2000,2001,2006,2011,2014
-./make/rules.in					MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./mkinstalldirs					X	1996
-./unit/.gitignore				X	2012,2014
-./unit/Makefile.in				MAKE	2011,2012,2017
-./unit/README					X	2011,2013
+./lib/samples/win32/async.vcxproj.filters.in	X	2014,2015,2018
+./lib/samples/win32/async.vcxproj.in		X	2014,2015,2016,2017,2018
+./lib/samples/win32/async.vcxproj.user		X	2014,2018
+./lib/samples/win32/gai.vcxproj.filters.in	X	2014,2015,2018
+./lib/samples/win32/gai.vcxproj.in		X	2014,2015,2016,2017,2018
+./lib/samples/win32/gai.vcxproj.user		X	2014,2018
+./lib/samples/win32/nsprobe.vcxproj.filters.in	X	2014,2015,2018
+./lib/samples/win32/nsprobe.vcxproj.in		X	2014,2015,2016,2017,2018
+./lib/samples/win32/nsprobe.vcxproj.user	X	2014,2018
+./lib/samples/win32/request.vcxproj.filters.in	X	2014,2015,2018
+./lib/samples/win32/request.vcxproj.in		X	2014,2015,2016,2017,2018
+./lib/samples/win32/request.vcxproj.user	X	2014,2018
+./lib/samples/win32/resolve.vcxproj.filters.in	X	2014,2015,2018
+./lib/samples/win32/resolve.vcxproj.in		X	2014,2015,2016,2017,2018
+./lib/samples/win32/resolve.vcxproj.user	X	2014,2018
+./lib/samples/win32/update.vcxproj.filters.in	X	2014,2015,2018
+./lib/samples/win32/update.vcxproj.in		X	2014,2015,2016,2017,2018
+./lib/samples/win32/update.vcxproj.user		X	2014,2018
+./lib/tests/Makefile.in				MAKE	1998,1999,2000,2001,2003,2004,2007,2009,2012,2016,2017,2018
+./lib/tests/T_testlist.imp			X	2004,2018
+./lib/tests/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2016,2018
+./lib/tests/include/tests/Makefile.in		MAKE	1999,2000,2001,2004,2007,2012,2015,2016,2018
+./lib/tests/include/tests/t_api.h		C	1999,2000,2001,2004,2005,2006,2007,2010,2013,2014,2016,2017,2018
+./lib/tests/t_api.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2013,2014,2016,2017,2018
+./lib/tests/win32/DLLMain.c			C	2013,2016,2018
+./lib/tests/win32/libtests.def			X	2013,2018
+./lib/tests/win32/libtests.vcxproj.filters.in	X	2013,2015,2018
+./lib/tests/win32/libtests.vcxproj.in		X	2013,2015,2016,2017,2018
+./lib/tests/win32/libtests.vcxproj.user		X	2013,2018
+./lib/win32/bindevt/bindevt.c			C	2000,2001,2004,2007,2016,2018
+./lib/win32/bindevt/bindevt.mc			MC	2001,2004,2007,2016,2018
+./lib/win32/bindevt/bindevt.vcxproj.filters.in	X	2013,2015,2018
+./lib/win32/bindevt/bindevt.vcxproj.in		X	2013,2014,2015,2016,2018
+./lib/win32/bindevt/bindevt.vcxproj.user	X	2013,2018
+./libtool.m4/libtool.m4				X	2012,2018
+./libtool.m4/ltoptions.m4			X	2012,2018
+./libtool.m4/ltsugar.m4				X	2012,2018
+./libtool.m4/ltversion.m4			X	2012,2018
+./libtool.m4/lt~obsolete.m4			X	2012,2018
+./ltmain.sh					X	1999,2000,2001,2003,2004,2006,2009,2012,2018
+./make/.gitignore				X	2012,2018
+./make/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2012,2016,2018
+./make/includes.in				MAKE	1999,2000,2001,2004,2005,2007,2012,2014,2016,2017,2018
+./make/mkdep.in					X	1999,2000,2001,2006,2011,2014,2018
+./make/rules.in					MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./mkinstalldirs					X	1996,2018
+./unit/.gitignore				X	2012,2014,2018
+./unit/Makefile.in				MAKE	2011,2012,2017,2018
+./unit/README					X	2011,2013,2018
 ./unit/atf-src/.travis.yml			X	2018
-./unit/atf-src/AUTHORS				X	2011,2013
+./unit/atf-src/AUTHORS				X	2011,2013,2018
 ./unit/atf-src/Atffile				X	2011,2013,2018
-./unit/atf-src/COPYING				X	2011,2013
-./unit/atf-src/INSTALL				X	2011,2013
+./unit/atf-src/COPYING				X	2011,2013,2018
+./unit/atf-src/INSTALL				X	2011,2013,2018
 ./unit/atf-src/Kyuafile				X	2013,2018
 ./unit/atf-src/Makefile.am			X	2011,2013,2018
 ./unit/atf-src/Makefile.in			X	2011,2013,2018
 ./unit/atf-src/NEWS				X	2011,2013,2018
-./unit/atf-src/README				X	2011
+./unit/atf-src/README				X	2011,2018
 ./unit/atf-src/README.md			X	2018
 ./unit/atf-src/aclocal.m4			X	2011,2013,2018
 ./unit/atf-src/admin/Makefile.am.inc		X	2011,2013,2018
@@ -4399,7 +4403,7 @@
 ./unit/atf-src/atf-c++/Makefile.am.inc		X	2011,2013,2018
 ./unit/atf-src/atf-c++/atf-c++.3		X	2018
 ./unit/atf-src/atf-c++/atf-c++.m4		X	2013,2018
-./unit/atf-src/atf-c++/atf-c++.pc.in		X	2011
+./unit/atf-src/atf-c++/atf-c++.pc.in		X	2011,2018
 ./unit/atf-src/atf-c++/atf_c++_test.cpp		X	2011,2018
 ./unit/atf-src/atf-c++/build.cpp		X	2011,2018
 ./unit/atf-src/atf-c++/build.hpp		X	2011,2018
@@ -4451,7 +4455,7 @@
 ./unit/atf-src/atf-c/Makefile.am.inc		X	2011,2013,2018
 ./unit/atf-src/atf-c/atf-c.3			X	2018
 ./unit/atf-src/atf-c/atf-c.m4			X	2013,2018
-./unit/atf-src/atf-c/atf-c.pc.in		X	2011
+./unit/atf-src/atf-c/atf-c.pc.in		X	2011,2018
 ./unit/atf-src/atf-c/atf-common.m4		X	2013,2018
 ./unit/atf-src/atf-c/atf_c_test.c		X	2011,2013,2018
 ./unit/atf-src/atf-c/build.c			X	2011,2018
@@ -4461,8 +4465,8 @@
 ./unit/atf-src/atf-c/check.h			X	2011,2013,2018
 ./unit/atf-src/atf-c/check_test.c		X	2011,2013,2018
 ./unit/atf-src/atf-c/defs.h.in			X	2011,2013,2018
-./unit/atf-src/atf-c/detail/Atffile		X	2011,2013
-./unit/atf-src/atf-c/detail/Kyuafile		X	2013
+./unit/atf-src/atf-c/detail/Atffile		X	2011,2013,2018
+./unit/atf-src/atf-c/detail/Kyuafile		X	2013,2018
 ./unit/atf-src/atf-c/detail/Makefile.am.inc	X	2011,2013,2018
 ./unit/atf-src/atf-c/detail/dynstr.c		X	2011,2013,2018
 ./unit/atf-src/atf-c/detail/dynstr.h		X	2011,2013,2018
@@ -4515,9 +4519,9 @@
 ./unit/atf-src/atf-c/utils.c			X	2011,2013,2018
 ./unit/atf-src/atf-c/utils.h			X	2011,2013,2018
 ./unit/atf-src/atf-c/utils_test.c		X	2011,2013,2018
-./unit/atf-src/atf-sh/.gitignore		X	2014
-./unit/atf-src/atf-sh/Atffile			X	2011
-./unit/atf-src/atf-sh/Kyuafile			X	2013
+./unit/atf-src/atf-sh/.gitignore		X	2014,2018
+./unit/atf-src/atf-sh/Atffile			X	2011,2018
+./unit/atf-src/atf-sh/Kyuafile			X	2013,2018
 ./unit/atf-src/atf-sh/Makefile.am.inc		X	2011,2013,2018
 ./unit/atf-src/atf-sh/atf-check.1		X	2011,2013,2018
 ./unit/atf-src/atf-sh/atf-check.cpp		X	2011,2013,2018
@@ -4526,7 +4530,7 @@
 ./unit/atf-src/atf-sh/atf-sh.3			X	2018
 ./unit/atf-src/atf-sh/atf-sh.cpp		X	2011,2013,2018
 ./unit/atf-src/atf-sh/atf-sh.m4			X	2013,2018
-./unit/atf-src/atf-sh/atf-sh.pc.in		X	2013
+./unit/atf-src/atf-sh/atf-sh.pc.in		X	2013,2018
 ./unit/atf-src/atf-sh/atf_check_test.sh		X	2011,2013,2018
 ./unit/atf-src/atf-sh/config_test.sh		X	2011,2013,2018
 ./unit/atf-src/atf-sh/integration_test.sh	X	2011,2018
@@ -4545,17 +4549,17 @@
 ./unit/atf-src/bootstrap/h_tp_basic_sh.sh	X	2011,2013,2018
 ./unit/atf-src/bootstrap/h_tp_fail.sh		X	2011,2018
 ./unit/atf-src/bootstrap/h_tp_pass.sh		X	2011,2018
-./unit/atf-src/bootstrap/package.m4		X	2011,2013
-./unit/atf-src/bootstrap/t_application_help.at	X	2011,2013
-./unit/atf-src/bootstrap/t_application_opts_args.at	X	2011,2013
-./unit/atf-src/bootstrap/t_atf_config.at	X	2011,2013
-./unit/atf-src/bootstrap/t_atf_run.at		X	2011,2013
+./unit/atf-src/bootstrap/package.m4		X	2011,2013,2018
+./unit/atf-src/bootstrap/t_application_help.at	X	2011,2013,2018
+./unit/atf-src/bootstrap/t_application_opts_args.at	X	2011,2013,2018
+./unit/atf-src/bootstrap/t_atf_config.at	X	2011,2013,2018
+./unit/atf-src/bootstrap/t_atf_run.at		X	2011,2013,2018
 ./unit/atf-src/bootstrap/t_subr_atf_check.at	X	2011,2013,2018
 ./unit/atf-src/bootstrap/t_test_program_compare.at	X	2011,2013,2018
 ./unit/atf-src/bootstrap/t_test_program_filter.at	X	2011,2013,2018
 ./unit/atf-src/bootstrap/t_test_program_list.at	X	2011,2013,2018
 ./unit/atf-src/bootstrap/t_test_program_run.at	X	2011,2013,2018
-./unit/atf-src/bootstrap/testsuite		X	2011,2013
+./unit/atf-src/bootstrap/testsuite		X	2011,2013,2018
 ./unit/atf-src/bootstrap/testsuite.at		X	2011,2013,2018
 ./unit/atf-src/config.h.in			X	2018
 ./unit/atf-src/configure			X	2011,2013,2018
@@ -4564,9 +4568,9 @@
 ./unit/atf-src/doc/atf-test-case.4		X	2011,2013,2018
 ./unit/atf-src/doc/atf-test-program.1		X	2011,2013,2018
 ./unit/atf-src/doc/atf.7.in			X	2011,2013,2018
-./unit/atf-src/m4/compiler-flags.m4		X	2011,2013
+./unit/atf-src/m4/compiler-flags.m4		X	2011,2013,2018
 ./unit/atf-src/m4/cxx-std-funcs.m4		X	2011,2013,2018
-./unit/atf-src/m4/developer-mode.m4		X	2011,2013
+./unit/atf-src/m4/developer-mode.m4		X	2011,2013,2018
 ./unit/atf-src/m4/libtool.m4			X	2011,2018
 ./unit/atf-src/m4/ltoptions.m4			X	2011,2018
 ./unit/atf-src/m4/ltsugar.m4			X	2011,2018
@@ -4576,10 +4580,10 @@
 ./unit/atf-src/m4/module-defs.m4		X	2011,2013,2018
 ./unit/atf-src/m4/module-env.m4			X	2011,2013,2018
 ./unit/atf-src/m4/module-fs.m4			X	2011,2013,2018
-./unit/atf-src/m4/module-signals.m4		X	2011,2013
+./unit/atf-src/m4/module-signals.m4		X	2011,2013,2018
 ./unit/atf-src/m4/runtime-tool.m4		X	2011,2018
-./unit/atf-src/test-programs/Atffile		X	2011,2013
-./unit/atf-src/test-programs/Kyuafile		X	2013
+./unit/atf-src/test-programs/Atffile		X	2011,2013,2018
+./unit/atf-src/test-programs/Kyuafile		X	2013,2018
 ./unit/atf-src/test-programs/Makefile.am.inc	X	2011,2013,2018
 ./unit/atf-src/test-programs/c_helpers.c	X	2011,2013,2018
 ./unit/atf-src/test-programs/common.sh		X	2011,2018
@@ -4682,46 +4686,44 @@
 ./unit/atf-src/tools/user_test.cpp		X	2018
 ./unit/atf-src/tools/zero_tcs_helper.c		X	2018
 ./unit/unittest.sh.in				X	2011,2012,2015,2018
-./util/COPYRIGHT				X	1996,1997,1998,1999,2000,2001,2004,2007,2016
-./util/COPYRIGHT.BRIEF				X	1996,1997,1998,1999,2000,2001,2004,2016
-./util/COPYRIGHT.BSDI				X	2000,2001,2004,2007,2016
-./util/COPYRIGHT.NAI				X	1996,1997,1998,1999,2000,2001,2004,2007,2016
-./util/COPYRIGHT.NOM				X	2001,2004,2007,2016
-./util/COPYRIGHT.PORTION			X	1996,1997,1998,1999,2000,2001,2004,2007,2016
-./util/altbuild.sh				SH	2000,2001,2002,2004,2007,2008,2012,2016,2017
-./util/bindkeys.pl				PERL	2009,2010,2011,2012,2014,2016,2017
-./util/branchsync.sh				SH	2013,2016
-./util/check-categories.sh			SH	2015,2016,2017
-./util/check-changes				PERL	2002,2004,2007,2012,2016
-./util/check-includes.pl			PERL	2000,2001,2004,2007,2012,2016,2017
-./util/check-instincludes.sh			SH	2000,2001,2004,2007,2012,2016
-./util/check-pullups.pl				PERL	2001,2002,2003,2004,2007,2012,2016
-./util/check-sources.pl				PERL	2000,2001,2004,2007,2012,2013,2016
-./util/checklibs.sh				SH	2017
-./util/commit-arm.sh				SH	2012,2016
+./util/COPYRIGHT				X	1996,1997,1998,1999,2000,2001,2004,2007,2016,2018
+./util/COPYRIGHT.BRIEF				X	1996,1997,1998,1999,2000,2001,2004,2016,2018
+./util/COPYRIGHT.BSDI				X	2000,2001,2004,2007,2016,2018
+./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/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
+./util/check-categories.sh			SH	2015,2016,2017,2018
+./util/check-changes				PERL	2002,2004,2007,2012,2016,2018
+./util/check-includes.pl			PERL	2000,2001,2004,2007,2012,2016,2017,2018
+./util/check-instincludes.sh			SH	2000,2001,2004,2007,2012,2016,2018
+./util/check-pullups.pl				PERL	2001,2002,2003,2004,2007,2012,2016,2018
+./util/check-sources.pl				PERL	2000,2001,2004,2007,2012,2013,2016,2018
+./util/checklibs.sh				SH	2017,2018
+./util/commit-arm.sh				SH	2012,2016,2018
 ./util/copyrights				X	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./util/file_year.sh				SH	2012,2016
-./util/kit.sh					SH	2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017
-./util/mandoc2docbook.pl			PERL	2001,2004,2007,2012,2016
-./util/mdnbuildtest.sh				SH	2000,2001,2004,2007,2012,2016
-./util/memleak.pl				PERL	1999,2000,2001,2004,2007,2012,2016
+./util/kit.sh					SH	2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018
+./util/mandoc2docbook.pl			PERL	2001,2004,2007,2012,2016,2018
+./util/mdnbuildtest.sh				SH	2000,2001,2004,2007,2012,2016,2018
+./util/memleak.pl				PERL	1999,2000,2001,2004,2007,2012,2016,2018
 ./util/merge_copyrights				PERL	1998,1999,2000,2001,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./util/mksymtbl.pl				PERL	2009,2012,2016
-./util/models.c					C	2015,2016,2017
-./util/nanny.pl					PERL	2000,2001,2004,2007,2012,2016
-./util/new-func					PERL	2005,2007,2012,2016
-./util/nt-kit					SH	1999,2000,2001,2004,2007,2012,2016
-./util/recent_changes.sh			SH	2012,2016,2017
-./util/spacewhack.pl				PERL	2000,2001,2004,2007,2012,2016
-./util/tabify-changes				SH	2004,2007,2012,2016
-./util/update-drafts.pl				PERL	2000,2001,2004,2007,2012,2016
-./util/update_branches				PERL	2005,2007,2012,2016
-./util/update_copyrights			PERL	1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017
-./util/xc					SH	2012,2013,2016
-./version					X	1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017
+./util/mksymtbl.pl				PERL	2009,2012,2016,2018
+./util/models.c					C	2015,2016,2017,2018
+./util/nanny.pl					PERL	2000,2001,2004,2007,2012,2016,2018
+./util/new-func					PERL	2005,2007,2012,2016,2018
+./util/nt-kit					SH	1999,2000,2001,2004,2007,2012,2016,2018
+./util/spacewhack.pl				PERL	2000,2001,2004,2007,2012,2016,2018
+./util/tabify-changes				SH	2004,2007,2012,2016,2018
+./util/update-drafts.pl				PERL	2000,2001,2004,2007,2012,2016,2018
+./util/update_branches				PERL	2005,2007,2012,2016,2018
+./util/update_copyrights			PERL	1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018
+./util/xc					SH	2012,2013,2016,2018
+./version					X	1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018
 ./win32utils/Configure				PERL	2013,2014,2015,2016,2017,2018
-./win32utils/GeoIP.diff				X	2013
-./win32utils/bind9.sln.in			X	2013,2014,2015,2016,2017
-./win32utils/build.txt				TXT.BRIEF	2013,2014,2015,2016,2017
-./win32utils/index.html				HTML	2006,2007,2008,2012,2013,2014,2015,2016
-./win32utils/readme1st.txt			TXT.BRIEF	2001,2003,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016
+./win32utils/GeoIP.diff				X	2013,2018
+./win32utils/bind9.sln.in			X	2013,2014,2015,2016,2017,2018
+./win32utils/build.txt				TXT.BRIEF	2013,2014,2015,2016,2017,2018
+./win32utils/index.html				HTML	2006,2007,2008,2012,2013,2014,2015,2016,2018
+./win32utils/readme1st.txt			TXT.BRIEF	2001,2003,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2018
diff --git a/util/kit.sh b/util/kit.sh
index c55fdafdc60..1e71f202bf2 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2004, 2007-2010, 2012-2017  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.
 
 # $Id$
 
diff --git a/util/mandoc2docbook.pl b/util/mandoc2docbook.pl
index 1a33c9c456c..4a3261c05fe 100644
--- a/util/mandoc2docbook.pl
+++ b/util/mandoc2docbook.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/mdnbuildtest.sh b/util/mdnbuildtest.sh
index 55d07f79d45..fb2b99d6cd8 100644
--- a/util/mdnbuildtest.sh
+++ b/util/mdnbuildtest.sh
@@ -1,10 +1,13 @@
 #! /bin/sh -ex
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/memleak.pl b/util/memleak.pl
index 40568e12ccb..1e12760be2b 100644
--- a/util/memleak.pl
+++ b/util/memleak.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/merge_copyrights b/util/merge_copyrights
index 5dd8596a2aa..47db96e5f94 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,10 +1,13 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 1998-2001, 2003-2007, 2009-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.
 
 use strict;
 
diff --git a/util/mksymtbl.pl b/util/mksymtbl.pl
index 2578142e732..c5205bbea09 100755
--- a/util/mksymtbl.pl
+++ b/util/mksymtbl.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2009, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/models.c b/util/models.c
index ce671987c79..2e2db2b1d8a 100644
--- a/util/models.c
+++ b/util/models.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2015-2017  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.
  */
 
 /*
diff --git a/util/nanny.pl b/util/nanny.pl
index fef9ec2ce80..2cd17711af8 100644
--- a/util/nanny.pl
+++ b/util/nanny.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/new-func b/util/new-func
index e0df6f4aed5..8ec849d724f 100644
--- a/util/new-func
+++ b/util/new-func
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2005, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/nt-kit b/util/nt-kit
index 50849127b14..8bcb432896a 100644
--- a/util/nt-kit
+++ b/util/nt-kit
@@ -1,10 +1,13 @@
 #! /bin/sh -ex
 #
-# Copyright (C) 1999-2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/spacewhack.pl b/util/spacewhack.pl
index 2fcd8668d0a..13e21ac5dcb 100644
--- a/util/spacewhack.pl
+++ b/util/spacewhack.pl
@@ -1,10 +1,13 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/tabify-changes b/util/tabify-changes
index f705d8371e5..05d8b20265b 100644
--- a/util/tabify-changes
+++ b/util/tabify-changes
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/update-drafts.pl b/util/update-drafts.pl
index 722903fe5f0..308d57a05a0 100644
--- a/util/update-drafts.pl
+++ b/util/update-drafts.pl
@@ -1,10 +1,13 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/update_branches b/util/update_branches
index 038b4b68742..0033f14446f 100644
--- a/util/update_branches
+++ b/util/update_branches
@@ -1,10 +1,13 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2005, 2007, 2012, 2016  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.
 
 # $Id$
 
diff --git a/util/update_copyrights b/util/update_copyrights
index e35b4582487..866303df978 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -1,10 +1,13 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 1998-2001, 2004-2010, 2012-2017  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.
 
 require 5.002;
 
diff --git a/util/xc b/util/xc
index 5151ff1de3d..5675ee5d771 100755
--- a/util/xc
+++ b/util/xc
@@ -1,8 +1,11 @@
-# Copyright (C) 2012, 2013, 2016  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.
 
 # $Id$
 
diff --git a/win32utils/Configure b/win32utils/Configure
index 35c9593c1a6..915cece5d1f 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -1,10 +1,13 @@
 #!/usr/bin/perl
 #
-# 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.
 
 # Configure
 #
diff --git a/win32utils/build.txt b/win32utils/build.txt
index 221d3748798..864b02ada44 100644
--- a/win32utils/build.txt
+++ b/win32utils/build.txt
@@ -1,9 +1,12 @@
-Copyright (C) 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2013-2018  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.
+
        BIND 9.10 for Win32 Source Build Instructions.  17-Apr-2015
 
 Building BIND 9.10 on Windows has the following prerequisites:
diff --git a/win32utils/index.html b/win32utils/index.html
index ae83a59bd41..e7bac6d4f14 100644
--- a/win32utils/index.html
+++ b/win32utils/index.html
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2006-2008, 2012-2016  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.
 -->
 
 <!-- $Id$ -->
diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index 10bec61c3f2..7bf55ee7da1 100644
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,9 +1,12 @@
-Copyright (C) 2001, 2003-2005, 2007-2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2001, 2003-2005, 2007-2009, 2012-2016, 2018  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.
+
 NOTES ON BIND 9.10 FOR WINDOWS:
 
 BIND 9.10 is known to run on Windows XP, Vista, Windows 7,