diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
index c731a5d953..534fd72b96 100644
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
index 79db6f1aa1..16774fb501 100644
--- a/bin/python/dnssec-checkds.py.in
+++ b/bin/python/dnssec-checkds.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/dnssec-coverage.docbook b/bin/python/dnssec-coverage.docbook
index 892801ecd0..29369227fd 100644
--- a/bin/python/dnssec-coverage.docbook
+++ b/bin/python/dnssec-coverage.docbook
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -40,6 +40,7 @@
       <year>2013</year>
       <year>2014</year>
       <year>2015</year>
+      <year>2016</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 8a8e25012f..af33331a22 100644
--- a/bin/python/dnssec-coverage.py.in
+++ b/bin/python/dnssec-coverage.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/dnssec-keymgr.py.in b/bin/python/dnssec-keymgr.py.in
index 23d563d71f..c300c018b6 100644
--- a/bin/python/dnssec-keymgr.py.in
+++ b/bin/python/dnssec-keymgr.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/Makefile.in b/bin/python/isc/Makefile.in
index 425d054cce..802ef67851 100644
--- a/bin/python/isc/Makefile.in
+++ b/bin/python/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/__init__.py b/bin/python/isc/__init__.py
index 0d79f356fd..f0770859ec 100644
--- a/bin/python/isc/__init__.py
+++ b/bin/python/isc/__init__.py
@@ -1,17 +1,18 @@
-# Copyright (C) 2015  Internet Systems Consortium.
+############################################################################
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and distribute this software for any
+# Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
 #
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+############################################################################
 
 __all__ = ['dnskey', 'eventlist', 'keydict', 'keyevent', 'keyseries',
            'keyzone', 'policy', 'parsetab', 'utils']
diff --git a/bin/python/isc/checkds.py b/bin/python/isc/checkds.py
index 64ca12ebc6..6be5e444b8 100644
--- a/bin/python/isc/checkds.py
+++ b/bin/python/isc/checkds.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/coverage.py b/bin/python/isc/coverage.py
index c9e89596f7..01ceef2730 100644
--- a/bin/python/isc/coverage.py
+++ b/bin/python/isc/coverage.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/dnskey.py b/bin/python/isc/dnskey.py
index f1559e7239..10c14b9664 100644
--- a/bin/python/isc/dnskey.py
+++ b/bin/python/isc/dnskey.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/eventlist.py b/bin/python/isc/eventlist.py
index 4c91368f12..c64aa23edc 100644
--- a/bin/python/isc/eventlist.py
+++ b/bin/python/isc/eventlist.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/keydict.py b/bin/python/isc/keydict.py
index cc73dc47ac..078689ba46 100644
--- a/bin/python/isc/keydict.py
+++ b/bin/python/isc/keydict.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/keyevent.py b/bin/python/isc/keyevent.py
index 9025feec4a..6e9a29d490 100644
--- a/bin/python/isc/keyevent.py
+++ b/bin/python/isc/keyevent.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/keymgr.py b/bin/python/isc/keymgr.py
index a3a9043965..8aa6cceff8 100644
--- a/bin/python/isc/keymgr.py
+++ b/bin/python/isc/keymgr.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/keyseries.py b/bin/python/isc/keyseries.py
index ed09f71fda..3120d0226d 100644
--- a/bin/python/isc/keyseries.py
+++ b/bin/python/isc/keyseries.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/keyzone.py b/bin/python/isc/keyzone.py
index 7dfb31ac55..dc0c7ea051 100644
--- a/bin/python/isc/keyzone.py
+++ b/bin/python/isc/keyzone.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/policy.py b/bin/python/isc/policy.py
index ed106c6c92..3a04d6ab97 100644
--- a/bin/python/isc/policy.py
+++ b/bin/python/isc/policy.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -13,9 +13,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 ############################################################################
-# policy.py
-# This module implements the parser for the dnssec.policy file.
-############################################################################
 
 import re
 import ply.lex as lex
diff --git a/bin/python/isc/tests/Makefile.in b/bin/python/isc/tests/Makefile.in
index 506f2cc992..baca4ff25b 100644
--- a/bin/python/isc/tests/Makefile.in
+++ b/bin/python/isc/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/tests/dnskey_test.py b/bin/python/isc/tests/dnskey_test.py
index 2a63695ebe..11e16515f1 100644
--- a/bin/python/isc/tests/dnskey_test.py
+++ b/bin/python/isc/tests/dnskey_test.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/tests/policy_test.py b/bin/python/isc/tests/policy_test.py
index c35e023ad3..61daa91056 100644
--- a/bin/python/isc/tests/policy_test.py
+++ b/bin/python/isc/tests/policy_test.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # 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/python/isc/tests/test-policies/01-keysize.pol b/bin/python/isc/tests/test-policies/01-keysize.pol
index b54f1e33ae..ad1d82b2ad 100644
--- a/bin/python/isc/tests/test-policies/01-keysize.pol
+++ b/bin/python/isc/tests/test-policies/01-keysize.pol
@@ -1,41 +1,57 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy keysize_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+	algorithm rsasha1;
+	coverage 1y;
+	roll-period zsk 3mo;
+	pre-publish zsk 2w;
+	post-publish zsk 2w;
+	roll-period ksk 1y;
+	pre-publish ksk 1mo;
+	post-publish ksk 2mo;
+	keyttl 1h;
+	key-size ksk 2048;
+	key-size zsk 1024;
 };
 
 policy keysize_dsa {
-        algorithm dsa;
-        coverage 1y;
-        key-size ksk 2048;
-        key-size zsk 1024;
+	algorithm dsa;
+	coverage 1y;
+	key-size ksk 2048;
+	key-size zsk 1024;
 };
 
 zone good_rsa.test {
-        policy keysize_rsa;
+	policy keysize_rsa;
 };
 
 zone bad_rsa.test {
-        policy keysize_rsa;
-        key-size ksk 511;
+	policy keysize_rsa;
+	key-size ksk 511;
 };
 
 zone good_dsa.test {
-        policy keysize_dsa;
-        key-size ksk 1024;
-        key-size zsk 768;
+	policy keysize_dsa;
+	key-size ksk 1024;
+	key-size zsk 768;
 };
 
 zone bad_dsa.test {
-        policy keysize_dsa;
-        key-size ksk 1024;
-        key-size zsk 769;
+	policy keysize_dsa;
+	key-size ksk 1024;
+	key-size zsk 769;
 };
diff --git a/bin/python/isc/tests/test-policies/02-prepublish.pol b/bin/python/isc/tests/test-policies/02-prepublish.pol
index e4d11c2e54..5fdc566845 100644
--- a/bin/python/isc/tests/test-policies/02-prepublish.pol
+++ b/bin/python/isc/tests/test-policies/02-prepublish.pol
@@ -1,31 +1,47 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy prepublish_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+	algorithm rsasha1;
+	coverage 1y;
+	roll-period zsk 3mo;
+	pre-publish zsk 2w;
+	post-publish zsk 2w;
+	roll-period ksk 1y;
+	pre-publish ksk 1mo;
+	post-publish ksk 2mo;
+	keyttl 1h;
+	key-size ksk 2048;
+	key-size zsk 1024;
 };
 
 // Policy that defines a pre-publish period lower than the rollover period
 zone good_prepublish.test {
-        policy prepublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 1mo;
+	policy prepublish_rsa;
+	coverage 6mo;
+	roll-period ksk 4mo;
+	pre-publish ksk 1mo;
 };
 
 // Policy that defines a pre-publish period equal to the rollover period
 zone bad_prepublish.test {
-        policy prepublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 4mo;
+	policy prepublish_rsa;
+	coverage 6mo;
+	roll-period ksk 4mo;
+	pre-publish ksk 4mo;
 };
 
 
diff --git a/bin/python/isc/tests/test-policies/03-postpublish.pol b/bin/python/isc/tests/test-policies/03-postpublish.pol
index a4c3a99e99..d95ce30906 100644
--- a/bin/python/isc/tests/test-policies/03-postpublish.pol
+++ b/bin/python/isc/tests/test-policies/03-postpublish.pol
@@ -1,31 +1,47 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy postpublish_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+	algorithm rsasha1;
+	coverage 1y;
+	roll-period zsk 3mo;
+	pre-publish zsk 2w;
+	post-publish zsk 2w;
+	roll-period ksk 1y;
+	pre-publish ksk 1mo;
+	post-publish ksk 2mo;
+	keyttl 1h;
+	key-size ksk 2048;
+	key-size zsk 1024;
 };
 
 // Policy that defines a post-publish period lower than the rollover period
 zone good_postpublish.test {
-        policy postpublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 1mo;
+	policy postpublish_rsa;
+	coverage 6mo;
+	roll-period ksk 4mo;
+	pre-publish ksk 1mo;
 };
 
 // Policy that defines a post-publish period equal to the rollover period
 zone bad_postpublish.test {
-        policy postpublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 4mo;
+	policy postpublish_rsa;
+	coverage 6mo;
+	roll-period ksk 4mo;
+	pre-publish ksk 4mo;
 };
 
 
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 5695559b67..182c087ca6 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,55 +1,71 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy combined_pre_post_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+	algorithm rsasha1;
+	coverage 1y;
+	roll-period zsk 3mo;
+	pre-publish zsk 2w;
+	post-publish zsk 2w;
+	roll-period ksk 1y;
+	pre-publish ksk 1mo;
+	post-publish ksk 2mo;
+	keyttl 1h;
+	key-size ksk 2048;
+	key-size zsk 1024;
 };
 
 // Policy that defines a combined pre-publish and post-publish period lower
 // than the rollover period
 zone good_combined_pre_post_ksk.test {
-        policy combined_pre_post_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 1mo;
-        post-publish ksk 1mo;
+	policy combined_pre_post_rsa;
+	coverage 6mo;
+	roll-period ksk 4mo;
+	pre-publish ksk 1mo;
+	post-publish ksk 1mo;
 };
 
 // Policy that defines a combined pre-publish and post-publish period higher
 // than the rollover period
 zone bad_combined_pre_post_ksk.test {
-        policy combined_pre_post_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 2mo;
-        post-publish ksk 2mo;
+	policy combined_pre_post_rsa;
+	coverage 6mo;
+	roll-period ksk 4mo;
+	pre-publish ksk 2mo;
+	post-publish ksk 2mo;
 };
 
 // Policy that defines a combined pre-publish and post-publish period lower
 // than the rollover period
 zone good_combined_pre_post_zsk.test {
-        policy combined_pre_post_rsa;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 1mo;
-        post-publish zsk 1mo;
+	policy combined_pre_post_rsa;
+	coverage 1y;
+	roll-period zsk 3mo;
+	pre-publish zsk 1mo;
+	post-publish zsk 1mo;
 };
 
 // Policy that defines a combined pre-publish and post-publish period higher
 // than the rollover period
 zone bad_combined_pre_post_zsk.test {
-        policy combined_pre_post_rsa;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2mo;
-        post-publish zsk 2mo;
+	policy combined_pre_post_rsa;
+	coverage 1y;
+	roll-period zsk 3mo;
+	pre-publish zsk 2mo;
+	post-publish zsk 2mo;
 };
 
 
diff --git a/bin/python/isc/utils.py.in b/bin/python/isc/utils.py.in
index 48b9685f33..cac42e8ab4 100644
--- a/bin/python/isc/utils.py.in
+++ b/bin/python/isc/utils.py.in
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -13,9 +13,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 ############################################################################
-# utils.py
-# Grouping shared code in one place
-############################################################################
 
 import os
 
diff --git a/bin/tests/system/keymgr/01-ksk-inactive/README b/bin/tests/system/keymgr/01-ksk-inactive/README
index b807029d4a..e1adb73870 100644
--- a/bin/tests/system/keymgr/01-ksk-inactive/README
+++ b/bin/tests/system/keymgr/01-ksk-inactive/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one KSK rollover.  The KSK is deactivated prior to
 its replacement being activated.
diff --git a/bin/tests/system/keymgr/02-zsk-inactive/README b/bin/tests/system/keymgr/02-zsk-inactive/README
index bf56562b9a..71e47aab6d 100644
--- a/bin/tests/system/keymgr/02-zsk-inactive/README
+++ b/bin/tests/system/keymgr/02-zsk-inactive/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one ZSK rollover.  The first ZSK is deactivated
 prior to its replacement being activated.
diff --git a/bin/tests/system/keymgr/03-ksk-unpublished/README b/bin/tests/system/keymgr/03-ksk-unpublished/README
index 0581c6756c..d9d54f0799 100644
--- a/bin/tests/system/keymgr/03-ksk-unpublished/README
+++ b/bin/tests/system/keymgr/03-ksk-unpublished/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set contains one KSK rollover.  The KSK is unpublished before its
 successor is published.
diff --git a/bin/tests/system/keymgr/04-zsk-unpublished/README b/bin/tests/system/keymgr/04-zsk-unpublished/README
index 589490d597..eea7726576 100644
--- a/bin/tests/system/keymgr/04-zsk-unpublished/README
+++ b/bin/tests/system/keymgr/04-zsk-unpublished/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set contains one ZSK rollover.  The ZSK is unpublished before its
 successor is published.
diff --git a/bin/tests/system/keymgr/05-ksk-unpub-active/README b/bin/tests/system/keymgr/05-ksk-unpub-active/README
index 026028c5b5..bd1b3b8626 100644
--- a/bin/tests/system/keymgr/05-ksk-unpub-active/README
+++ b/bin/tests/system/keymgr/05-ksk-unpub-active/README
@@ -1,3 +1,6 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
 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 026028c5b5..bd1b3b8626 100644
--- a/bin/tests/system/keymgr/06-zsk-unpub-active/README
+++ b/bin/tests/system/keymgr/06-zsk-unpub-active/README
@@ -1,3 +1,6 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
 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 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/07-ksk-ttl/README
+++ b/bin/tests/system/keymgr/07-ksk-ttl/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/08-zsk-ttl/README b/bin/tests/system/keymgr/08-zsk-ttl/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/08-zsk-ttl/README
+++ b/bin/tests/system/keymgr/08-zsk-ttl/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/09-no-keys/README b/bin/tests/system/keymgr/09-no-keys/README
index 6295fa32b0..9798370f55 100644
--- a/bin/tests/system/keymgr/09-no-keys/README
+++ b/bin/tests/system/keymgr/09-no-keys/README
@@ -1 +1,4 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This directory has no key set, but one will be initialized by dnssec-keymgr.
diff --git a/bin/tests/system/keymgr/10-change-roll/README b/bin/tests/system/keymgr/10-change-roll/README
index 26073c3779..60db6f3176 100644
--- a/bin/tests/system/keymgr/10-change-roll/README
+++ b/bin/tests/system/keymgr/10-change-roll/README
@@ -1,3 +1,6 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This directory has a key set which is valid, but has a ZSK rollover period
 of only three months. It will be updated to have a ZSK rollover period of
 one year.
diff --git a/bin/tests/system/keymgr/11-many-simul/README b/bin/tests/system/keymgr/11-many-simul/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/11-many-simul/README
+++ b/bin/tests/system/keymgr/11-many-simul/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/12-many-active/README b/bin/tests/system/keymgr/12-many-active/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/12-many-active/README
+++ b/bin/tests/system/keymgr/12-many-active/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/13-noroll/README b/bin/tests/system/keymgr/13-noroll/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/13-noroll/README
+++ b/bin/tests/system/keymgr/13-noroll/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/14-wrongalg/README b/bin/tests/system/keymgr/14-wrongalg/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/14-wrongalg/README
+++ b/bin/tests/system/keymgr/14-wrongalg/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/15-unspec/README b/bin/tests/system/keymgr/15-unspec/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/15-unspec/README
+++ b/bin/tests/system/keymgr/15-unspec/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/16-wrongalg-unspec/README b/bin/tests/system/keymgr/16-wrongalg-unspec/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/16-wrongalg-unspec/README
+++ b/bin/tests/system/keymgr/16-wrongalg-unspec/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/17-noforce/README b/bin/tests/system/keymgr/17-noforce/README
index 8b9dc02503..ada05baef5 100644
--- a/bin/tests/system/keymgr/17-noforce/README
+++ b/bin/tests/system/keymgr/17-noforce/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.
diff --git a/bin/tests/system/keymgr/policy.conf b/bin/tests/system/keymgr/policy.conf
index e6b7d98c1a..12ffe8c922 100644
--- a/bin/tests/system/keymgr/policy.conf
+++ b/bin/tests/system/keymgr/policy.conf
@@ -1,10 +1,26 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy default {
-        policy global;
-        algorithm nsec3rsasha1;
-        key-size zsk 1024;
-        pre-publish zsk 6w;
-        post-publish zsk 6w;
-        roll-period zsk 6mo;
-        roll-period ksk 0;
-        coverage 364d;
+	policy global;
+	algorithm nsec3rsasha1;
+	key-size zsk 1024;
+	pre-publish zsk 6w;
+	post-publish zsk 6w;
+	roll-period zsk 6mo;
+	roll-period ksk 0;
+	coverage 364d;
 };
diff --git a/bin/tests/system/keymgr/policy.good b/bin/tests/system/keymgr/policy.good
index 0038a27939..8586ef24a9 100644
--- a/bin/tests/system/keymgr/policy.good
+++ b/bin/tests/system/keymgr/policy.good
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy default:
 	inherits global
 	directory None
diff --git a/bin/tests/system/keymgr/policy.sample b/bin/tests/system/keymgr/policy.sample
index d96a40dce9..ecc57588b1 100644
--- a/bin/tests/system/keymgr/policy.sample
+++ b/bin/tests/system/keymgr/policy.sample
@@ -1,30 +1,46 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 # a comment which should be skipped
 
 algorithm-policy rsasha1 {
-        key-size ksk 2048;
-        key-size zsk 1024;     // this too
+	key-size ksk 2048;
+	key-size zsk 1024;     // this too
 };
 
 // and this
 
 policy default {
-        directory "keydir";
-        algorithm rsasha1;
-        coverage 1y;            # another comment
-        roll-period zsk 6mo;    // and yet another
-        pre-publish zsk 6w;
-        post-publish zsk 6w;
-        keyttl 1h;
+	directory "keydir";
+	algorithm rsasha1;
+	coverage 1y;            # another comment
+	roll-period zsk 6mo;    // and yet another
+	pre-publish zsk 6w;
+	post-publish zsk 6w;
+	keyttl 1h;
 };
 
 policy extra {
-        policy default;
-        coverage 5y;
-        roll-period KSK 1 year;
-        roll-period zsk 3mo;
-        pre-publish ksk 3mo;
-        post-publish zsk 1w;
-        keyttl 2h;
+	policy default;
+	coverage 5y;
+	roll-period KSK 1 year;
+	roll-period zsk 3mo;
+	pre-publish ksk 3mo;
+	post-publish zsk 1w;
+	keyttl 2h;
 };
 
 /*
@@ -34,7 +50,7 @@ policy extra {
  */
 
 zone example.com {
-        policy extra;
-        coverage 5 mon;
-        algorithm nsec3rsasha1;
+	policy extra;
+	coverage 5 mon;
+	algorithm nsec3rsasha1;
 };
diff --git a/bin/tests/system/keymgr/testpolicy.py b/bin/tests/system/keymgr/testpolicy.py
index 2dec7ff5f3..9bf9b72646 100644
--- a/bin/tests/system/keymgr/testpolicy.py
+++ b/bin/tests/system/keymgr/testpolicy.py
@@ -1,4 +1,19 @@
-#!/bin/python
+############################################################################
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+############################################################################
+
 import sys
 sys.path.insert(0, '../../../python')
 from isc import *