diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 38a71cfbcbf..ac92258f964 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,6 +1,9 @@
 # $FreeBSD$
 #
-#csh .cshrc file
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+#
 
 alias h		history 25
 alias j		jobs -l
@@ -8,9 +11,12 @@ alias la	ls -a
 alias lf	ls -FA
 alias ll	ls -lA
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
-setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man"
+# A rightous umask
+umask 22
 
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
+
+setenv	EDITOR	vi
 setenv	PAGER	more
 setenv	BLOCKSIZE	K
 
diff --git a/etc/root/dot.login b/etc/root/dot.login
index 659db13721f..5a45f104644 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,17 +1,9 @@
 # $FreeBSD$
 #
-# csh .login file
+# .login - csh login script, read by login shell, after `.cshrc' at login.
+#
+# see also csh(1), environ(7).
 #
 
-# Interviews settings
-#setenv CPU "FREEBSD"
-#set path = ($path /usr/local/interviews/bin/$CPU)
-#setenv MANPATH "${MANPATH}:/usr/local/interviews/man"
-
-# 8-bit locale (Germany)
-#setenv LANG de_DE.ISO_8859-1
-
-# A righteous umask
-umask 22
-
-[ -x /usr/games/fortune ] && /usr/games/fortune
+# Uncomment to display a random cookie each login:
+# [ -x /usr/games/fortune ] && /usr/games/fortune
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index 45f376775af..490a6947594 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -1,7 +1,6 @@
 # $FreeBSD$
 #
-# .cshrc - csh resource script, read at beginning 
-#	   of execution by each shell
+# .cshrc - csh resource script, read at beginning of execution by each shell
 #
 # see also csh(1), environ(7).
 #
@@ -12,6 +11,11 @@ alias la	ls -a
 alias lf	ls -FA
 alias ll	ls -lA
 
+# A rightous umask
+umask 22
+
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
+
 setenv	EDITOR	vi
 setenv	PAGER	more
 setenv	BLOCKSIZE	K
diff --git a/share/skel/dot.login b/share/skel/dot.login
index d59a727ccc9..3032ef97c76 100644
--- a/share/skel/dot.login
+++ b/share/skel/dot.login
@@ -1,20 +1,9 @@
 # $FreeBSD$
 #
-# .login - csh login script, read by login shell, 
-#	   after `.cshrc' at login.
+# .login - csh login script, read by login shell, after `.cshrc' at login.
 #
 # see also csh(1), environ(7).
 #
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/bin /usr/X11R6/bin $HOME/bin)
-#setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man"
-
-# Interviews settings
-#setenv CPU "FREEBSD"
-#set path = ($path /usr/local/interviews/bin/$CPU)
-#setenv MANPATH "${MANPATH}:/usr/local/interviews/man"
-
-# A rightous umask
-umask 22
-
-[ -x /usr/games/fortune ] && /usr/games/fortune -s
+# Uncomment to display a random cookie each login:
+# [ -x /usr/games/fortune ] && /usr/games/fortune -s