diff --git a/etc/defaults/weekly.conf b/etc/defaults/weekly.conf
index 955444c6caf1..dfc21df32141 100644
--- a/etc/defaults/weekly.conf
+++ b/etc/defaults/weekly.conf
@@ -1,4 +1,4 @@
-#	$NetBSD: weekly.conf,v 1.4 2012/02/07 19:13:30 joerg Exp $
+#	$NetBSD: weekly.conf,v 1.5 2015/03/04 14:54:38 christos Exp $
 #
 # /etc/defaults/weekly.conf --
 #	default configuration of /etc/weekly.conf
@@ -10,5 +10,4 @@
 #
 
 rebuild_locatedb=YES
-rebuild_whatisdb=NO
 rebuild_mandb=YES
diff --git a/etc/weekly b/etc/weekly
index 928e5ab9a27a..f40395bfdf1a 100644
--- a/etc/weekly
+++ b/etc/weekly
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: weekly,v 1.29 2012/08/29 20:34:19 wiz Exp $
+#	$NetBSD: weekly,v 1.30 2015/03/04 14:54:38 christos Exp $
 #	from: @(#)weekly	8.2 (Berkeley) 1/2/94
 #
 
@@ -79,17 +79,6 @@ if checkyesno rebuild_locatedb; then
 	fi
 fi
 
-if checkyesno rebuild_whatisdb; then
-	echo ""
-	if [ -x /usr/libexec/makewhatis -a \( -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 checkyesno rebuild_mandb; then
 	echo ""
 	if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then