--- libexec/rc/Makefile
+++ libexec/rc/Makefile
@@ -3,7 +3,8 @@
 
 CONFGROUPS=	CONFETC CONFETCEXEC CONFETCDEFAULTS
 CONFETCDIR=	/etc
-CONFETC=	network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended
+CONFETC=	network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended\
+		sh.shrc tmpdirrc
 CONFETCPACKAGE=	rc
 
 .if ${MK_IPFW} != "no"
--- bin/csh/csh.cshrc
+++ bin/csh/csh.cshrc
@@ -1,2 +1,5 @@
 #
 # 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
@@ -5,13 +5,6 @@
 # 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
+++ usr.bin/login/login.conf
@@ -25,9 +25,9 @@
 	:passwd_format=sha512:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/var/run/motd:\
-	:setenv=BLOCKSIZE=K:\
+	:setenv=BLOCKSIZE=K,MAIL=/var/mail/$,FTP_PASSIVE_MODE=YES,EDITOR=/usr/bin/vi,PAGER=less,LESS=-x8,SM_SAVE_DIR=~/.desk,ENV=~/.bashrc,TMPDIR=:\
 	:mail=/var/mail/$:\
-	:path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
+	:path=~/bin /sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
 	:datasize=unlimited:\
@@ -92,11 +92,6 @@
 russian|Russian Users Accounts:\
 	:charset=UTF-8:\
 	: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
@@ -6,11 +6,20 @@
 # 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
 
 # Load each .sh file in /etc/profile.d/, then /usr/local/etc/profile,
 # then each .sh file in /usr/local/etc/profile.d/.
--- libexec/rc/sh.shrc
+++ libexec/rc/sh.shrc
@@ -1,2 +0,0 @@
+unset	HISTFILE
+alias	tset='set noglob histchars=""; eval `/usr/bin/tset -s \!*`; unset noglob histchars'