diff --git a/src/etc/security b/src/etc/security
index 9e8b8c46..573fc1ad 100644
--- a/src/etc/security
+++ b/src/etc/security
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: security,v 1.62 2003/07/01 22:12:50 millert Exp $
+#	$OpenBSD: security,v 1.63 2003/07/03 23:05:42 millert Exp $
 #	from: @(#)security	8.1 (Berkeley) 6/9/93
 #
 
@@ -136,6 +136,9 @@ umaskset=no
 list="/etc/csh.cshrc /etc/csh.login ${rhome}/.cshrc ${rhome}/.login"
 for i in $list ; do
 	if [ -s $i ] ; then
+		if egrep -q '[[:space:]]*umask[[:space:]]' $i ; then
+			umaskset=yes
+		fi
 		awk '{
 		    if ($1 == "umask") {
 			 if ($2 % 100 / 10 ~ /^[0145]/)
@@ -143,11 +146,7 @@ for i in $list ; do
 			 if ($2 % 10 ~ /^[0145]/)
 			    print "Root umask is other writable";
 		    }
-		}' < $i > $TMP3
-		if [ -s $TMP3 ]; then
-			umaskset=yes
-			cat $TMP3 >> $OUTPUT
-		fi
+		}' < $i >> $OUTPUT
 		SAVE_PATH=$PATH
 		unset PATH
 		/bin/csh -f -s << end-of-csh > /dev/null 2>&1