diff --git a/etc/defaults/weekly.conf b/etc/defaults/weekly.conf
index 9cc30f9bde26..0dacc145e8ba 100644
--- a/etc/defaults/weekly.conf
+++ b/etc/defaults/weekly.conf
@@ -1,4 +1,4 @@
-#	$NetBSD: weekly.conf,v 1.2 2000/11/08 23:17:50 lukem Exp $
+#	$NetBSD: weekly.conf,v 1.3 2007/02/15 23:04:10 reed Exp $
 #
 # /etc/defaults/weekly.conf --
 #	default configuration of /etc/weekly.conf
@@ -9,5 +9,5 @@
 # EDIT /etc/weekly.conf INSTEAD.
 #
 
-clean_uucp=YES
 rebuild_locatedb=YES
+rebuild_whatisdb=NO
diff --git a/etc/weekly b/etc/weekly
index eeffabdb159c..72de24d978a7 100644
--- a/etc/weekly
+++ b/etc/weekly
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: weekly,v 1.21 2006/11/12 01:22:57 christos Exp $
+#	$NetBSD: weekly,v 1.22 2007/02/15 23:04:10 reed Exp $
 #	from: @(#)weekly	8.2 (Berkeley) 1/2/94
 #
 
@@ -79,6 +79,16 @@ if checkyesno rebuild_locatedb; then
 	fi
 fi
 
+if checkyesno rebuild_whatisdb; then
+	echo ""
+	if [ -f /etc/man.conf -o -d /usr/share/man ]; then
+		echo "Rebuilding whatis databases:"
+		nice -n 5 /usr/libexec/makewhatis -f
+	else
+		echo "Not rebuilding whatis databases"
+	fi
+fi
+
 if [ -f /etc/weekly.local ]; then
 	. /etc/weekly.local > $TMP 2>&1
 	if [ -s $TMP ] ; then
diff --git a/share/man/man5/weekly.conf.5 b/share/man/man5/weekly.conf.5
index 8838fbab85b9..bf6f832bda33 100644
--- a/share/man/man5/weekly.conf.5
+++ b/share/man/man5/weekly.conf.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: weekly.conf.5,v 1.8 2007/02/10 18:27:28 reed Exp $
+.\"	$NetBSD: weekly.conf.5,v 1.9 2007/02/15 23:04:10 reed Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 30, 1996
+.Dd February 15, 2007
 .Dt WEEKLY.CONF 5
 .Os
 .Sh NAME
@@ -56,14 +56,23 @@ file.
 (Note that you should never edit
 .Pa /etc/defaults/weekly.conf
 directly, as it is often replaced during system upgrades.)
-.Bl -tag -width check_network
-.It Sy clean_uucp
-This runs the weekly uucp clean script,
-.Pa /usr/lib/uucp/clean.weekly .
+.Bl -tag -width rebuild_locatedb
 .It Sy rebuild_locatedb
 This rebuilds the locate database,
 .Pa /var/db/locate.database ,
 which must also exist, in order to be rebuilt.
+.It Sy rebuild_whatisdb
+This rebuilds the whatis database(s).
+Note that
+.Nx
+provides a default whatis.db for the system manual pages and
+this may not be needed.
+(Adjust your
+.Pa /etc/man.conf
+as necessary.
+See
+.Xr man.conf 5
+for details.)
 .El
 .Sh FILES
 .Bl -tag -width /etc/weekly.local -compact