diff --git a/etc/etc.svr4/SVR4_MAKEDEV b/etc/etc.svr4/SVR4_MAKEDEV
deleted file mode 100644
index 8621e6e4b057..000000000000
--- a/etc/etc.svr4/SVR4_MAKEDEV
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh -
-#	$NetBSD: SVR4_MAKEDEV,v 1.3 1996/04/11 12:59:45 christos Exp $
-#
-# Copyright (c) 1995 Christos Zoulas
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Device "make" file.  Valid arguments:
-#	all	everything
-# Network:
-#	udp		UDP socket creation
-#	tcp		TCP socket creation
-#	rawip		RAW socket creation
-#	ticlts		UNIX datagram creation
-#	ticotsord	UNIX stream creation (with orderly release)
-#	ticots		UNIX stream creation
-# Various:
-#	wabi		Windows emulation; /dev/null for now
-#
-PATH=/sbin:/bin/:/usr/bin:/usr/sbin:/usr/etc
-umask 77
-
-for i
-do
-
-unit=`expr $i : '[a-z][a-z]*\([0-9][0-9]*\)'`
-[ "$unit" ] || unit=0
-
-case $i in
-
-all)
-	sh SVR4_MAKEDEV tcp udp rawip ticlts ticotsord ticots wabi
-	;;
-tcp)
-	mknod $i		c 43 35
-	chown bin.bin $i
-	chmod 666 $i
-	;;
-
-
-udp)
-	mknod udp		c 43 36
-	chown bin.bin $i
-	chmod 666 $i
-	;;
-
-rawip)
-	mknod $i		c 43 37
-	chown bin.bin $i
-	chmod 666 $i
-	;;
-
-ticlts)
-	mknod $i		c 43 38
-	chown bin.bin $i
-	chmod 666 $i
-	;;
-
-ticotsord)
-	mknod $i		c 43 39
-	chown bin.bin $i
-	chmod 666 $i
-	;;
-
-ticots)
-	mknod $i		c 43 40
-	chown bin.bin $i
-	chmod 666 $i
-	;;
-
-
-wabi)
-	mknod $i		c 3 2	# /dev/null
-	chown bin.bin $i
-	chmod 666 $i
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
-
diff --git a/etc/etc.svr4/netconfig b/etc/etc.svr4/netconfig
deleted file mode 100644
index 625c6da68c5d..000000000000
--- a/etc/etc.svr4/netconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: netconfig,v 1.2 1996/04/11 12:59:47 christos Exp $
-# SVR4 Network configuration file
-#
-# service name	       fl family   proto device         library
-udp       tpi_clts     v  inet     udp   /dev/udp       -
-tcp       tpi_cots_ord v  inet     tcp   /dev/tcp       -
-rawip     tpi_raw      -  inet     -     /dev/rawip     -
-ticlts    tpi_clts     v  loopback -     /dev/ticlts    straddr.so
-ticotsord tpi_cots_ord v  loopback -     /dev/ticotsord straddr.so
-ticots    tpi_cots     v  loopback -     /dev/ticots    straddr.so
diff --git a/etc/etc.svr4/nsswitch.conf b/etc/etc.svr4/nsswitch.conf
deleted file mode 100644
index e79bcfde1da4..000000000000
--- a/etc/etc.svr4/nsswitch.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#	$NetBSD: nsswitch.conf,v 1.2 1996/09/01 16:33:07 christos Exp $
-# Name service switch file
-#
-hosts:      dns files
-networks:   files
-protocols:  files
-ethers:     files
-rpc:        files
-netmasks:   files	
-bootparams: files
-services:   files
-#
-passwd:     files
-group:      files
-netgroup:   files
diff --git a/etc/etc.ultrix/svc.conf b/etc/etc.ultrix/svc.conf
deleted file mode 100644
index 51b851408e09..000000000000
--- a/etc/etc.ultrix/svc.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: svc.conf,v 1.1 1997/06/08 09:10:21 jonathan Exp $
-#
-# Ultrix-compatible svc.conf file.
-# Each line  below binds a particular database to one or more resolver
-# services.  The available services are
-#	local - local flat files in /etc/
-#	yp -  NIS (aka yp)
-#	bind - DNS 
-#
-# Multiple services can be specified by a comma-separated list.
-# Order is signficant. Whitespace not allowed except after comments or commas.
-#
-aliases=local		# sendmail /etc/aliases: just run native senmamil.
-auth=local
-group=local		# /etc/group: native and Ultrix are compatible	
-hosts=local,bind	# /etc/hosts (no yp) then DNS
-netgroup=local		# NOTE: Ultrix netgroup really only works with yp.
-networks=local,bind	# rfc 1101
-passwd=local		# Ultrix and native hashed passwds incompatible
-protocols=local		#	/etc/protocols	(getprotoent())
-rpc=local		# 	/etc/rpc	(getrpcent())
-services=local		#	/etc/services	(getservbyname())
-
-# Minimum password length/lifetime/security goop; see an Ultrix manpage.
-# NOTE: running Ultrix /etc/passwd is not  good idea.
-PASSLENMIN=6
-PASSLENMAX=16
-SOFTEXP=604800		# 7 days in seconds 
-SECLEVEL=BSD        	# (BSD | UPGRADE | ENHANCED)
diff --git a/share/samples/emul/svr4/etc/SVR4_MAKEDEV b/share/samples/emul/svr4/etc/SVR4_MAKEDEV
index 8621e6e4b057..f4adba2db06b 100644
--- a/share/samples/emul/svr4/etc/SVR4_MAKEDEV
+++ b/share/samples/emul/svr4/etc/SVR4_MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: SVR4_MAKEDEV,v 1.3 1996/04/11 12:59:45 christos Exp $
+#	$NetBSD: SVR4_MAKEDEV,v 1.4 1997/06/08 23:34:48 jonathan Exp $
 #
 # Copyright (c) 1995 Christos Zoulas
 # All rights reserved.
diff --git a/share/samples/emul/svr4/etc/netconfig b/share/samples/emul/svr4/etc/netconfig
index 625c6da68c5d..7b1ab4c571d0 100644
--- a/share/samples/emul/svr4/etc/netconfig
+++ b/share/samples/emul/svr4/etc/netconfig
@@ -1,4 +1,4 @@
-#	$NetBSD: netconfig,v 1.2 1996/04/11 12:59:47 christos Exp $
+#	$NetBSD: netconfig,v 1.3 1997/06/08 23:34:49 jonathan Exp $
 # SVR4 Network configuration file
 #
 # service name	       fl family   proto device         library
diff --git a/share/samples/emul/svr4/etc/nsswitch.conf b/share/samples/emul/svr4/etc/nsswitch.conf
index e79bcfde1da4..a8c69c7c03ef 100644
--- a/share/samples/emul/svr4/etc/nsswitch.conf
+++ b/share/samples/emul/svr4/etc/nsswitch.conf
@@ -1,4 +1,4 @@
-#	$NetBSD: nsswitch.conf,v 1.2 1996/09/01 16:33:07 christos Exp $
+#	$NetBSD: nsswitch.conf,v 1.3 1997/06/08 23:34:49 jonathan Exp $
 # Name service switch file
 #
 hosts:      dns files
diff --git a/share/samples/emul/ultrix/etc/svc.conf b/share/samples/emul/ultrix/etc/svc.conf
index 51b851408e09..161a463e03dc 100644
--- a/share/samples/emul/ultrix/etc/svc.conf
+++ b/share/samples/emul/ultrix/etc/svc.conf
@@ -1,4 +1,4 @@
-# $NetBSD: svc.conf,v 1.1 1997/06/08 09:10:21 jonathan Exp $
+# $NetBSD: svc.conf,v 1.2 1997/06/08 23:34:50 jonathan Exp $
 #
 # Ultrix-compatible svc.conf file.
 # Each line  below binds a particular database to one or more resolver