diff --git a/bin/tests/system/checkconf/bad-rpz-zone.conf b/bin/tests/system/checkconf/bad-rpz-zone.conf
index 2b9399d05f..5738cf803c 100644
--- a/bin/tests/system/checkconf/bad-rpz-zone.conf
+++ b/bin/tests/system/checkconf/bad-rpz-zone.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.
+ */
+
 options {
 	response-policy {
 		zone "nonexistent";
diff --git a/lib/dns/client.c b/lib/dns/client.c
index 34d19b2fee..3cfa1ea059 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -2777,7 +2777,7 @@ dns_client_startupdate(dns_client_t *client, dns_rdataclass_t rdclass,
 	runinevent = isc_event_allocate(client->mctx, client->task,
 					DNS_EVENT_RUNIN, runintask,
 					uctx, sizeof(*runinevent));
-	if (runinevent == NULL) { 
+	if (runinevent == NULL) {
 		dns_view_detach(&view);
 		isc_mem_put(client->mctx, uctx, sizeof(*uctx));
 		return (ISC_R_NOMEMORY);
diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index d7728762c3..6d8b5a81a8 100644
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011, 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