diff --git a/Makefile.in b/Makefile.in
index e20f6cf5b5..f918b682f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2002, 2004-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-2002, 2004-2009, 2011-2017  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
diff --git a/OPTIONS b/OPTIONS
new file mode 100644
index 0000000000..9176a80a19
--- /dev/null
+++ b/OPTIONS
@@ -0,0 +1,32 @@
+<!---
+ - Copyright (C) 2017  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/.
+--->
+Setting the STD_CDEFINES environment variable before running configure can
+be used to enable certain compile-time options that are not explicitly
+defined in configure.
+
+Some of these settings are:
+
+Setting                   Description
+                          Don't ovewrite memory when allocating or freeing
+-DISC_MEM_FILL=0          it; this improves performance but makes
+                          debugging more difficult.
+                          Don't track memory allocations by file and line
+-DISC_MEM_TRACKLINES=0    number; this improves performance but makes
+                          debugging more difficult.
+-DISC_FACILITY=LOG_LOCAL0 Change the default syslog facility for named
+-DNS_CLIENT_DROPPORT=0    Disable dropping queries from particular
+                          well-known ports:
+-DCHECK_SIBLING=0         Don't check sibling glue in named-checkzone
+-DCHECK_LOCAL=0           Don't check out-of-zone addresses in
+                          named-checkzone
+-DNS_RUN_PID_DIR=0        Create default PID files in ${localstatedir}/run
+                          rather than ${localstatedir}/run/{named,lwresd}/
+                          Enable DNSSEC signature chasing support in dig.
+-DDIG_SIGCHASE=1          (Note: This feature is deprecated. Use delv
+                          instead.)
+
diff --git a/OPTIONS.md b/OPTIONS.md
index 7dfbe867cd..f994df8065 100644
--- a/OPTIONS.md
+++ b/OPTIONS.md
@@ -1,3 +1,10 @@
+<!---
+ - Copyright (C) 2017  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/.
+--->
 Setting the `STD_CDEFINES` environment variable before running `configure`
 can be used to enable certain compile-time options that are not explicitly
 defined in `configure`.
diff --git a/README.md b/README.md
index a2f24f3122..bb949641df 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,10 @@
+<!---
+ - Copyright (C) 2017  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/.
+--->
 # BIND 9
 
 ### Contents
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 2dc5f5f51c..03f592dc88 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2017  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
@@ -43,6 +43,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2017</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/python/isc/coverage.py.in b/bin/python/isc/coverage.py.in
index 9d06b9c200..adecf8c2fb 100644
--- a/bin/python/isc/coverage.py.in
+++ b/bin/python/isc/coverage.py.in
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2017  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
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index ec26d18b46..6a9a7ac6cd 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2000, 2001, 2004, 2005, 2007, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2000, 2001, 2004, 2005, 2007, 2013-2017  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
@@ -38,6 +38,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2017</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tests/system/dnssec/ns4/named4.conf b/bin/tests/system/dnssec/ns4/named4.conf
index 98f52f49d1..c6a48c6053 100644
--- a/bin/tests/system/dnssec/ns4/named4.conf
+++ b/bin/tests/system/dnssec/ns4/named4.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2017  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
diff --git a/bin/tests/system/dnssec/ns4/named5.conf b/bin/tests/system/dnssec/ns4/named5.conf
index af9f26273e..7d1d1a07e2 100644
--- a/bin/tests/system/dnssec/ns4/named5.conf
+++ b/bin/tests/system/dnssec/ns4/named5.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017  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
diff --git a/bin/tests/system/dnstap/ydump.py b/bin/tests/system/dnstap/ydump.py
index 971f1c2f7b..4cfb2f6334 100644
--- a/bin/tests/system/dnstap/ydump.py
+++ b/bin/tests/system/dnstap/ydump.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2017  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
diff --git a/doc/dev/contrib.md b/doc/dev/contrib.md
index 2928d7e175..534ad05fe3 100644
--- a/doc/dev/contrib.md
+++ b/doc/dev/contrib.md
@@ -1,5 +1,5 @@
 <!---
- - Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2017  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
diff --git a/doc/dev/dev.md b/doc/dev/dev.md
index 5b913c743e..e421ee2fe5 100644
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -1,5 +1,5 @@
 <!---
- - Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2017  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
diff --git a/doc/dev/style.md b/doc/dev/style.md
index 42475f7deb..fc8310dc2f 100644
--- a/doc/dev/style.md
+++ b/doc/dev/style.md
@@ -1,5 +1,5 @@
 <!---
- - Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2017  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
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 604be4a79c..b3a1f68d3b 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2016, 2017  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
diff --git a/doc/misc/docbook-options.pl b/doc/misc/docbook-options.pl
index eba1e0925f..4d7a096a22 100644
--- a/doc/misc/docbook-options.pl
+++ b/doc/misc/docbook-options.pl
@@ -1,12 +1,10 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017  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/.
-#
-# Usage: perl docbook-options.pl doc/misc/options > named.conf.docbook
 
 use warnings;
 use strict;
diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index 0cf89b8b7a..35cc600c68 100644
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2009, 2011-2017  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
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index f45dcbe56f..c04364f53d 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2017  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
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 30a322c20f..4e2faa988d 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2017  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
diff --git a/lib/isc/nothreads/include/isc/thread.h b/lib/isc/nothreads/include/isc/thread.h
index 129680db21..c4ca050c43 100644
--- a/lib/isc/nothreads/include/isc/thread.h
+++ b/lib/isc/nothreads/include/isc/thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2017  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
diff --git a/lib/isc/nothreads/thread.c b/lib/isc/nothreads/thread.c
index b697cf3711..48e17c23a0 100644
--- a/lib/isc/nothreads/thread.c
+++ b/lib/isc/nothreads/thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  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
diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index 309fc1b0e9..2b43f9e5a2 100644
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2013, 2016, 2017  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
diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index 4caa7dde81..78252dd78d 100644
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2003-2005, 2007, 2013, 2016, 2017  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
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 79d463bf30..490b32abfe 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2002, 2004, 2005, 2007-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2002, 2004, 2005, 2007-2009, 2011-2017  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
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 716bd2ebc9..d820a6df01 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2017  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
diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index 6f1a715254..59de705aaa 100644
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2013, 2016, 2017  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
diff --git a/lib/isc/win32/thread.c b/lib/isc/win32/thread.c
index 39e83b1413..4007632f71 100644
--- a/lib/isc/win32/thread.c
+++ b/lib/isc/win32/thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016, 2017  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
diff --git a/make/rules.in b/make/rules.in
index 6e83b693bc..de60a11099 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-2009, 2011-2017  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
diff --git a/util/copyrights b/util/copyrights
index 98f6528c5d..055530f75a 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -3,16 +3,14 @@
 ./Atffile					X	2011
 ./CHANGES					X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./COPYRIGHT					TXT	1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./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,2016,2017
 ./HISTORY.md					X	2017
 ./LICENSE					X	2016
 ./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./OPTIONS					?	2017
-./OPTIONS.md					?	2017
+./OPTIONS					MKD	2017
+./OPTIONS.md					MKD	2017
 ./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./README.md					?	2017
+./README.md					MKD	2017
 ./acconfig.h					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016
 ./aclocal.m4					X	1999,2000,2001,2012,2014
 ./autogen.sh					SH	2015,2016
@@ -3386,11 +3384,14 @@
 ./doc/dev/HOW-ADB-WORKS.txt			TXT.BRIEF	2003,2004,2016
 ./doc/dev/autoconf				TXT.BRIEF	2001,2002,2004,2016
 ./doc/dev/coding.html				HTML	1999,2000,2001,2002,2004,2007,2016
+./doc/dev/contrib.md				MKD	2017
 ./doc/dev/cvs-usage				TXT.BRIEF	2000,2001,2004,2016
+./doc/dev/dev.md				MKD	2017
 ./doc/dev/magic_numbers				TXT.BRIEF	1999,2000,2001,2002,2004,2016
 ./doc/dev/rdata.html				HTML	1999,2000,2001,2004,2007,2016
 ./doc/dev/release				TXT.BRIEF	2000,2001,2002,2003,2004,2005,2006,2007,2009,2014,2016
 ./doc/dev/results				TXT.BRIEF	1999,2000,2001,2004,2016
+./doc/dev/style.md				MKD	2017
 ./doc/dev/tests					TXT.BRIEF	2000,2001,2004,2016
 ./doc/dev/unexpected				TXT.BRIEF	1999,2000,2001,2004,2016
 ./doc/doxygen/.gitignore			X	2012
@@ -3400,11 +3401,6 @@
 ./doc/doxygen/isc-footer.html			HTML	2006,2007,2016
 ./doc/doxygen/isc-header.html			HTML	2006,2007,2016
 ./doc/doxygen/mainpage				X	2006
-./doc/markdown/.gitignore			X	2014
-./doc/markdown/Makefile				MAKE	2014,2016
-./doc/markdown/dev.mkd				MKD	2014,2015,2016
-./doc/markdown/howto.mkd			MKD	2014,2016
-./doc/markdown/style.mkd			MKD	2014,2016
 ./doc/misc/Makefile.in				MAKE	2001,2004,2007,2009,2012,2016,2017
 ./doc/misc/dnssec				TXT.BRIEF	2000,2001,2002,2004,2016
 ./doc/misc/docbook-options.pl			PERL	2017
@@ -4964,7 +4960,7 @@
 ./util/nanny.pl					PERL	2000,2001,2004,2007,2012,2016
 ./util/new-func					PERL	2005,2007,2012,2016
 ./util/nt-kit					SH	1999,2000,2001,2004,2007,2012,2016
-./util/recent_changes.sh			SH	2012,2016
+./util/recent_changes.sh			SH	2012,2016,2017
 ./util/spacewhack.pl				PERL	2000,2001,2004,2007,2012,2016
 ./util/tabify-changes				SH	2004,2007,2012,2016
 ./util/update-drafts.pl				PERL	2000,2001,2004,2007,2012,2016
diff --git a/util/recent_changes.sh b/util/recent_changes.sh
index f700772979..4279db7878 100644
--- a/util/recent_changes.sh
+++ b/util/recent_changes.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2016, 2017  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