diff --git a/src/etc/Makefile b/src/etc/Makefile
index faab2dfa..6a3820f3 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.108 2000/04/07 02:33:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.109 2000/04/25 20:52:47 jakob Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -83,6 +83,17 @@ distribution-etc-root-var: distrib-dirs
 		rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
 		ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
 		ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile)
+	(cd skel; \
+		${INSTALL} -c -o root -g wheel -m 644 dot.cshrc \
+		    ${DESTDIR}/etc/skel/.cshrc; \
+		${INSTALL} -c -o root -g wheel -m 644 dot.login \
+		    ${DESTDIR}/etc/skel/.login; \
+		${INSTALL} -c -o root -g wheel -m 644 dot.mailrc \
+		    ${DESTDIR}/etc/skel/.mailrc; \
+		${INSTALL} -c -o root -g wheel -m 644 dot.profile \
+		    ${DESTDIR}/etc/skel/.profile; \
+		${INSTALL} -c -o root -g wheel -m 644 dot.rhosts \
+		    ${DESTDIR}/etc/skel/.rhosts)
 	(cd kerberosIV; \
 		${INSTALL} -c -o root -g wheel -m 644 README \
 		    ${DESTDIR}/etc/kerberosIV; \
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 837fe668..547b0715 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.87 2000/04/11 20:10:22 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.88 2000/04/25 20:52:50 jakob Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -84,6 +84,11 @@ ppp
 # ./etc/ppp
 ..
 
+# ./etc/skel
+skel
+# ./etc/skel
+..
+
 # ./etc/sliphome
 sliphome
 # ./etc/sliphome
diff --git a/src/etc/skel/dot.cshrc b/src/etc/skel/dot.cshrc
new file mode 100644
index 00000000..e3b8c5d4
--- /dev/null
+++ b/src/etc/skel/dot.cshrc
@@ -0,0 +1,30 @@
+# .cshrc initialization
+
+alias df	df -k
+alias du	du -k
+alias f		finger
+alias h		'history -r | more'
+alias j		jobs -l
+alias la	ls -a
+alias lf	ls -FA
+alias ll	ls -lgsA
+alias tset	'set noglob histchars=""; eval `\tset -s \!*`; unset noglob histchars'
+alias z		suspend
+
+set path = (~/bin /bin /sbin /usr/{bin,local/bin,games,sbin} .)
+
+if ($?prompt) then
+	# An interactive shell -- set some stuff up
+	set filec
+	set history = 1000
+	set ignoreeof
+	set mail = (/var/mail/$USER)
+	set mch = `hostname -s`
+	alias prompt 'set prompt = "$mch:q"":$cwd:t {\!} "'
+	alias cd 'cd \!*; prompt'
+        alias chdir 'cd \!*; prompt'
+	alias popd 'popd \!*; prompt'
+	alias pushd 'pushd \!*; prompt'
+	cd .
+	umask 22
+endif
diff --git a/src/etc/skel/dot.login b/src/etc/skel/dot.login
new file mode 100644
index 00000000..2bddc137
--- /dev/null
+++ b/src/etc/skel/dot.login
@@ -0,0 +1,15 @@
+#csh login file
+
+if ( ! $?TERMCAP ) then
+	tset -Q  '-mdialup:?vt100' $TERM
+endif
+
+stty	newcrt crterase
+
+set	savehist=100
+set	ignoreeof
+
+setenv	EXINIT		'set ai sm noeb'
+setenv	HOSTALIASES	 $HOME/.hostaliases
+
+if ( -x /usr/games/fortune) /usr/games/fortune
diff --git a/src/etc/skel/dot.mailrc b/src/etc/skel/dot.mailrc
new file mode 100644
index 00000000..7c8a99b9
--- /dev/null
+++ b/src/etc/skel/dot.mailrc
@@ -0,0 +1,2 @@
+set ask
+ignore message-id received date fcc status resent-date resent-message-id resent-from in-reply-to
diff --git a/src/etc/skel/dot.profile b/src/etc/skel/dot.profile
new file mode 100644
index 00000000..ed597ee3
--- /dev/null
+++ b/src/etc/skel/dot.profile
@@ -0,0 +1,2 @@
+PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/games:.
+export PATH HOME TERM
diff --git a/src/etc/skel/dot.rhosts b/src/etc/skel/dot.rhosts
new file mode 100644
index 00000000..58162e03
--- /dev/null
+++ b/src/etc/skel/dot.rhosts
@@ -0,0 +1,2 @@
+# Format of this file is <hostname> <username>
+#localhost foobar