diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 11b36714ff5748aa8fc5c2e03f8a443fca4ea5bd..040071e58b9c0fb28e4ebe61a68f4b075d2dff89 100644
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -26,6 +26,9 @@
+ 2000
+ 2001
+ 2002
2004
2005
2007
@@ -35,12 +38,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- Internet Software Consortium.
-
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index c702cdf1b8d528aafa00619e234a94e7a84b1dd6..e7c5f60adcb12f0369bcaa47f099825d738b9a91 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -24,6 +24,9 @@
+ 2000
+ 2001
+ 2002
2004
2005
2006
@@ -38,12 +41,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- Internet Software Consortium.
-
diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook
index 094a376a5fdc7eaba6c1d0c25a22424a76d45a4a..d58964880f62311443f3a1d2e0c4ac84e324655e 100644
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@@ -29,6 +29,8 @@
+ 2001
+ 2003
2004
2005
2007
@@ -39,11 +41,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2001
- 2003
- Internet Software Consortium.
-
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 7673a75630d8183cdece62e65c0a4163203695ea..cc056e76edd07f93cb5c309baa3de50c2a9b1555 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -31,6 +31,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2006
@@ -45,13 +49,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
index e59d11530f228e762e44648b56b9e92eb091eb4f..cdf9df729b250256c564fd793f6ef8b5cde53248 100644
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@@ -31,6 +31,9 @@
+ 2000
+ 2001
+ 2002
2004
2005
2007
@@ -41,12 +44,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- Internet Software Consortium.
-
diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index 865758cec4590912cfc548c11513556a0a963a6f..fd5fda637fb8cbb54f264dfe0aec8b5d2d508467 100644
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -30,6 +30,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2007
@@ -43,13 +47,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 5c7caaed5b67723402497d50838b78129959df80..761d343867484a214a227f793238be11b395050e 100644
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -29,6 +29,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2006
@@ -43,13 +47,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index 44c8078d7935a55e17efd29232a88c54838f4dc1..43e54d4f956696e04c03364a103aa00491dc72a8 100644
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -29,6 +29,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -39,11 +41,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index f1aa76bab686f0d044b39fa80d2391b0842c58f0..2e4e2a517ecfac203c40b4bd171c8e883486a6d3 100644
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -29,6 +29,9 @@
+ 2000
+ 2001
+ 2003
2004
2005
2006
@@ -42,12 +45,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2003
- Internet Software Consortium.
-
diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index 984522c1f4fa4dc1237b942f752e8511737da111..2facc4bb17bccef0a8288562010c555e40f58a6d 100644
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -28,6 +28,10 @@
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2006
@@ -42,13 +46,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook
index f769d9bef1ee1fdb0e9189bbdc5cd3de7634d5bd..0e51cb47a2fc9310c1456be32f8404df37f6db10 100644
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@@ -29,6 +29,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -38,11 +40,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 9247e4835b366a350809ef1d117fac7dc4a65836..dcd228db2751e91c957b3b232363c6a2f0a4c8ba 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -29,6 +29,8 @@
+ 2000
+ 2001
2004
2005
2007
@@ -38,11 +40,6 @@
2016
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- Internet Software Consortium.
-
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 5cb6a0ba2a41717329ae1c6d5ba7d3a206a3aeba..2119d564e753adea9d9e6e3869cb0d0c815944c2 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -11,6 +11,10 @@
BIND 9 Administrator Reference Manual
+ 2000
+ 2001
+ 2002
+ 2003
2004
2005
2006
@@ -25,13 +29,6 @@
2015
Internet Systems Consortium, Inc. ("ISC")
-
- 2000
- 2001
- 2002
- 2003
- Internet Software Consortium.
-
diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl
index b76764dd5e7fff4a5da9c686833abfa3103a9aad..c46d55f184f320385efb447742ee08bc167429c0 100644
--- a/doc/xsl/copyright.xsl
+++ b/doc/xsl/copyright.xsl
@@ -30,17 +30,9 @@
- 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.
+ 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/.
diff --git a/docutil/HTML_COPYRIGHT b/docutil/HTML_COPYRIGHT
index 61ae4b37d869532999f1e8917ef4ee869018f8f5..82c7e91199b39d1c093d7aa132a6a3806560ca90 100644
--- a/docutil/HTML_COPYRIGHT
+++ b/docutil/HTML_COPYRIGHT
@@ -1,16 +1,7 @@
diff --git a/docutil/MAN_COPYRIGHT b/docutil/MAN_COPYRIGHT
index fe5f81b4b4038e3f1808168cbc038b47e1e1c962..b00f6c300902538dbd41a348b7da10a99de70b28 100644
--- a/docutil/MAN_COPYRIGHT
+++ b/docutil/MAN_COPYRIGHT
@@ -1,16 +1,7 @@
.\"
-.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001 Internet Software Consortium.
-.\"
-.\" Permission to use, copy, modify, and 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.
+.\" Copyright (C) 1996-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/.
.\"
diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index eb185cb71bf2bd26fd36f7e7e56c0caef91e4987..30f94c1eefc7ae8141a58eb1dbe3e5faf4e6973b 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -105,20 +105,11 @@
static const char copyright[] =
"/*\n"
-" * Copyright (C) 2004%s Internet Systems Consortium, Inc. (\"ISC\")\n"
-" * Copyright (C) 1998-2003 Internet Software Consortium.\n"
+" * Copyright (C) 1998%s Internet Systems Consortium, Inc. (\"ISC\")\n"
" *\n"
-" * Permission to use, copy, modify, and distribute this software for any\n"
-" * purpose with or without fee is hereby granted, provided that the above\n"
-" * copyright notice and this permission notice appear in all copies.\n"
-" *\n"
-" * THE SOFTWARE IS PROVIDED \"AS IS\" AND ISC DISCLAIMS ALL WARRANTIES WITH\n"
-" * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n"
-" * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,\n"
-" * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n"
-" * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE\n"
-" * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n"
-" * PERFORMANCE OF THIS SOFTWARE.\n"
+" * This Source Code Form is subject to the terms of the Mozilla Public\n"
+" * License, v. 2.0. If a copy of the MPL was not distributed with this\n"
+" * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n"
" */\n"
"\n"
"/***************\n"
@@ -630,9 +621,9 @@ main(int argc, char **argv) {
tm->tm_year + 1900);
INSIST(n > 0 && (unsigned)n < sizeof(year));
} else
- year[0] = 0;
+ strcpy(year, "-2016");
} else
- year[0] = 0;
+ strcpy(year, "-2016");
if (!depend) fprintf(stdout, copyright, year);
diff --git a/util/mandoc2docbook.pl b/util/mandoc2docbook.pl
index 81f83a95eb2252f678d0972cda7cf978a785b8ee..1a33c9c456c7e85fdb9dd26fa0bc44d051fb2e28 100644
--- a/util/mandoc2docbook.pl
+++ b/util/mandoc2docbook.pl
@@ -21,20 +21,11 @@
print <<\END;
diff --git a/win32utils/Configure b/win32utils/Configure
index cd496a544930cae923b2e0b3a21feb8647bbc381..11bb1fc2780b0fa5fb12b10f204563c65fc92590 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -2821,20 +2821,11 @@ sub makeversion {
# Standard Header
print O '/*
- * Copyright (C) 2001 Internet Software Consortium.
+ * Copyright (C) 2001 Internet Systems Consortium, Inc. ("ISC")
*
- * Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM 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.
+ * 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/.
*/
';
@@ -2927,20 +2918,11 @@ sub makesrcid {
# Standard Header
print SOUT '/*
- * Copyright (C) 2012 Internet Software Consortium.
- *
- * Permission to use, copy, modify, and 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.
+ * Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM 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.
+ * 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/.
*/
';
diff --git a/win32utils/legacy/BuildAll.bat.in b/win32utils/legacy/BuildAll.bat.in
index 9e4cc3a321baf3499f58e4831b4f80d13b77a96c..df633ab6590fdbdec399ee6645b04ef99dc404c4 100644
--- a/win32utils/legacy/BuildAll.bat.in
+++ b/win32utils/legacy/BuildAll.bat.in
@@ -1,19 +1,10 @@
echo off
rem
-rem Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
-rem Copyright (C) 2001-2002 Internet Software Consortium.
-rem
-rem Permission to use, copy, modify, and distribute this software for any
-rem purpose with or without fee is hereby granted, provided that the above
-rem copyright notice and this permission notice appear in all copies.
+rem Copyright (C) 2001-2002,2004,2016 Internet Systems Consortium, Inc. ("ISC")
rem
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-rem AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-rem PERFORMANCE OF THIS SOFTWARE.
+rem This Source Code Form is subject to the terms of the Mozilla Public
+rem License, v. 2.0. If a copy of the MPL was not distributed with this
+rem file, You can obtain one at http://mozilla.org/MPL/2.0/.
rem BuildAll.bat
rem This script sets up the files necessary ready to build BIND 9
diff --git a/win32utils/legacy/BuildSetup.bat.in b/win32utils/legacy/BuildSetup.bat.in
index 6d730ee996304e37d3185466ad863d032a06b4f8..7b43aa52d20976e52f289c9c594448d037d4d8df 100644
--- a/win32utils/legacy/BuildSetup.bat.in
+++ b/win32utils/legacy/BuildSetup.bat.in
@@ -1,19 +1,10 @@
echo off
rem
-rem Copyright (C) 2004,2005 Internet Systems Consortium, Inc. ("ISC")
-rem Copyright (C) 2001-2002 Internet Software Consortium.
-rem
-rem Permission to use, copy, modify, and distribute this software for any
-rem purpose with or without fee is hereby granted, provided that the above
-rem copyright notice and this permission notice appear in all copies.
-rem
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-rem AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-rem PERFORMANCE OF THIS SOFTWARE.
+rem Copyright (C) 2001-2002,2004,2005,2016 Internet Systems Consortium, Inc. ("ISC")
+rem
+rem This Source Code Form is subject to the terms of the Mozilla Public
+rem License, v. 2.0. If a copy of the MPL was not distributed with this
+rem file, You can obtain one at http://mozilla.org/MPL/2.0/.
rem BuildSetup.bat
rem This script sets up the files necessary ready to build BIND 9.