diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index 2d1f12b06e3a..e025e8fefb14 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -3,7 +3,7 @@
 This directory contains sample "supfiles" for obtaining and updating
 the FreeBSD sources via the Internet.  These supfiles will work
 with CVSup version 14.0 or later.  For general information on CVSup
-itself, please see http://www.freebsd.org/handbook/cvsup.html
+itself, please see http://www.freebsd.org/doc/handbook/cvsup.html
 
 To maintain the sources for the FreeBSD-current release, use:
 
@@ -27,7 +27,7 @@ To maintain a copy of the FreeBSD bug database, use the file:
 IMPORTANT: Before you use any of the supfiles in this directory,
 you will need to edit in an appropriate "host" setting.  See:
 
-    http://www.freebsd.org/handbook/mirrors.html
+    http://www.freebsd.org/doc/handbook/mirrors.html
 
 for an up-to-date list of public CVSup mirror sites.
 
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index 9a1fc560994f..cd75d147543d 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -24,7 +24,7 @@
 #		This specifies the server host which will supply the
 #		file updates.  You must change it to one of the CVSup
 #		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/handbook/mirrors.html.
+#		http://www.freebsd.org/doc/handbook/mirrors.html.
 #		You can	override this setting on the command line
 #		with cvsup's "-h host" option.
 #
@@ -48,7 +48,7 @@
 # Defaults that apply to all the collections
 #
 # IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/handbook/mirrors.html.
+# listed at http://www.freebsd.org/doc/handbook/mirrors.html.
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/home/ncvs
diff --git a/share/examples/cvsup/doc-supfile b/share/examples/cvsup/doc-supfile
index 22715edd3267..61f591f2239f 100644
--- a/share/examples/cvsup/doc-supfile
+++ b/share/examples/cvsup/doc-supfile
@@ -24,7 +24,7 @@
 #		This specifies the server host which will supply the
 #		file updates.  You must change it to one of the CVSup
 #		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/handbook/mirrors.html.
+#		http://www.freebsd.org/doc/handbook/mirrors.html.
 #		You can	override this setting on the command line
 #		with cvsup's "-h host" option.
 #
@@ -47,7 +47,7 @@
 # Defaults that apply to all the collections
 #
 # IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/handbook/mirrors.html.
+# listed at http://www.freebsd.org/doc/handbook/mirrors.html.
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile
index 640915fbe3d4..9c2e69c71d54 100644
--- a/share/examples/cvsup/gnats-supfile
+++ b/share/examples/cvsup/gnats-supfile
@@ -24,7 +24,7 @@
 #		This specifies the server host which will supply the
 #		file updates.  You must change it to one of the CVSup
 #		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/handbook/mirrors.html.
+#		http://www.freebsd.org/doc/handbook/mirrors.html.
 #		You can	override this setting on the command line
 #		with cvsup's "-h host" option.
 #
@@ -47,7 +47,7 @@
 # Defaults that apply to all the collections
 #
 # IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/handbook/mirrors.html.
+# listed at http://www.freebsd.org/doc/handbook/mirrors.html.
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile
index a91787a60fbb..2628f101de78 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -24,7 +24,7 @@
 #		This specifies the server host which will supply the
 #		file updates.  You must change it to one of the CVSup
 #		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/handbook/mirrors.html.
+#		http://www.freebsd.org/doc/handbook/mirrors.html.
 #		You can	override this setting on the command line
 #		with cvsup's "-h host" option.
 #
@@ -47,7 +47,7 @@
 # Defaults that apply to all the collections
 #
 # IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/handbook/mirrors.html.
+# listed at http://www.freebsd.org/doc/handbook/mirrors.html.
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 566e0940616e..9ec3c38759ea 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -24,7 +24,7 @@
 #		This specifies the server host which will supply the
 #		file updates.  You must change it to one of the CVSup
 #		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/handbook/mirrors.html.
+#		http://www.freebsd.org/doc/handbook/mirrors.html.
 #		You can	override this setting on the command line
 #		with cvsup's "-h host" option.
 #
@@ -64,7 +64,7 @@
 # Defaults that apply to all the collections
 #
 # IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/handbook/mirrors.html.
+# listed at http://www.freebsd.org/doc/handbook/mirrors.html.
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index 7d0f8fdcf3ef..bfc37a5ea3be 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -24,7 +24,7 @@
 #		This specifies the server host which will supply the
 #		file updates.  You must change it to one of the CVSup
 #		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/handbook/mirrors.html.
+#		http://www.freebsd.org/doc/handbook/mirrors.html.
 #		You can	override this setting on the command line
 #		with cvsup's "-h host" option.
 #
@@ -47,7 +47,7 @@
 # Defaults that apply to all the collections
 #
 # IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/handbook/mirrors.html.
+# listed at http://www.freebsd.org/doc/handbook/mirrors.html.
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
diff --git a/share/examples/cvsup/www-supfile b/share/examples/cvsup/www-supfile
index 8116f5ecfe94..b10945ad0879 100644
--- a/share/examples/cvsup/www-supfile
+++ b/share/examples/cvsup/www-supfile
@@ -24,7 +24,7 @@
 #		This specifies the server host which will supply the
 #		file updates.  You must change it to one of the CVSup
 #		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/handbook/mirrors.html.
+#		http://www.freebsd.org/doc/handbook/mirrors.html.
 #		You can	override this setting on the command line
 #		with cvsup's "-h host" option.
 #
@@ -47,7 +47,7 @@
 # Defaults that apply to all the collections
 #
 # IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/handbook/mirrors.html.
+# listed at http://www.freebsd.org/doc/handbook/mirrors.html.
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr