diff --git a/bin/tests/system/dnssec/README b/bin/tests/system/dnssec/README
index d009ba5e58..2fefae859e 100644
--- a/bin/tests/system/dnssec/README
+++ b/bin/tests/system/dnssec/README
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: README,v 1.3 2000/06/22 21:51:32 tale Exp $
+$Id: README,v 1.4 2000/08/09 04:37:09 tale Exp $
 
 The test setup for the DNSSEC tests has a secure root.
 
diff --git a/doc/arm/Bv9ARM.txt b/doc/arm/Bv9ARM.txt
index 9f5187d0ae..7ff3e33697 100644
--- a/doc/arm/Bv9ARM.txt
+++ b/doc/arm/Bv9ARM.txt
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: Bv9ARM.txt,v 1.10 2000/08/01 01:18:04 tale Exp $
+$Id: Bv9ARM.txt,v 1.11 2000/08/09 04:37:10 tale Exp $
 
 BIND 9 Administrator Reference Manual
 July 2000
diff --git a/doc/design/addressdb b/doc/design/addressdb
index a4fe9cf904..4b9e7e2913 100644
--- a/doc/design/addressdb
+++ b/doc/design/addressdb
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: addressdb,v 1.3 2000/08/01 01:18:06 tale Exp $
+$Id: addressdb,v 1.4 2000/08/09 04:37:12 tale Exp $
 
 You are lost in a maze of twisty little pointers, all alike...
 
diff --git a/doc/design/compression b/doc/design/compression
index ca0f1cc95e..92880f2a39 100644
--- a/doc/design/compression
+++ b/doc/design/compression
@@ -1,9 +1,9 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Compression
 
-	$Id: compression,v 1.6 2000/08/01 01:18:07 tale Exp $
+	$Id: compression,v 1.7 2000/08/09 04:37:13 tale Exp $
 
 Overview.
 
diff --git a/doc/design/database b/doc/design/database
index 7f4b5f0c36..67e894a12b 100644
--- a/doc/design/database
+++ b/doc/design/database
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: database,v 1.6 2000/06/21 23:43:30 tale Exp $
+$Id: database,v 1.7 2000/08/09 04:37:14 tale Exp $
 
 Databases
 
diff --git a/doc/design/db_rules b/doc/design/db_rules
index 5c6217cd41..8fbacdb59b 100644
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: db_rules,v 1.5 2000/08/01 01:18:08 tale Exp $
+$Id: db_rules,v 1.6 2000/08/09 04:37:15 tale Exp $
 
 Here is a more formal statement of the important database design
 rules.  Each rule has a 5 character mnemonic, for use in source code
diff --git a/doc/design/decompression b/doc/design/decompression
index 08bb91a7ea..684e3d9841 100644
--- a/doc/design/decompression
+++ b/doc/design/decompression
@@ -1,9 +1,9 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Decompression
 
-	$Id: decompression,v 1.5 2000/08/01 01:18:09 tale Exp $
+	$Id: decompression,v 1.6 2000/08/09 04:37:16 tale Exp $
 
 Overview.
 
diff --git a/doc/design/dispatch b/doc/design/dispatch
index a152bc837d..70be961855 100644
--- a/doc/design/dispatch
+++ b/doc/design/dispatch
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: dispatch,v 1.3 2000/06/22 21:53:51 tale Exp $
+$Id: dispatch,v 1.4 2000/08/09 04:37:17 tale Exp $
 
 UDP receive:
 
diff --git a/doc/design/logging b/doc/design/logging
index bc005aef78..a9a89a6f6f 100644
--- a/doc/design/logging
+++ b/doc/design/logging
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: logging,v 1.7 2000/08/01 01:18:11 tale Exp $
+$Id: logging,v 1.8 2000/08/09 04:37:18 tale Exp $
 
 OVERVIEW
 
diff --git a/doc/design/lwres b/doc/design/lwres
index 21649e132c..600b8b3fae 100644
--- a/doc/design/lwres
+++ b/doc/design/lwres
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: lwres,v 1.3 2000/06/21 23:43:36 tale Exp $
+$Id: lwres,v 1.4 2000/08/09 04:37:19 tale Exp $
 
 This document describes the bind v9 lightweight resolver.
 
diff --git a/doc/design/ncache b/doc/design/ncache
index 6d0f0de9a3..d4aafa78ce 100644
--- a/doc/design/ncache
+++ b/doc/design/ncache
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: ncache,v 1.4 2000/08/01 01:18:12 tale Exp $
+$Id: ncache,v 1.5 2000/08/09 04:37:21 tale Exp $
 
 Negative Caching
 
diff --git a/doc/design/omapi b/doc/design/omapi
index 5f609c9742..d49658fbd0 100644
--- a/doc/design/omapi
+++ b/doc/design/omapi
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: omapi,v 1.5 2000/08/01 01:18:13 tale Exp $
+$Id: omapi,v 1.6 2000/08/09 04:37:22 tale Exp $
 
 This file documents the protocol that the ISC DHCP server and ISC
 Object Management clients (clients that use the ISC Object Management
diff --git a/doc/design/rdataset b/doc/design/rdataset
index 1b5840ff03..691b9da459 100644
--- a/doc/design/rdataset
+++ b/doc/design/rdataset
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: rdataset,v 1.3 2000/06/22 21:53:56 tale Exp $
+$Id: rdataset,v 1.4 2000/08/09 04:37:23 tale Exp $
 
 Need way to "dup" an rdataset (i.e. different rdataset handle, same underlying
 data).
diff --git a/doc/design/red-black b/doc/design/red-black
index 5e966c8bde..0c7874a1b0 100644
--- a/doc/design/red-black
+++ b/doc/design/red-black
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: red-black,v 1.6 2000/08/01 01:18:14 tale Exp $
+$Id: red-black,v 1.7 2000/08/09 04:37:24 tale Exp $
 
                  Red-Black Tree Implementation Notes
 
diff --git a/doc/design/resolver b/doc/design/resolver
index 994a4b8b09..8506d2177a 100644
--- a/doc/design/resolver
+++ b/doc/design/resolver
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: resolver,v 1.3 2000/07/04 01:24:06 tale Exp $
+$Id: resolver,v 1.4 2000/08/09 04:37:25 tale Exp $
 
 Multi-target Resolver
 =====================
diff --git a/doc/design/search b/doc/design/search
index bcd208297d..ae54e4a245 100644
--- a/doc/design/search
+++ b/doc/design/search
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: search,v 1.7 2000/08/01 01:18:16 tale Exp $
+$Id: search,v 1.8 2000/08/09 04:37:26 tale Exp $
 
 What follows is pseudocode for the zone and cache lookup algorithms, as they
 will work in the RBT DB.
diff --git a/doc/design/tasks b/doc/design/tasks
index 7762a1c271..1d51583782 100644
--- a/doc/design/tasks
+++ b/doc/design/tasks
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: tasks,v 1.4 2000/06/22 21:53:59 tale Exp $
+$Id: tasks,v 1.5 2000/08/09 04:37:27 tale Exp $
 
 Changes I made last week to the task code simplified the task shutdown
 and termination model.  Here's how things now work:
diff --git a/doc/design/windows-nt b/doc/design/windows-nt
index b23b4052e6..74f5234855 100644
--- a/doc/design/windows-nt
+++ b/doc/design/windows-nt
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: windows-nt,v 1.5 2000/08/01 01:18:18 tale Exp $
+$Id: windows-nt,v 1.6 2000/08/09 04:37:28 tale Exp $
 
                      Windows NT Portability Notes
 
diff --git a/doc/design/zone b/doc/design/zone
index 2641dc7834..4a521c4338 100644
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -1,9 +1,9 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Zones
 
-	$Id: zone,v 1.7 2000/08/01 01:18:19 tale Exp $
+	$Id: zone,v 1.8 2000/08/09 04:37:29 tale Exp $
 
 Overview
 
diff --git a/doc/dev/DBC b/doc/dev/DBC
index 6dfd044e5b..c0771b47bf 100644
--- a/doc/dev/DBC
+++ b/doc/dev/DBC
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: DBC,v 1.3 2000/06/22 21:54:01 tale Exp $
+$Id: DBC,v 1.4 2000/08/09 04:37:31 tale Exp $
 
 Design By Contract
 
diff --git a/doc/dev/cvs b/doc/dev/cvs
index 2517977713..c9635dd342 100644
--- a/doc/dev/cvs
+++ b/doc/dev/cvs
@@ -1,5 +1,5 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Notes on CVS Usage
 
@@ -85,4 +85,4 @@ In a mainline working tree, do something like this:
   cvs tag -b -r v9_0_base v9_0 file
 
 
-$Id: cvs,v 1.4 2000/08/01 01:18:22 tale Exp $
+$Id: cvs,v 1.5 2000/08/09 04:37:32 tale Exp $
diff --git a/doc/dev/cvs-usage b/doc/dev/cvs-usage
index 9c433da16f..3c0ba07de8 100644
--- a/doc/dev/cvs-usage
+++ b/doc/dev/cvs-usage
@@ -1,5 +1,5 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Notes on CVS Usage
 
@@ -85,4 +85,4 @@ In a mainline working tree, do something like this:
   cvs tag -b -r v9_0_base v9_0 file
 
 
-$Id: cvs-usage,v 1.4 2000/08/01 01:18:22 tale Exp $
+$Id: cvs-usage,v 1.5 2000/08/09 04:37:32 tale Exp $
diff --git a/doc/dev/magic_numbers b/doc/dev/magic_numbers
index d35769c894..d3a4dde83a 100644
--- a/doc/dev/magic_numbers
+++ b/doc/dev/magic_numbers
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: magic_numbers,v 1.3 2000/06/22 21:54:04 tale Exp $
+$Id: magic_numbers,v 1.4 2000/08/09 04:37:33 tale Exp $
 
 Magic Numbers
 
diff --git a/doc/dev/release b/doc/dev/release
index 0e54b29117..8570efbd7f 100644
--- a/doc/dev/release
+++ b/doc/dev/release
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: release,v 1.13 2000/08/08 23:37:21 gson Exp $
+$Id: release,v 1.14 2000/08/09 04:37:34 tale Exp $
 
 Preparing a bind9 release
 
diff --git a/doc/dev/results b/doc/dev/results
index 009076615b..19ff17ff8e 100644
--- a/doc/dev/results
+++ b/doc/dev/results
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: results,v 1.4 2000/08/01 01:18:25 tale Exp $
+$Id: results,v 1.5 2000/08/09 04:37:35 tale Exp $
 
 Result Codes
 
diff --git a/doc/dev/tests b/doc/dev/tests
index aa067cb5a4..94a78af19e 100644
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: tests,v 1.7 2000/08/01 01:18:26 tale Exp $
+$Id: tests,v 1.8 2000/08/09 04:37:36 tale Exp $
 
 We do hourly test builds of the bind9 tree.  This is an attempt to
 document how they work.
diff --git a/doc/dev/unexpected b/doc/dev/unexpected
index 8cd6bded66..523306fdf3 100644
--- a/doc/dev/unexpected
+++ b/doc/dev/unexpected
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: unexpected,v 1.3 2000/06/22 21:54:08 tale Exp $
+$Id: unexpected,v 1.4 2000/08/09 04:37:37 tale Exp $
 
 Unexpected Errors
 
diff --git a/doc/misc/dnssec b/doc/misc/dnssec
index 7c51ba0ad2..2d5e4eb8bd 100644
--- a/doc/misc/dnssec
+++ b/doc/misc/dnssec
@@ -1,5 +1,5 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 DNSSEC Release Notes
 
@@ -87,4 +87,4 @@ own.  For example, if openssl was installed under /usr/local, use
 "configure --with-openssl=/usr/local".
 
 
-$Id: dnssec,v 1.8 2000/08/03 18:53:53 gson Exp $
+$Id: dnssec,v 1.9 2000/08/09 04:37:39 tale Exp $
diff --git a/doc/misc/ipv6 b/doc/misc/ipv6
index 212f960ce9..15cbd1589a 100644
--- a/doc/misc/ipv6
+++ b/doc/misc/ipv6
@@ -1,5 +1,5 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Currently, there are multiple interesting problems with ipv6
 implementations on various platforms.  These problems range from not
@@ -96,4 +96,4 @@ RELEVANT RFCs
 draft-ietf-ipngwg-rfc2292bis-01:  Advanced Sockets API for IPv6 (draft)
 
 
-$Id: ipv6,v 1.3 2000/06/22 00:14:38 tale Exp $
+$Id: ipv6,v 1.4 2000/08/09 04:37:40 tale Exp $
diff --git a/doc/misc/migration b/doc/misc/migration
index ac48d5b118..1dca716704 100644
--- a/doc/misc/migration
+++ b/doc/misc/migration
@@ -1,5 +1,5 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
                    BIND 8 to BIND 9 Migration Notes
 
@@ -93,4 +93,4 @@ completely.  We have contacted the manufacturer of the name server in
 case and are trying to resolve the issue with them.
 
 
-$Id: migration,v 1.4 2000/07/27 23:48:49 tale Exp $
+$Id: migration,v 1.5 2000/08/09 04:37:41 tale Exp $
diff --git a/doc/misc/options b/doc/misc/options
index 9b762fcb58..fc4080fe2f 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: options,v 1.32 2000/08/01 01:22:02 tale Exp $
+$Id: options,v 1.33 2000/08/09 04:37:42 tale Exp $
 
 This is a summary of the implementation status of the various named.conf
 options in BIND 9.
diff --git a/util/COPYRIGHT.BRIEF b/util/COPYRIGHT.BRIEF
index 0a46edd79a..16614cba30 100644
--- a/util/COPYRIGHT.BRIEF
+++ b/util/COPYRIGHT.BRIEF
@@ -1,2 +1,2 @@
 Copyright (C) @YEARS@  Internet Software Consortium.
-See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.