diff --git a/bin/named/main.c b/bin/named/main.c
index 080ccb3f0d..556db5459c 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -306,7 +306,7 @@ lwresd_usage(void) {
 		"usage: lwresd [-4|-6] [-c conffile | -C resolvconffile] "
 		"[-d debuglevel] [-f|-g]\n"
 		"              [-i pidfile] [-n number_of_cpus] "
-	        "[-p port] [-P listen-port]\n"
+		"[-p port] [-P listen-port]\n"
 		"              [-s] [-S sockets] [-t chrootdir] [-u username] "
 		"[-U listeners]\n"
 		"              [-m {usage|trace|record|size|mctx}]\n"
diff --git a/bin/tests/system/checkconf/good-acl.conf b/bin/tests/system/checkconf/good-acl.conf
index 84ff712c36..043375e8ec 100644
--- a/bin/tests/system/checkconf/good-acl.conf
+++ b/bin/tests/system/checkconf/good-acl.conf
@@ -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.
+ */
+
 acl a {
 	{ "none"; };
 	{ !19.0.0.0/0; };
diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index af62a7b126..623c87c6d5 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any