diff --git a/etc/Makefile b/etc/Makefile
index 79e714fc2ed4..77c337bdd40f 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.197 1999/05/05 19:44:13 markm Exp $
+#	$Id: Makefile,v 1.198 1999/05/11 11:52:27 jkh Exp $
 
 SUBDIR=	sendmail
 
@@ -136,4 +136,11 @@ distrib-dirs:
 	rm -rf POSIX; \
 	ln -s C POSIX
 
+etc-examples:
+	(cd ${.CURDIR}; \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${BIN1} ${BIN2} \
+	    ${DESTDIR}/usr/share/examples/etc; \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/rc.conf \
+	    ${DESTDIR}/usr/share/examples/etc/defaults)
+
 .include <bsd.prog.mk>
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index c569d69f9d26..f7e551e3b47a 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.usr.dist,v 1.157 1999/06/05 03:03:53 julian Exp $
+#	$Id: BSD.usr.dist,v 1.158 1999/06/08 02:24:30 foxfair Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -334,6 +334,8 @@
             drivers
             ..
             etc
+		defaults
+		..
 	    ..
 	    find_interface
             ..
diff --git a/share/examples/Makefile b/share/examples/Makefile
index c2b7c7795de6..9946eb28c7bc 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.23 1997/02/22 13:55:43 peter Exp $
 #
 # Doing a make install builds /usr/share/examples
 
@@ -15,7 +15,7 @@ SHARED?=	copies
 
 all clean cleandir depend lint tags:
 
-beforeinstall: ${SHARED}
+beforeinstall: etc-examples ${SHARED}
 
 .for dir in ${DIRS}
 FILES!=	find -L ${dir} \( -name CVS -prune \) -o -type f -print
@@ -30,4 +30,7 @@ symlinks::
 	rm -rf ${DDIR}/${dir}; ln -s ${.CURDIR}/${dir} ${DDIR}
 .endfor
 
+etc-examples:
+	(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples)
+
 .include <bsd.prog.mk>
diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples
index e15b3b7380a5..370e46aa2fd9 100644
--- a/share/examples/etc/README.examples
+++ b/share/examples/etc/README.examples
@@ -1,4 +1,4 @@
-$Id$
+$Id: README.examples,v 1.3 1997/02/22 13:55:51 peter Exp $
 
 The /usr/share/examples/etc directory contains the original
 distribution versions of the files which are shipped in /etc.  This is
@@ -8,31 +8,54 @@ accidentally deleted or broken beyond repair.
 This directory contains the following files:
 
 aliases		- sendmail aliases file (see aliases(5))
+amd.map		- filesystem automounter lookup resolution map (see amd(8))
+auth.conf	- authentication capability database (see auth.conf(5))
+crontab		- system scheduled command table (see crontab(5))
 csh.cshrc	- sample .cshrc (see csh(1))
 csh.login	- sample .login
 csh.logout	- sample .logout
+disktab		- disk description file (see disktab(5))
 dm.conf		- configuration file for games (see dm(6))
 fbtab		- configuration file for login(1)
 ftpusers	- user restriction file for ftpd(8)
 gettytab	- defines port configuration for getty(8)
+group		- group permissions file (see group(5))
 host.conf	- defines name resolution order for gethostbyname(3)
 hosts		- see hosts(5)
 hosts.equiv	- defines system-wide trusted hosts (see ruserok(3))
 hosts.lpd	- defines trusted hosts for lpd(8)
 inetd.conf	- configuration file for inetd(8)
+locate.rc	- confiuration file for locate(1)
 login.access	- configuration file for login(8) (see login.access(5))
+login.conf	- login class capabilities database (see login.conf(5))
+mail.rc		- systemwide initialization files for mail(1)
 make.conf	- defines configuration variables for system builds
 manpath.config	- configuration file for man(1)
+modems		- modem configuration database (see modems(5))
 motd		- sample Message of the Day
-myname		- probably doesn't belong here
 netstart	- network startup script run from /etc/rc
 networks	- see networks(5)
+newsyslog.conf	- configuration for system log file rotator newsyslog(8)
+pam.conf	- configuration file for pam(8)
+pccard.conf	- configuration file for pccardd(8)
+pccard_ether	- confiuration script for ethernet pccards (see pccardd(8))
 phones		- phone number database for tip(1)
 printcap	- configuration file for lpr(1)
 protocols	- see protocols(5)
+profile		- system-wide .profile for sh(1)
 rc		- system startup script (see init(8))
-rc.local	- sample local startup script, run from /etc/rc
+rc.atm		- networking startup script for atm(8)
+rc.devfs	- startup script for devfs(5)
+rc.diskless1	- general BOOTP startup script
+rc.diskless2	- 
+rc.firewall	- setup system for ipfw(8)
+rc.i386		- startup script for i386-specific processing
+rc.alpha	- startup script for axp-specific processing
+rc.isdn		- startup script for isdnd(8)
+rc.network	- network startup script
+rc.pccard	- startup script for PC-cards
 rc.serial	- sample local startup script fragments
+rc.shutdown	- system shutdown script (see init(8))
 remote		- configuration file for tip(1)
 rpc		- see rpc(5)
 security	- script run from crontab to do nightly security checks
@@ -41,3 +64,4 @@ shells		- list of configurable shells (see shells(5))
 skey.access	- configuration file for S/Key (see skey.access(5))
 syslog.conf	- configuration file for syslogd(8)
 ttys		- defines port configuration for init(8)
+defaults/rc.conf	- default system configuration info (see rc.conf(5))