diff --git a/bin/named/server.c b/bin/named/server.c
index 73c292d85c..48b0213bff 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9269,7 +9269,7 @@ ns_server_add_zone(ns_server_t *server, char *args, isc_buffer_t *text) {
 
 	/* Check the zone type for ones that are not supported by addzone. */
 	zoptions = cfg_tuple_get(parms, "options");
- 
+
 	obj = NULL;
 	(void)cfg_map_get(zoptions, "type", &obj);
 	if (obj == NULL) {
@@ -9282,7 +9282,7 @@ ns_server_add_zone(ns_server_t *server, char *args, isc_buffer_t *text) {
 			(void) putstr(text, "zone type not specified");
 		CHECK(ISC_R_FAILURE);
 	}
- 
+
 	if (strcasecmp(cfg_obj_asstring(obj), "hint") == 0 ||
 	    strcasecmp(cfg_obj_asstring(obj), "forward") == 0 ||
 	    strcasecmp(cfg_obj_asstring(obj), "redirect") == 0 ||
diff --git a/bin/tests/system/addzone/ns2/hints.db b/bin/tests/system/addzone/ns2/hints.db
index 274ec9a845..6c3e8a575d 100644
--- a/bin/tests/system/addzone/ns2/hints.db
+++ b/bin/tests/system/addzone/ns2/hints.db
@@ -1,8 +1,16 @@
-; Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 ;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+; 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.
 
 ; $Id: root.hint,v 1.5 2007/06/19 23:47:01 tbox Exp $
 
diff --git a/bin/tests/system/addzone/ns2/redirect.db b/bin/tests/system/addzone/ns2/redirect.db
index 63a371b4be..e9e543a65f 100644
--- a/bin/tests/system/addzone/ns2/redirect.db
+++ b/bin/tests/system/addzone/ns2/redirect.db
@@ -1,7 +1,16 @@
 ; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
-; 
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; 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.
+
 @	0	SOA	. . 0 0 0 0 0
 @	0	NS	.
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 5b8166a179..e76863afc8 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1638,7 +1638,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 	    ((msg->flags & DNS_MESSAGEFLAG_QR) != 0) &&
 	    ((msg->flags & DNS_MESSAGEFLAG_TC) == 0) &&
 	    !preserve_order &&
-	    !auth_signed(section)) 
+	    !auth_signed(section))
 		DO_FORMERR;
 
 	if (seen_problem)