diff --git a/bin/csh/dot.cshrc b/bin/csh/dot.cshrc
index 2465cf42da6..c9ce05fe697 100644
--- a/bin/csh/dot.cshrc
+++ b/bin/csh/dot.cshrc
@@ -41,6 +41,10 @@ if ($?prompt) then
 		bindkey "^W" backward-delete-word
 		bindkey -k up history-search-backward
 		bindkey -k down history-search-forward
+		bindkey "\e[1~" beginning-of-line
+		bindkey "\e[2~" overwrite-mode
+		bindkey "\e[3~" delete-char
+		bindkey "\e[4~" end-of-line
 	endif
 
 endif
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index e923e467674..bdb96da7d03 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -38,6 +38,10 @@ if ($?prompt) then
 		bindkey "^W" backward-delete-word
 		bindkey -k up history-search-backward
 		bindkey -k down history-search-forward
+		bindkey "\e[1~" beginning-of-line
+		bindkey "\e[2~" overwrite-mode
+		bindkey "\e[3~" delete-char
+		bindkey "\e[4~" end-of-line
 	endif
 
 endif
diff --git a/share/skel/dot.profile b/share/skel/dot.profile
index 02623293b59..83ff993e7c9 100644
--- a/share/skel/dot.profile
+++ b/share/skel/dot.profile
@@ -27,4 +27,4 @@ if [ "$PWD" != "$HOME" ] && [ "$PWD" -ef "$HOME" ] ; then cd ; fi
 if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
 
 # Display a random cookie on each login.
-if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune freebsd-tips ; fi
+#if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune freebsd-tips ; fi
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 5769a34c6d2..6a17a20052c 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -8,6 +8,10 @@ PACKAGE=	vi
 SRCDIR=		${SRCTOP}/contrib/nvi
 SUBDIR+=	catalog
 
+CONFS=			dot.vimrc
+CONFSDIR_dot.vimrc=	/root
+CONFSNAME_dot.vimrc=	.vimrc
+
 WARNS?=	0	# some warn issues on 32 bit machines
 
 VI=	nvi
diff --git a/usr.bin/vi/dot.vimrc b/usr.bin/vi/dot.vimrc
new file mode 100644
index 00000000000..b8ed9e7306b
--- /dev/null
+++ b/usr.bin/vi/dot.vimrc
@@ -0,0 +1,14 @@
+command Zap %s/[\xA0]/ /g
+set viminfo='20,<1000
+set colorcolumn=80
+syntax on
+set ts=8
+set hls
+set nu
+
+autocmd BufReadPost *
+  \ if ! exists("g:leave_my_cursor_position_alone") |
+  \     if line("'\"") > 0 && line ("'\"") <= line("$") |
+  \         exe "normal g'\"" |
+  \     endif |
+  \ endif