diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-rwho
index a86f83e5837..c40efaafa5f 100755
--- a/etc/periodic/daily/430.status-rwho
+++ b/etc/periodic/daily/430.status-rwho
@@ -1,10 +1,15 @@
 #!/bin/sh
 #
-# $Id: 430.status-rwho,v 1.1.1.1 1997/08/12 17:51:15 pst Exp $
+# $Id: 430.status-rwho,v 1.1.1.1 1997/08/16 17:04:01 pst Exp $
 #
 
-if [ -d /var/rwho -a -x /usr/bin/rwho ] ; then
+if [ -d /var/rwho -a -x /usr/bin/rwho -a $(ls -l /var/rwho | wc -l) -ne 0 ]
+then
     echo ""
     echo "Local network system status:"
     ruptime
+else
+    echo ""
+    echo "Local system status:"
+    uptime
 fi