--- etc/Makefile
+++ etc/Makefile
@@ -17,7 +17,9 @@
 	login.access \
 	rc.bsdextended \
 	rc.firewall \
-	termcap.small
+	sh.shrc \
+	termcap.small \
+	tmpdirrc \
 
 # NB: keep these sorted by MK_* knobs
 
--- bin/csh/csh.cshrc
+++ bin/csh/csh.cshrc
@@ -1,3 +1,6 @@
 # $FreeBSD$
 #
 # System-wide .cshrc file for csh(1).
+
+set	history=511
+alias	tset	'set noglob histchars=""; eval `/usr/bin/tset -s \!*`; unset noglob histchars'
--- bin/csh/csh.login
+++ bin/csh/csh.login
@@ -6,6 +6,13 @@
 # login.conf(5) and in particular the charset and lang options.
 # For full locales list check /usr/share/locale/*
 #
+setenv TMPDIR		`/usr/bin/mkinittmpdir`
+setenv MANPATH		`/usr/bin/manpath`
+setenv INFOPATH		'/usr/share/info:/usr/local/info:/compat/linux/usr/info'
+setenv HTTP_AUTH	'basic:*'
+setenv CVSROOT		/home/CVShome
+setenv FONTSERVER	xfs:7100
+#
 # Check system messages
 # msgs -q
 # Allow terminal messages
--- usr.bin/login/login.conf	(revision 371492)
+++ usr.bin/login/login.conf	(working copy)
@@ -26,9 +26,9 @@
 	:passwd_format=sha512:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
-	:setenv=BLOCKSIZE=K:\
 	:mail=/var/mail/$:\
-	:path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,FTP_PASSIVE_MODE=YES,EDITOR=/usr/bin/vi,NNTPSERVER=news,PAGER=less,LESS=-x8,SM_SAVE_DIR=~/.desk,ENV=~/.bashrc,TMPDIR=:\
+	:path=~/bin /sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
 	:datasize=unlimited:\
@@ -94,7 +94,12 @@
 	:lang=ru_RU.UTF-8:\
 	:tc=default:
 
+ru|Russian Users Accounts:\
+	:charset=KOI8-R:\
+	:lang=ru_RU.KOI8-R:\
+	:tc=default:
 
+
 ######################################################################
 ######################################################################
 ##
--- bin/sh/profile
+++ bin/sh/profile
@@ -7,8 +7,17 @@
 # For full locales list check /usr/share/locale/*
 # You should also read the setlocale(3) man page for information
 # on how to achieve more precise control of locale settings.
-#
+
+if [ "${TMPDIR+x}" ]; then
+	export TMPDIR=`/usr/bin/mkinittmpdir`
 # Check system messages
-# msgs -q
+	/usr/bin/msgs -f
 # Allow terminal messages
-# mesg y
+	/usr/bin/mesg y
+fi
+
+export MANPATH=`/usr/bin/manpath`
+export INFOPATH='/usr/share/info:/usr/local/info:/compat/linux/usr/info'
+export HTTP_AUTH='basic:*'
+export CVSROOT=/home/CVShome
+export FONTSERVER=xfs:7100
--- etc/sh.shrc
+++ etc/sh.shrc
@@ -0,0 +1,2 @@
+unset	HISTFILE
+alias	tset='set noglob histchars=""; eval `/usr/bin/tset -s \!*`; unset noglob histchars'