From a873ad10bd5b5059a2badf9396877dedd0b957cd Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 3 Nov 2016 12:47:03 +1100
Subject: [PATCH] copyrights/whitespace

---
 Makefile.in                                   |   2 +-
 bin/confgen/Makefile.in                       |   2 +-
 bin/named/Makefile.in                         |   2 +-
 bin/named/update.c                            |   2 +-
 bin/named/zoneconf.c                          |   2 +-
 bin/pkcs11/Makefile.in                        |   2 +-
 bin/rndc/Makefile.in                          |   2 +-
 .../system/nsupdate/ns3/too-big.test.db.in    |  14 +-
 bin/tests/system/nsupdate/setup.sh            |   2 +-
 bin/tests/system/xfer/ns1/axfr-too-big.db     |  14 +-
 bin/tests/system/xfer/ns1/ixfr-too-big.db.in  |  14 +-
 bin/tests/system/xfer/ns1/named.conf          |  12 +-
 bin/tests/system/xfer/ns6/named.conf          |   4 +-
 diff                                          | 696 ------------------
 doc/misc/sort-options.pl                      |   2 +-
 lib/bind9/include/bind9/Makefile.in           |   2 +-
 lib/dns/Makefile.in                           |   2 +-
 lib/dns/acl.c                                 |   2 +-
 lib/dns/db.c                                  |   2 +-
 lib/dns/ecdb.c                                |   2 +-
 lib/dns/include/dns/Makefile.in               |   2 +-
 lib/dns/include/dns/db.h                      |   4 +-
 lib/dns/include/dns/rdataslab.h               |   2 +-
 lib/dns/include/dns/result.h                  |   2 +-
 lib/dns/include/dst/Makefile.in               |   2 +-
 lib/dns/rdataslab.c                           |   2 +-
 lib/dns/result.c                              |   2 +-
 lib/dns/sdb.c                                 |   2 +-
 lib/dns/sdlz.c                                |   2 +-
 lib/dns/tests/acl_test.c                      |  18 +-
 lib/dns/xfrin.c                               |   2 +-
 lib/irs/include/irs/Makefile.in               |   2 +-
 lib/isc/alpha/include/isc/Makefile.in         |   2 +-
 lib/isc/ia64/include/isc/Makefile.in          |   2 +-
 lib/isc/include/pkcs11/Makefile.in            |   2 +-
 lib/isc/mips/include/isc/Makefile.in          |   2 +-
 lib/isc/noatomic/include/isc/Makefile.in      |   2 +-
 lib/isc/nothreads/include/isc/Makefile.in     |   2 +-
 lib/isc/powerpc/include/isc/Makefile.in       |   2 +-
 lib/isc/pthreads/include/isc/Makefile.in      |   2 +-
 lib/isc/unix/include/isc/Makefile.in          |   2 +-
 lib/isc/unix/include/pkcs11/Makefile.in       |   2 +-
 lib/isc/x86_32/include/isc/Makefile.in        |   2 +-
 lib/isc/x86_64/include/isc/Makefile.in        |   2 +-
 lib/isccc/include/isccc/Makefile.in           |   2 +-
 lib/isccfg/include/isccfg/Makefile.in         |   2 +-
 lib/isccfg/include/isccfg/grammar.h           |   2 +-
 lib/lwres/Makefile.in                         |   2 +-
 lib/lwres/include/lwres/Makefile.in           |   2 +-
 lib/lwres/unix/include/lwres/Makefile.in      |   2 +-
 util/copyrights                               |  94 +--
 51 files changed, 147 insertions(+), 807 deletions(-)
 delete mode 100644 diff

diff --git a/Makefile.in b/Makefile.in
index 41c1f552dc..9904b79c39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index dd79f6a884..dca272f506 100644
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 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/named/Makefile.in b/bin/named/Makefile.in
index cac032e352..d70f381ce5 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/named/update.c b/bin/named/update.c
index cc2a611dbd..694c5b8378 100644
--- a/bin/named/update.c
+++ b/bin/named/update.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-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 50c3b6103f..b6c2393258 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.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-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index f71cb03d1b..18df193c66 100644
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 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/rndc/Makefile.in b/bin/rndc/Makefile.in
index d2794fc30f..13e1a5e176 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
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 7ff1e4a514..0ccbea1873 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,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.
 
 $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/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 43c40947de..d92ea8d717 100644
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/system/xfer/ns1/axfr-too-big.db b/bin/tests/system/xfer/ns1/axfr-too-big.db
index d43760d9a8..4cfec0d68d 100644
--- a/bin/tests/system/xfer/ns1/axfr-too-big.db
+++ b/bin/tests/system/xfer/ns1/axfr-too-big.db
@@ -1,8 +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.
 
 $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 318bb772af..c5989e340b 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,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.
 
 $TTL	3600
 @	IN	SOA	. . 0 0 0 0 0
diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf
index 1d292924c0..f9934ea0d2 100644
--- a/bin/tests/system/xfer/ns1/named.conf
+++ b/bin/tests/system/xfer/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,7 +20,7 @@
 include "../../common/rndc.key";
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {
@@ -46,12 +46,12 @@ zone "slave" {
 };
 
 zone "axfr-too-big" {
-        type master;
-        file "axfr-too-big.db";
+	type master;
+	file "axfr-too-big.db";
 };
 
 zone "ixfr-too-big" {
-        type master;
+	type master;
 	allow-update { any; };
-        file "ixfr-too-big.db";
+	file "ixfr-too-big.db";
 };
diff --git a/bin/tests/system/xfer/ns6/named.conf b/bin/tests/system/xfer/ns6/named.conf
index a12a92c2f6..15405bcb7a 100644
--- a/bin/tests/system/xfer/ns6/named.conf
+++ b/bin/tests/system/xfer/ns6/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 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
@@ -19,7 +19,7 @@
 include "../../common/rndc.key";
 
 controls {
-        inet 10.53.0.6 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.6 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {
diff --git a/diff b/diff
deleted file mode 100644
index 08b9ef04b5..0000000000
--- a/diff
+++ /dev/null
@@ -1,696 +0,0 @@
-diff --git a/CHANGES b/CHANGES
-index 957a989..46d9c37 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,3 +1,5 @@
-+	--- 9.11.0 released ---
-+
- 	--- 9.11.0rc3 released ---
- 
- 4471.	[cleanup]	Render client/query logging format consistent for
-diff --git a/doc/arm/Bv9ARM.ch01.html b/doc/arm/Bv9ARM.ch01.html
-index c466ef4..c2b9066 100644
---- a/doc/arm/Bv9ARM.ch01.html
-+++ b/doc/arm/Bv9ARM.ch01.html
-@@ -547,6 +547,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch02.html b/doc/arm/Bv9ARM.ch02.html
-index 19f867b..d491819 100644
---- a/doc/arm/Bv9ARM.ch02.html
-+++ b/doc/arm/Bv9ARM.ch02.html
-@@ -145,6 +145,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch03.html b/doc/arm/Bv9ARM.ch03.html
-index a74c56c..9cb7d5a 100644
---- a/doc/arm/Bv9ARM.ch03.html
-+++ b/doc/arm/Bv9ARM.ch03.html
-@@ -661,6 +661,6 @@ controls {
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch04.html b/doc/arm/Bv9ARM.ch04.html
-index 20c16a1..35eef4e 100644
---- a/doc/arm/Bv9ARM.ch04.html
-+++ b/doc/arm/Bv9ARM.ch04.html
-@@ -2674,6 +2674,6 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch05.html b/doc/arm/Bv9ARM.ch05.html
-index 3a753e4..eaec6ee 100644
---- a/doc/arm/Bv9ARM.ch05.html
-+++ b/doc/arm/Bv9ARM.ch05.html
-@@ -136,6 +136,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
-index b41e966..ad6c528 100644
---- a/doc/arm/Bv9ARM.ch06.html
-+++ b/doc/arm/Bv9ARM.ch06.html
-@@ -13550,6 +13550,6 @@ HOST-127.EXAMPLE. MX 0 .
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch07.html b/doc/arm/Bv9ARM.ch07.html
-index b29a862..c34344b 100644
---- a/doc/arm/Bv9ARM.ch07.html
-+++ b/doc/arm/Bv9ARM.ch07.html
-@@ -370,6 +370,6 @@ allow-query { !{ !10/8; any; }; key example; };
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch08.html b/doc/arm/Bv9ARM.ch08.html
-index 8fd3d45..361e1ea 100644
---- a/doc/arm/Bv9ARM.ch08.html
-+++ b/doc/arm/Bv9ARM.ch08.html
-@@ -126,6 +126,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
-index 2a3c3e6..51e72f7 100644
---- a/doc/arm/Bv9ARM.ch09.html
-+++ b/doc/arm/Bv9ARM.ch09.html
-@@ -36,7 +36,7 @@
- <div class="toc">
- <p><b>Table of Contents</b></p>
- <dl class="toc">
--<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.11.0rc3</a></span></dt>
-+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.11.0</a></span></dt>
- <dd><dl>
- <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
- <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
-@@ -52,7 +52,7 @@
- </div>
- <div class="section">
- <div class="titlepage"><div><div><h2 class="title" style="clear: both">
--<a name="id-1.10.2"></a>Release Notes for BIND Version 9.11.0rc3</h2></div></div></div>
-+<a name="id-1.10.2"></a>Release Notes for BIND Version 9.11.0</h2></div></div></div>
- <div class="section">
- <div class="titlepage"><div><div><h3 class="title">
- <a name="relnotes_intro"></a>Introduction</h3></div></div></div>
-@@ -856,6 +856,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch10.html b/doc/arm/Bv9ARM.ch10.html
-index ecf3e90..e351cc3 100644
---- a/doc/arm/Bv9ARM.ch10.html
-+++ b/doc/arm/Bv9ARM.ch10.html
-@@ -147,6 +147,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch11.html b/doc/arm/Bv9ARM.ch11.html
-index 9260f2d..55eccf5 100644
---- a/doc/arm/Bv9ARM.ch11.html
-+++ b/doc/arm/Bv9ARM.ch11.html
-@@ -489,6 +489,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch12.html b/doc/arm/Bv9ARM.ch12.html
-index aeabb99..04ca153 100644
---- a/doc/arm/Bv9ARM.ch12.html
-+++ b/doc/arm/Bv9ARM.ch12.html
-@@ -535,6 +535,6 @@ $ <strong class="userinput"><code>sample-update -a sample-update -k Kxxx.+nnn+mm
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.ch13.html b/doc/arm/Bv9ARM.ch13.html
-index 404a7d5..ba5d293 100644
---- a/doc/arm/Bv9ARM.ch13.html
-+++ b/doc/arm/Bv9ARM.ch13.html
-@@ -175,6 +175,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
-index 3dc5252..092e741 100644
---- a/doc/arm/Bv9ARM.html
-+++ b/doc/arm/Bv9ARM.html
-@@ -32,7 +32,7 @@
- <div>
- <div><h1 class="title">
- <a name="id-1"></a>BIND 9 Administrator Reference Manual</h1></div>
--<div><p class="releaseinfo">BIND Version 9.11.0rc3</p></div>
-+<div><p class="releaseinfo">BIND Version 9.11.0</p></div>
- <div><p class="copyright">Copyright © 2000-2015 Internet Systems Consortium, Inc. ("ISC")</p></div>
- </div>
- <hr>
-@@ -241,7 +241,7 @@
- </dl></dd>
- <dt><span class="appendix"><a href="Bv9ARM.ch09.html">A. Release Notes</a></span></dt>
- <dd><dl>
--<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.11.0rc3</a></span></dt>
-+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.11.0</a></span></dt>
- <dd><dl>
- <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
- <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
-@@ -416,6 +416,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.arpaname.html b/doc/arm/man.arpaname.html
-index 5986e6c..58cdbd4 100644
---- a/doc/arm/man.arpaname.html
-+++ b/doc/arm/man.arpaname.html
-@@ -73,6 +73,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.ddns-confgen.html b/doc/arm/man.ddns-confgen.html
-index 96f8422..f3d358e 100644
---- a/doc/arm/man.ddns-confgen.html
-+++ b/doc/arm/man.ddns-confgen.html
-@@ -177,6 +177,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.delv.html b/doc/arm/man.delv.html
-index d18ef76..2e78183 100644
---- a/doc/arm/man.delv.html
-+++ b/doc/arm/man.delv.html
-@@ -501,6 +501,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
-index 15c174d..601610f 100644
---- a/doc/arm/man.dig.html
-+++ b/doc/arm/man.dig.html
-@@ -848,6 +848,6 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-checkds.html b/doc/arm/man.dnssec-checkds.html
-index 8cec806..0245b8a 100644
---- a/doc/arm/man.dnssec-checkds.html
-+++ b/doc/arm/man.dnssec-checkds.html
-@@ -104,6 +104,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-coverage.html b/doc/arm/man.dnssec-coverage.html
-index a23525e..741d052 100644
---- a/doc/arm/man.dnssec-coverage.html
-+++ b/doc/arm/man.dnssec-coverage.html
-@@ -221,6 +221,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-dsfromkey.html b/doc/arm/man.dnssec-dsfromkey.html
-index 0623264..ebc042f 100644
---- a/doc/arm/man.dnssec-dsfromkey.html
-+++ b/doc/arm/man.dnssec-dsfromkey.html
-@@ -205,6 +205,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-importkey.html b/doc/arm/man.dnssec-importkey.html
-index ff14f91..31e00a3 100644
---- a/doc/arm/man.dnssec-importkey.html
-+++ b/doc/arm/man.dnssec-importkey.html
-@@ -179,6 +179,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-keyfromlabel.html b/doc/arm/man.dnssec-keyfromlabel.html
-index 8c4f5f5..12f8ff4 100644
---- a/doc/arm/man.dnssec-keyfromlabel.html
-+++ b/doc/arm/man.dnssec-keyfromlabel.html
-@@ -383,6 +383,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-keygen.html b/doc/arm/man.dnssec-keygen.html
-index 023b645..616a8b2 100644
---- a/doc/arm/man.dnssec-keygen.html
-+++ b/doc/arm/man.dnssec-keygen.html
-@@ -457,6 +457,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-keymgr.html b/doc/arm/man.dnssec-keymgr.html
-index 2a198b2..47bd2f4 100644
---- a/doc/arm/man.dnssec-keymgr.html
-+++ b/doc/arm/man.dnssec-keymgr.html
-@@ -309,6 +309,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-revoke.html b/doc/arm/man.dnssec-revoke.html
-index d435909..2897bcc 100644
---- a/doc/arm/man.dnssec-revoke.html
-+++ b/doc/arm/man.dnssec-revoke.html
-@@ -126,6 +126,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-settime.html b/doc/arm/man.dnssec-settime.html
-index dadb23c..b252979 100644
---- a/doc/arm/man.dnssec-settime.html
-+++ b/doc/arm/man.dnssec-settime.html
-@@ -269,6 +269,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-signzone.html b/doc/arm/man.dnssec-signzone.html
-index 88cd831..7911995 100644
---- a/doc/arm/man.dnssec-signzone.html
-+++ b/doc/arm/man.dnssec-signzone.html
-@@ -559,6 +559,6 @@ db.example.com.signed
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnssec-verify.html b/doc/arm/man.dnssec-verify.html
-index 63db9e3..fbf11ec 100644
---- a/doc/arm/man.dnssec-verify.html
-+++ b/doc/arm/man.dnssec-verify.html
-@@ -156,6 +156,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.dnstap-read.html b/doc/arm/man.dnstap-read.html
-index 3df9793..1276982 100644
---- a/doc/arm/man.dnstap-read.html
-+++ b/doc/arm/man.dnstap-read.html
-@@ -99,6 +99,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.genrandom.html b/doc/arm/man.genrandom.html
-index 05ac04f..c20aec3 100644
---- a/doc/arm/man.genrandom.html
-+++ b/doc/arm/man.genrandom.html
-@@ -94,6 +94,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.host.html b/doc/arm/man.host.html
-index 7a034ce..09985e6 100644
---- a/doc/arm/man.host.html
-+++ b/doc/arm/man.host.html
-@@ -284,6 +284,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.isc-hmac-fixup.html b/doc/arm/man.isc-hmac-fixup.html
-index d1ffbf2..e776c45 100644
---- a/doc/arm/man.isc-hmac-fixup.html
-+++ b/doc/arm/man.isc-hmac-fixup.html
-@@ -104,6 +104,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.lwresd.html b/doc/arm/man.lwresd.html
-index 546c6db..958b6ce 100644
---- a/doc/arm/man.lwresd.html
-+++ b/doc/arm/man.lwresd.html
-@@ -245,6 +245,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.mdig.html b/doc/arm/man.mdig.html
-index 843bef9..c388808 100644
---- a/doc/arm/man.mdig.html
-+++ b/doc/arm/man.mdig.html
-@@ -459,6 +459,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.named-checkconf.html b/doc/arm/man.named-checkconf.html
-index 7cc16f0..4e7addd 100644
---- a/doc/arm/man.named-checkconf.html
-+++ b/doc/arm/man.named-checkconf.html
-@@ -143,6 +143,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.named-checkzone.html b/doc/arm/man.named-checkzone.html
-index bd289fc..1d35635 100644
---- a/doc/arm/man.named-checkzone.html
-+++ b/doc/arm/man.named-checkzone.html
-@@ -330,6 +330,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.named-journalprint.html b/doc/arm/man.named-journalprint.html
-index 2e90b1f..f5b0f30 100644
---- a/doc/arm/man.named-journalprint.html
-+++ b/doc/arm/man.named-journalprint.html
-@@ -94,6 +94,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.named-nzd2nzf.html b/doc/arm/man.named-nzd2nzf.html
-index 7729124..dcedae8 100644
---- a/doc/arm/man.named-nzd2nzf.html
-+++ b/doc/arm/man.named-nzd2nzf.html
-@@ -95,6 +95,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.named-rrchecker.html b/doc/arm/man.named-rrchecker.html
-index 9978442..70ae789 100644
---- a/doc/arm/man.named-rrchecker.html
-+++ b/doc/arm/man.named-rrchecker.html
-@@ -96,6 +96,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html
-index a0ad312..09cdaac 100644
---- a/doc/arm/man.named.conf.html
-+++ b/doc/arm/man.named.conf.html
-@@ -706,6 +706,6 @@ zone
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.named.html b/doc/arm/man.named.html
-index e372c68..9312ee8 100644
---- a/doc/arm/man.named.html
-+++ b/doc/arm/man.named.html
-@@ -376,6 +376,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.nsec3hash.html b/doc/arm/man.nsec3hash.html
-index 71f3e05..88caae8 100644
---- a/doc/arm/man.nsec3hash.html
-+++ b/doc/arm/man.nsec3hash.html
-@@ -99,6 +99,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.nslookup.html b/doc/arm/man.nslookup.html
-index fca7f98..d188ff3 100644
---- a/doc/arm/man.nslookup.html
-+++ b/doc/arm/man.nslookup.html
-@@ -346,6 +346,6 @@ nslookup -query=hinfo  -timeout=10
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.nsupdate.html b/doc/arm/man.nsupdate.html
-index 68bd682..176acce 100644
---- a/doc/arm/man.nsupdate.html
-+++ b/doc/arm/man.nsupdate.html
-@@ -668,6 +668,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.pkcs11-destroy.html b/doc/arm/man.pkcs11-destroy.html
-index 8858161..017df9c 100644
---- a/doc/arm/man.pkcs11-destroy.html
-+++ b/doc/arm/man.pkcs11-destroy.html
-@@ -116,6 +116,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.pkcs11-keygen.html b/doc/arm/man.pkcs11-keygen.html
-index 4708a0d..f9a1b2b 100644
---- a/doc/arm/man.pkcs11-keygen.html
-+++ b/doc/arm/man.pkcs11-keygen.html
-@@ -140,6 +140,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.pkcs11-list.html b/doc/arm/man.pkcs11-list.html
-index f5bf829..d037737 100644
---- a/doc/arm/man.pkcs11-list.html
-+++ b/doc/arm/man.pkcs11-list.html
-@@ -114,6 +114,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.pkcs11-tokens.html b/doc/arm/man.pkcs11-tokens.html
-index 6ab81ab..edf0fe8 100644
---- a/doc/arm/man.pkcs11-tokens.html
-+++ b/doc/arm/man.pkcs11-tokens.html
-@@ -87,6 +87,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.rndc-confgen.html b/doc/arm/man.rndc-confgen.html
-index 82b5ad5..cfb0d0e 100644
---- a/doc/arm/man.rndc-confgen.html
-+++ b/doc/arm/man.rndc-confgen.html
-@@ -216,6 +216,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.rndc.conf.html b/doc/arm/man.rndc.conf.html
-index c261e41..97250f1 100644
---- a/doc/arm/man.rndc.conf.html
-+++ b/doc/arm/man.rndc.conf.html
-@@ -238,6 +238,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/man.rndc.html b/doc/arm/man.rndc.html
-index 3987d17..4792a0d 100644
---- a/doc/arm/man.rndc.html
-+++ b/doc/arm/man.rndc.html
-@@ -787,6 +787,6 @@
- </tr>
- </table>
- </div>
--<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0rc3</p>
-+<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.11.0</p>
- </body>
- </html>
-diff --git a/doc/arm/notes.html b/doc/arm/notes.html
-index c0da082..2639a46 100644
---- a/doc/arm/notes.html
-+++ b/doc/arm/notes.html
-@@ -13,7 +13,7 @@
- </head>
- <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="section">
- <div class="titlepage"><div><div><h2 class="title" style="clear: both">
--<a name="id-1.2"></a>Release Notes for BIND Version 9.11.0rc3</h2></div></div></div>
-+<a name="id-1.2"></a>Release Notes for BIND Version 9.11.0</h2></div></div></div>
- <div class="section">
- <div class="titlepage"><div><div><h3 class="title">
- <a name="relnotes_intro"></a>Introduction</h3></div></div></div>
-diff --git a/version b/version
-index 171b685..90416fc 100644
---- a/version
-+++ b/version
-@@ -6,6 +6,6 @@ DESCRIPTION=
- MAJORVER=9
- MINORVER=11
- PATCHVER=0
--RELEASETYPE=rc
--RELEASEVER=3
-+RELEASETYPE=
-+RELEASEVER=
- EXTENSIONS=
diff --git a/doc/misc/sort-options.pl b/doc/misc/sort-options.pl
index 9849900344..dc3327a72c 100644
--- a/doc/misc/sort-options.pl
+++ b/doc/misc/sort-options.pl
@@ -1,6 +1,6 @@
 #!/bin/perl
 #
-# Copyright (C) 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 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/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in
index f500cf5d7f..2379230c41 100644
--- a/lib/bind9/include/bind9/Makefile.in
+++ b/lib/bind9/include/bind9/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 9c7e02741e..a788b70dcc 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index 00f81034ad..46ab2732a0 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011, 2013, 2014, 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
diff --git a/lib/dns/db.c b/lib/dns/db.c
index 3d5076cb59..05985cac4d 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2011-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c
index b5d04d2f8d..4637120b2c 100644
--- a/lib/dns/ecdb.c
+++ b/lib/dns/ecdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-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/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 89f662dfd1..eca8039cb9 100644
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007-2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 7731fb327c..69a3368c61 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -1488,7 +1488,7 @@ dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version,
 
 isc_result_t
 dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, isc_uint64_t *records,
-               isc_uint64_t *bytes);
+	       isc_uint64_t *bytes);
 /*%<
  * Get the number of records in the given version of the database as well
  * as the number bytes used to store those records.
diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index 2e1e7592a2..2277725e1d 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 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
diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 93d1fd53f7..2c77bc83c4 100644
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dst/Makefile.in b/lib/dns/include/dst/Makefile.in
index fa452f3c77..4ded3654eb 100644
--- a/lib/dns/include/dst/Makefile.in
+++ b/lib/dns/include/dst/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 63e3728fbb..1fe754e1dd 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/result.c b/lib/dns/result.c
index a6219098f6..93d7e30548 100644
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 19397e0aef..5efc92addd 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.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) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 0e3163dc25..9a0efa7538 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2005-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2005-2016  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c
index c2387396c9..4f0c5c50ce 100644
--- a/lib/dns/tests/acl_test.c
+++ b/lib/dns/tests/acl_test.c
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2011-2013, 2015, 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$ */
@@ -129,7 +137,7 @@ ATF_TC_BODY(dns_acl_isinsecure, tc) {
 	addr.family = AF_INET6;				/* 0a00:: */
 	result = dns_iptable_addprefix(pos4pos6->iptable, &addr, 8, ISC_TRUE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-	
+
 	result = dns_acl_merge(notpos4pos6, pos4pos6, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 306c34ae60..1d4748645f 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/irs/include/irs/Makefile.in b/lib/irs/include/irs/Makefile.in
index d52aa9206b..ffdb4db7a5 100644
--- a/lib/irs/include/irs/Makefile.in
+++ b/lib/irs/include/irs/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 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/lib/isc/alpha/include/isc/Makefile.in b/lib/isc/alpha/include/isc/Makefile.in
index 9c5a11b2e9..339600e1e9 100644
--- a/lib/isc/alpha/include/isc/Makefile.in
+++ b/lib/isc/alpha/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 2012, 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/lib/isc/ia64/include/isc/Makefile.in b/lib/isc/ia64/include/isc/Makefile.in
index 9c5a11b2e9..339600e1e9 100644
--- a/lib/isc/ia64/include/isc/Makefile.in
+++ b/lib/isc/ia64/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 2012, 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/lib/isc/include/pkcs11/Makefile.in b/lib/isc/include/pkcs11/Makefile.in
index 87b6b8eecb..d920cdd249 100644
--- a/lib/isc/include/pkcs11/Makefile.in
+++ b/lib/isc/include/pkcs11/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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/lib/isc/mips/include/isc/Makefile.in b/lib/isc/mips/include/isc/Makefile.in
index 9c5a11b2e9..339600e1e9 100644
--- a/lib/isc/mips/include/isc/Makefile.in
+++ b/lib/isc/mips/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 2012, 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/lib/isc/noatomic/include/isc/Makefile.in b/lib/isc/noatomic/include/isc/Makefile.in
index 9c5a11b2e9..339600e1e9 100644
--- a/lib/isc/noatomic/include/isc/Makefile.in
+++ b/lib/isc/noatomic/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 2012, 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/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in
index 04bc992472..7b0461e70d 100644
--- a/lib/isc/nothreads/include/isc/Makefile.in
+++ b/lib/isc/nothreads/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/powerpc/include/isc/Makefile.in b/lib/isc/powerpc/include/isc/Makefile.in
index 9c5a11b2e9..339600e1e9 100644
--- a/lib/isc/powerpc/include/isc/Makefile.in
+++ b/lib/isc/powerpc/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 2012, 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/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index ae320711c8..9d85ed57a9 100644
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 0086a561d6..8af717e876 100644
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/unix/include/pkcs11/Makefile.in b/lib/isc/unix/include/pkcs11/Makefile.in
index 01b1dcc4b1..33e0eea5fc 100644
--- a/lib/isc/unix/include/pkcs11/Makefile.in
+++ b/lib/isc/unix/include/pkcs11/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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/lib/isc/x86_32/include/isc/Makefile.in b/lib/isc/x86_32/include/isc/Makefile.in
index 9c5a11b2e9..339600e1e9 100644
--- a/lib/isc/x86_32/include/isc/Makefile.in
+++ b/lib/isc/x86_32/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 2012, 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/lib/isc/x86_64/include/isc/Makefile.in b/lib/isc/x86_64/include/isc/Makefile.in
index 297e9df0ab..0528521cac 100644
--- a/lib/isc/x86_64/include/isc/Makefile.in
+++ b/lib/isc/x86_64/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007, 2012, 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/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index 9cbd154646..926c9085aa 100644
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in
index 2ab66cff23..e0c5c92639 100644
--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 863e0ec898..f181ab3bb1 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index 03bbed3cc3..bb79ae08c4 100644
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in
index c002dc907e..9f9744bea4 100644
--- a/lib/lwres/include/lwres/Makefile.in
+++ b/lib/lwres/include/lwres/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/lwres/unix/include/lwres/Makefile.in b/lib/lwres/unix/include/lwres/Makefile.in
index 79ede9ac8d..ddd1edd514 100644
--- a/lib/lwres/unix/include/lwres/Makefile.in
+++ b/lib/lwres/unix/include/lwres/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/util/copyrights b/util/copyrights
index 938176e6d5..c821ef0f97 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -6,7 +6,7 @@
 ./FAQ						X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016
 ./FAQ.xml					SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016
 ./HISTORY					X	2010,2013
-./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015
+./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./acconfig.h					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016
 ./aclocal.m4					X	1999,2000,2001,2012,2014
@@ -41,7 +41,7 @@
 ./bin/check/win32/checkzone.vcxproj.in		X	2013,2014,2015,2016
 ./bin/check/win32/checkzone.vcxproj.user	X	2013
 ./bin/confgen/.gitignore			X	2012,2014
-./bin/confgen/Makefile.in			MAKE	2009,2012,2014,2015
+./bin/confgen/Makefile.in			MAKE	2009,2012,2014,2015,2016
 ./bin/confgen/ddns-confgen.8			MAN	DOCBOOK
 ./bin/confgen/ddns-confgen.c			C	2009,2011,2014
 ./bin/confgen/ddns-confgen.docbook		SGML	2009,2014,2015
@@ -216,7 +216,7 @@
 ./bin/dnssec/win32/verify.vcxproj.in		X	2013,2014,2015,2016
 ./bin/dnssec/win32/verify.vcxproj.user		X	2013
 ./bin/named/.gitignore				X	2012,2014
-./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/named/bind9.xsl				SGML	2006,2007,2008,2009,2012,2013,2014,2015
 ./bin/named/bind9.xsl.h				X	2007,2008,2009,2011,2012,2013,2014,2015
 ./bin/named/builtin.c				C	2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014
@@ -290,7 +290,7 @@
 ./bin/named/unix/dlz_dlopen_driver.c		C	2011,2012,2013,2014
 ./bin/named/unix/include/named/os.h		C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2016
 ./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2016
-./bin/named/update.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./bin/named/update.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/named/win32/dlz_dlopen_driver.c		C	2011,2012,2013,2014
 ./bin/named/win32/include/named/ntservice.h	C	1999,2000,2001,2002,2003,2004,2007
 ./bin/named/win32/include/named/os.h		C	1999,2000,2001,2002,2004,2007,2008,2009,2016
@@ -303,7 +303,7 @@
 ./bin/named/win32/ntservice.c			C	1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015
 ./bin/named/win32/os.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016
 ./bin/named/xfrout.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
-./bin/named/zoneconf.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./bin/named/zoneconf.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/nsupdate/.gitignore			X	2012
 ./bin/nsupdate/Makefile.in			MAKE	2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016
 ./bin/nsupdate/nsupdate.1			MAN	DOCBOOK
@@ -317,7 +317,7 @@
 ./bin/nsupdate/win32/nsupdate.vcxproj.in	X	2013,2014,2015,2016
 ./bin/nsupdate/win32/nsupdate.vcxproj.user	X	2013
 ./bin/pkcs11/.gitignore				X	2014
-./bin/pkcs11/Makefile.in			MAKE	2009,2012,2014,2015
+./bin/pkcs11/Makefile.in			MAKE	2009,2012,2014,2015,2016
 ./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
@@ -391,7 +391,7 @@
 ./bin/python/isc/utils.py.in			PYTHON	2016
 ./bin/python/setup.py				PYTHON	2016
 ./bin/rndc/.gitignore				X	2012,2014
-./bin/rndc/Makefile.in				MAKE	2000,2001,2002,2004,2007,2009,2012,2014,2015
+./bin/rndc/Makefile.in				MAKE	2000,2001,2002,2004,2007,2009,2012,2014,2015,2016
 ./bin/rndc/include/rndc/os.h			C	2001,2004,2005,2007,2009
 ./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
@@ -1643,8 +1643,9 @@
 ./bin/tests/system/nsupdate/ns3/named.conf	CONF-C	2010,2011,2013,2016
 ./bin/tests/system/nsupdate/ns3/nsec3param.test.db.in	ZONE	2010
 ./bin/tests/system/nsupdate/ns3/sign.sh		SH	2010,2011,2012,2014,2016
+./bin/tests/system/nsupdate/ns3/too-big.test.db.in	ZONE	2016
 ./bin/tests/system/nsupdate/prereq.sh		SH	2014,2015
-./bin/tests/system/nsupdate/setup.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014
+./bin/tests/system/nsupdate/setup.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014,2016
 ./bin/tests/system/nsupdate/tests.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/tests/system/nsupdate/update_test.pl	PERL	2000,2001,2004,2007,2012
 ./bin/tests/system/nsupdate/verylarge		X	2013
@@ -2174,7 +2175,9 @@
 ./bin/tests/system/xfer/dig1.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016
 ./bin/tests/system/xfer/dig2.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016
 ./bin/tests/system/xfer/knowngood.mapped	X	2016
-./bin/tests/system/xfer/ns1/named.conf		CONF-C	2000,2001,2004,2007,2011
+./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/ns1/named.conf		CONF-C	2000,2001,2004,2007,2011,2016
 ./bin/tests/system/xfer/ns1/root.db		ZONE	2000,2001,2004,2007
 ./bin/tests/system/xfer/ns2/mapped.db.in	ZONE	2016
 ./bin/tests/system/xfer/ns2/named.conf		CONF-C	2000,2001,2004,2005,2007,2013,2016
@@ -2182,7 +2185,7 @@
 ./bin/tests/system/xfer/ns3/named.conf		CONF-C	2000,2001,2004,2007,2011,2013,2016
 ./bin/tests/system/xfer/ns4/named.conf.base	CONF-C	2011,2013
 ./bin/tests/system/xfer/ns4/root.db.in		ZONE	2011
-./bin/tests/system/xfer/ns6/named.conf		CONF-C	2011
+./bin/tests/system/xfer/ns6/named.conf		CONF-C	2011,2016
 ./bin/tests/system/xfer/ns7/named.conf		CONF-C	2011
 ./bin/tests/system/xfer/prereq.sh		SH	2011,2012,2014
 ./bin/tests/system/xfer/setup.sh		SH	2001,2002,2004,2007,2011,2012,2013,2014,2016
@@ -3084,7 +3087,7 @@
 ./doc/misc/rfc-compliance			TXT.BRIEF	2001,2004,2015
 ./doc/misc/roadmap				TXT.BRIEF	2000,2001,2004
 ./doc/misc/sdb					TXT.BRIEF	2000,2001,2004
-./doc/misc/sort-options.pl			PERL	2007,2012
+./doc/misc/sort-options.pl			PERL	2007,2012,2016
 ./doc/tex/.gitignore				X	2015
 ./doc/tex/Makefile.in				MAKE	2015
 ./doc/tex/armstyle.sty.in			X	2015
@@ -3128,7 +3131,7 @@
 ./lib/bind9/check.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/bind9/getaddresses.c			C	2001,2002,2004,2005,2007,2014,2015
 ./lib/bind9/include/Makefile.in			MAKE	2001,2004,2007,2012
-./lib/bind9/include/bind9/Makefile.in		MAKE	2001,2004,2007,2012,2015
+./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
 ./lib/bind9/include/bind9/getaddresses.h	C	2001,2004,2005,2006,2007,2009
 ./lib/bind9/include/bind9/version.h		C	2001,2004,2005,2006,2007
@@ -3144,9 +3147,9 @@
 ./lib/bind9/win32/version.c			C	1998,1999,2000,2001,2004,2007
 ./lib/dns/.gitignore				X	2012,2013
 ./lib/dns/Atffile				X	2011
-./lib/dns/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./lib/dns/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/acache.c				C	2004,2005,2006,2007,2008,2012,2013,2015
-./lib/dns/acl.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014
+./lib/dns/acl.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016
 ./lib/dns/adb.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/byaddr.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2013
@@ -3155,7 +3158,7 @@
 ./lib/dns/client.c				C	2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/clientinfo.c				C	2011
 ./lib/dns/compress.c				C	1999,2000,2001,2004,2005,2006,2007
-./lib/dns/db.c					C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015
+./lib/dns/db.c					C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016
 ./lib/dns/dbiterator.c				C	1999,2000,2001,2004,2005,2007
 ./lib/dns/dbtable.c				C	1999,2000,2001,2004,2005,2007,2013,2016
 ./lib/dns/diff.c				C	2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2013,2014,2015
@@ -3173,7 +3176,7 @@
 ./lib/dns/dst_parse.h				C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2014
 ./lib/dns/dst_pkcs11.h				C	2014
 ./lib/dns/dst_result.c				C	1999,2000,2001,2004,2005,2007,2008,2012,2013,2014
-./lib/dns/ecdb.c				C	2009,2010,2011,2012,2013,2014
+./lib/dns/ecdb.c				C	2009,2010,2011,2012,2013,2014,2016
 ./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
 ./lib/dns/gen-win32.h				C	1999,2000,2001,2004,2005,2006,2007,2009,2014
@@ -3183,7 +3186,7 @@
 ./lib/dns/gssapictx.c				C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/hmac_link.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012
-./lib/dns/include/dns/Makefile.in		MAKE	1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014,2015
+./lib/dns/include/dns/Makefile.in		MAKE	1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/dns/acache.h			C	2004,2006,2007,2013
 ./lib/dns/include/dns/acl.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014
 ./lib/dns/include/dns/adb.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014,2015
@@ -3195,7 +3198,7 @@
 ./lib/dns/include/dns/client.h			C	2009,2013,2014
 ./lib/dns/include/dns/clientinfo.h		C	2011
 ./lib/dns/include/dns/compress.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2009
-./lib/dns/include/dns/db.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015
+./lib/dns/include/dns/db.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./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
 ./lib/dns/include/dns/diff.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2013
@@ -3239,11 +3242,11 @@
 ./lib/dns/include/dns/rdatalist.h		C	1999,2000,2001,2004,2005,2006,2007,2008
 ./lib/dns/include/dns/rdataset.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014
 ./lib/dns/include/dns/rdatasetiter.h		C	1999,2000,2001,2004,2005,2006,2007
-./lib/dns/include/dns/rdataslab.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008
+./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
 ./lib/dns/include/dns/request.h			C	2000,2001,2002,2004,2005,2006,2007,2009,2010,2013,2014
 ./lib/dns/include/dns/resolver.h		C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
-./lib/dns/include/dns/result.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2015
+./lib/dns/include/dns/result.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2015,2016
 ./lib/dns/include/dns/rootns.h			C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/rpz.h			C	2011,2012,2013,2015
 ./lib/dns/include/dns/rriterator.h		C	2009,2011
@@ -3271,7 +3274,7 @@
 ./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
 ./lib/dns/include/dns/zonekey.h			C	2001,2004,2005,2006,2007
 ./lib/dns/include/dns/zt.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2016
-./lib/dns/include/dst/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2015
+./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
 ./lib/dns/include/dst/gssapi.h			C	2000,2001,2004,2005,2006,2007,2009,2010,2011,2013,2016
 ./lib/dns/include/dst/lib.h			C	1999,2000,2001,2004,2005,2006,2007
@@ -3475,16 +3478,16 @@
 ./lib/dns/rdatalist_p.h				C	2000,2001,2004,2005,2007,2008
 ./lib/dns/rdataset.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015
 ./lib/dns/rdatasetiter.c			C	1999,2000,2001,2004,2005,2007
-./lib/dns/rdataslab.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+./lib/dns/rdataslab.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016
 ./lib/dns/request.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/resolver.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
-./lib/dns/result.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2011,2012,2013,2015
+./lib/dns/result.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2011,2012,2013,2015,2016
 ./lib/dns/rootns.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2010,2012,2013,2014,2015,2016
 ./lib/dns/rpz.c					C	2011,2012,2013,2014,2015,2016
 ./lib/dns/rriterator.c				C	2009,2011,2012
 ./lib/dns/rrl.c					C	2012,2013,2014,2015
-./lib/dns/sdb.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
-./lib/dns/sdlz.c				C.PORTION	1999,2000,2001,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./lib/dns/sdb.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
+./lib/dns/sdlz.c				C.PORTION	1999,2000,2001,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/soa.c					C	2000,2001,2004,2005,2007,2009
 ./lib/dns/spnego.asn1				X	2006
 ./lib/dns/spnego.c				C	2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
@@ -3499,6 +3502,7 @@
 ./lib/dns/tests/Kdh.+002+18602.key		X	2014
 ./lib/dns/tests/Krsa.+005+29235.key		X	2016
 ./lib/dns/tests/Makefile.in			MAKE	2011,2012,2013,2014,2015,2016
+./lib/dns/tests/acl_test.c			C	2016
 ./lib/dns/tests/db_test.c			C	2013,2015
 ./lib/dns/tests/dbdiff_test.c			C	2011,2012
 ./lib/dns/tests/dbiterator_test.c		C	2011,2012,2016
@@ -3579,7 +3583,7 @@
 ./lib/dns/win32/libdns.vcxproj.in		X	2013,2014,2015,2016
 ./lib/dns/win32/libdns.vcxproj.user		X	2013
 ./lib/dns/win32/version.c			C	1998,1999,2000,2001,2004,2007,2013
-./lib/dns/xfrin.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2015
+./lib/dns/xfrin.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2015,2016
 ./lib/dns/zone.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/zonekey.c				C	2001,2003,2004,2005,2007
 ./lib/dns/zt.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016
@@ -3592,7 +3596,7 @@
 ./lib/irs/getaddrinfo.c				C	2009,2012,2013,2014,2015,2016
 ./lib/irs/getnameinfo.c				C	2009,2011,2012,2013,2014
 ./lib/irs/include/Makefile.in			MAKE	2009,2012
-./lib/irs/include/irs/Makefile.in		MAKE	2009,2012,2014
+./lib/irs/include/irs/Makefile.in		MAKE	2009,2012,2014,2016
 ./lib/irs/include/irs/context.h			C	2009
 ./lib/irs/include/irs/dnsconf.h			C	2009
 ./lib/irs/include/irs/netdb.h.in		C	2009
@@ -3640,7 +3644,7 @@
 ./lib/isc/aes.c					C	2014,2016
 ./lib/isc/alpha/Makefile.in			MAKE	2007,2012
 ./lib/isc/alpha/include/Makefile.in		MAKE	2007,2012
-./lib/isc/alpha/include/isc/Makefile.in		MAKE	2007,2012,2015
+./lib/isc/alpha/include/isc/Makefile.in		MAKE	2007,2012,2015,2016
 ./lib/isc/alpha/include/isc/atomic.h		C	2005,2007,2009
 ./lib/isc/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/isc/app_api.c				C	2009,2013,2014,2015
@@ -3667,7 +3671,7 @@
 ./lib/isc/httpd.c				C	2006,2007,2008,2010,2011,2012,2013,2014,2015,2016
 ./lib/isc/ia64/Makefile.in			MAKE	2007,2012
 ./lib/isc/ia64/include/Makefile.in		MAKE	2007,2012
-./lib/isc/ia64/include/isc/Makefile.in		MAKE	2007,2012,2015
+./lib/isc/ia64/include/isc/Makefile.in		MAKE	2007,2012,2015,2016
 ./lib/isc/ia64/include/isc/atomic.h		C	2006,2007,2009,2012
 ./lib/isc/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2014
 ./lib/isc/include/isc/Makefile.in		MAKE	1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016
@@ -3761,7 +3765,7 @@
 ./lib/isc/include/pk11/pk11.h			C	2014,2016
 ./lib/isc/include/pk11/result.h			C	2014
 ./lib/isc/include/pk11/site.h			C	2016
-./lib/isc/include/pkcs11/Makefile.in		MAKE	2014,2015
+./lib/isc/include/pkcs11/Makefile.in		MAKE	2014,2015,2016
 ./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
@@ -3777,7 +3781,7 @@
 ./lib/isc/mem.c					C	1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016
 ./lib/isc/mips/Makefile.in			MAKE	2007,2012
 ./lib/isc/mips/include/Makefile.in		MAKE	2007,2012
-./lib/isc/mips/include/isc/Makefile.in		MAKE	2007,2012,2015
+./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
 ./lib/isc/netaddr.c				C	1999,2000,2001,2002,2004,2005,2007,2010,2011,2012,2014,2015,2016
@@ -3786,12 +3790,12 @@
 ./lib/isc/nls/msgcat.c				C	1999,2000,2001,2004,2005,2007
 ./lib/isc/noatomic/Makefile.in			MAKE	2007,2012
 ./lib/isc/noatomic/include/Makefile.in		MAKE	2007,2012
-./lib/isc/noatomic/include/isc/Makefile.in	MAKE	2007,2012,2015
+./lib/isc/noatomic/include/isc/Makefile.in	MAKE	2007,2012,2015,2016
 ./lib/isc/noatomic/include/isc/atomic.h		C	2005,2007
 ./lib/isc/nothreads/Makefile.in			MAKE	2000,2001,2004,2007,2009,2010,2012,2013
 ./lib/isc/nothreads/condition.c			C	2000,2001,2004,2006,2007
 ./lib/isc/nothreads/include/Makefile.in		MAKE	2000,2001,2004,2007,2012
-./lib/isc/nothreads/include/isc/Makefile.in	MAKE	2000,2001,2004,2007,2012,2015
+./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
 ./lib/isc/nothreads/include/isc/mutex.h		C	2000,2001,2004,2007,2015
 ./lib/isc/nothreads/include/isc/once.h		C	2000,2001,2004,2007
@@ -3806,13 +3810,13 @@
 ./lib/isc/portset.c				C	2008
 ./lib/isc/powerpc/Makefile.in			MAKE	2007,2012
 ./lib/isc/powerpc/include/Makefile.in		MAKE	2007,2012
-./lib/isc/powerpc/include/isc/Makefile.in	MAKE	2007,2012,2015
+./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
 ./lib/isc/print.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2010,2014,2015,2016
 ./lib/isc/pthreads/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012
 ./lib/isc/pthreads/condition.c			C	1998,1999,2000,2001,2004,2005,2007,2012
 ./lib/isc/pthreads/include/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012
-./lib/isc/pthreads/include/isc/Makefile.in	MAKE	1998,1999,2000,2001,2004,2007,2012,2015
+./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
 ./lib/isc/pthreads/include/isc/mutex.h		C	1998,1999,2000,2001,2002,2004,2005,2007
 ./lib/isc/pthreads/include/isc/once.h		C	1999,2000,2001,2004,2005,2007
@@ -3884,7 +3888,7 @@
 ./lib/isc/unix/ifiter_ioctl.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2014,2015
 ./lib/isc/unix/ifiter_sysctl.c			C	1999,2000,2001,2002,2003,2004,2005,2007,2014,2015
 ./lib/isc/unix/include/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2014
-./lib/isc/unix/include/isc/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2013,2014,2015
+./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
 ./lib/isc/unix/include/isc/int.h		C	1999,2000,2001,2004,2005,2007
 ./lib/isc/unix/include/isc/keyboard.h		C	2000,2001,2004,2005,2007
@@ -3896,7 +3900,7 @@
 ./lib/isc/unix/include/isc/strerror.h		C	2001,2004,2005,2007,2008
 ./lib/isc/unix/include/isc/syslog.h		C	1999,2000,2001,2004,2005,2007
 ./lib/isc/unix/include/isc/time.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015
-./lib/isc/unix/include/pkcs11/Makefile.in	MAKE	2014
+./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
 ./lib/isc/unix/ipv6.c				C	1999,2000,2001,2004,2005,2006,2007
@@ -3984,11 +3988,11 @@
 ./lib/isc/win32/win32os.c			C	2002,2004,2007,2013,2014,2015
 ./lib/isc/x86_32/Makefile.in			MAKE	2007,2012
 ./lib/isc/x86_32/include/Makefile.in		MAKE	2007,2012
-./lib/isc/x86_32/include/isc/Makefile.in	MAKE	2007,2012,2015
+./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
 ./lib/isc/x86_64/Makefile.in			MAKE	2007,2012
 ./lib/isc/x86_64/include/Makefile.in		MAKE	2007,2012
-./lib/isc/x86_64/include/isc/Makefile.in	MAKE	2007,2012,2015
+./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
 ./lib/isccc/Makefile.in				MAKE	2001,2003,2004,2007,2009,2011,2012,2014,2015,2016
 ./lib/isccc/alist.c				C.NOM	2001,2004,2005,2007,2015
@@ -3997,7 +4001,7 @@
 ./lib/isccc/cc.c				C.NOM	2001,2002,2003,2004,2005,2006,2007,2012,2013,2015,2016
 ./lib/isccc/ccmsg.c				C.NOM	2001,2004,2005,2007
 ./lib/isccc/include/Makefile.in			MAKE	2001,2004,2007,2012
-./lib/isccc/include/isccc/Makefile.in		MAKE	2001,2004,2007,2012,2015
+./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
 ./lib/isccc/include/isccc/base64.h		C.NOM	2001,2004,2005,2006,2007
 ./lib/isccc/include/isccc/cc.h			C.NOM	2001,2004,2005,2006,2007,2013
@@ -4030,11 +4034,11 @@
 ./lib/isccfg/api				X	2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/isccfg/dnsconf.c				C	2009
 ./lib/isccfg/include/Makefile.in		MAKE	2001,2004,2007,2012
-./lib/isccfg/include/isccfg/Makefile.in		MAKE	2001,2002,2004,2005,2007,2012,2014,2015
+./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
 ./lib/isccfg/include/isccfg/cfg.h		C	2000,2001,2002,2004,2005,2006,2007,2010,2013,2014,2015
 ./lib/isccfg/include/isccfg/dnsconf.h		C	2009
-./lib/isccfg/include/isccfg/grammar.h		C	2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015
+./lib/isccfg/include/isccfg/grammar.h		C	2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016
 ./lib/isccfg/include/isccfg/log.h		C	2001,2004,2005,2006,2007,2009
 ./lib/isccfg/include/isccfg/namedconf.h		C	2002,2004,2005,2006,2007,2009,2010
 ./lib/isccfg/include/isccfg/version.h		C	2001,2004,2005,2006,2007
@@ -4052,7 +4056,7 @@
 ./lib/isccfg/win32/libisccfg.vcxproj.user	X	2013
 ./lib/isccfg/win32/version.c			C	1998,1999,2000,2001,2004,2007
 ./lib/lwres/Atffile				X	2014
-./lib/lwres/Makefile.in				MAKE	2000,2001,2004,2005,2007,2012,2014,2015
+./lib/lwres/Makefile.in				MAKE	2000,2001,2004,2005,2007,2012,2014,2015,2016
 ./lib/lwres/api					X	2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/lwres/assert_p.h				C	2000,2001,2004,2005,2007,2011,2012
 ./lib/lwres/compat.c				C	2003,2004,2005,2007,2014
@@ -4066,7 +4070,7 @@
 ./lib/lwres/getrrset.c				C	2000,2001,2002,2003,2004,2005,2007,2012,2014
 ./lib/lwres/herror.c				C.PORTION	2000,2001,2003,2004,2005,2007,2011,2012,2014,2015
 ./lib/lwres/include/Makefile.in			MAKE	2000,2001,2004,2007,2012
-./lib/lwres/include/lwres/Makefile.in		MAKE	2000,2001,2004,2007,2012,2014
+./lib/lwres/include/lwres/Makefile.in		MAKE	2000,2001,2004,2007,2012,2014,2016
 ./lib/lwres/include/lwres/context.h		C	2000,2001,2004,2005,2006,2007,2008
 ./lib/lwres/include/lwres/int.h			C	2000,2001,2004,2005,2006,2007
 ./lib/lwres/include/lwres/ipv6.h		C	2000,2001,2004,2005,2006,2007
@@ -4153,7 +4157,7 @@
 ./lib/lwres/tests/testdata/link-local.conf	X	2014
 ./lib/lwres/unix/Makefile.in			MAKE	2001,2004,2007,2012
 ./lib/lwres/unix/include/Makefile.in		MAKE	2001,2004,2007,2012
-./lib/lwres/unix/include/lwres/Makefile.in	MAKE	2001,2004,2007,2012
+./lib/lwres/unix/include/lwres/Makefile.in	MAKE	2001,2004,2007,2012,2016
 ./lib/lwres/unix/include/lwres/net.h		C	2000,2001,2002,2004,2005,2007
 ./lib/lwres/version.c				C	2000,2001,2004,2005,2007
 ./lib/lwres/win32/DLLMain.c			C	2001,2004,2007