diff --git a/OPTIONS b/OPTIONS
index aba2516f23..61fae3bc95 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -1,7 +1,11 @@
-<!--- - 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
+<!---
+ - 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/bin/named/config.c b/bin/named/config.c
index c70ebd934f..c20eee3c80 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001-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/checkconf/bad-lmdb-mapsize-bogus.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf
index f27e87f217..c46b2ba065 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf
@@ -1,5 +1,5 @@
 /*
- * 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
diff --git a/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf
index 3315091a8f..e8c8af3d2a 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf
@@ -1,5 +1,5 @@
 /*
- * 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
diff --git a/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf
index 803ea6b3e5..046d5f27b8 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf
@@ -1,5 +1,5 @@
 /*
- * 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
diff --git a/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf b/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf
index b1b8066a00..c6ea860013 100644
--- a/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf
+++ b/bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf
@@ -1,5 +1,5 @@
 /*
- * 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
diff --git a/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf b/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf
index 9625e579d7..5f06995ada 100644
--- a/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf
+++ b/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf
@@ -1,5 +1,5 @@
 /*
- * 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
diff --git a/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf b/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf
index 0f6fa79352..6a7a0998c7 100644
--- a/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf
+++ b/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf
@@ -1,5 +1,5 @@
 /*
- * 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
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index def6483cb3..207d3544b2 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -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
@@ -29,6 +29,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2017</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <!-- insert copyright end -->
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index abd459005b..8700ecf5a8 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001-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/include/dns/view.h b/lib/dns/include/dns/view.h
index 0e73ad4750..d052317da5 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-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/view.c b/lib/dns/view.c
index f2c10717bc..20fdd63b83 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-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/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index e5fb79f1ae..364f3dbacb 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2011, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2002-2011, 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/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index e34009a7b4..3e5f753a05 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2002-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/isccfg/parser.c b/lib/isccfg/parser.c
index 13c5151ad4..7d627d2fab 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.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