diff --git a/etc/periodic/weekly/320.whatis b/etc/periodic/weekly/320.whatis
index 6ae23a4f9337..fc91e7f20813 100755
--- a/etc/periodic/weekly/320.whatis
+++ b/etc/periodic/weekly/320.whatis
@@ -1,18 +1,19 @@
 #!/bin/sh -
 #
-# $Id: 320.whatis,v 1.1.1.1 1997/08/12 17:51:16 pst Exp $
+# $Id: 320.whatis,v 1.1.1.1 1997/08/16 17:04:02 pst Exp $
 #
 
-if [ -x /usr/libexec/makewhatis.local -a -d /usr/share/man ] ; then
+if [ -x /usr/libexec/makewhatis.local -a -x /usr/bin/manpath ] ; then
 
     echo ""
     echo "Rebuilding whatis database:"
 
-    if [ -d /usr/X11R6/man ] ; then
-	MANPATH=${MANPATH:-/usr/share/man:/usr/X11R6/man:/usr/local/man}
-    else
-	MANPATH=${MANPATH:-/usr/share/man:/usr/local/man}
+    MANPATH=`/usr/bin/manpath -q`
+    if [ $? = 0 ]; then
+	if [ "x${MANPATH}" = "x" ]; then
+	    echo "manpath failed to find any manpage directories"
+	else
+	    /usr/libexec/makewhatis.local "${MANPATH}"
+	fi
     fi
-
-    /usr/libexec/makewhatis.local "${MANPATH}"
 fi