diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index dbb27b65a4b0..00684b875f2e 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.158 2005/08/23 12:14:00 peter Exp $
+# $NetBSD: mi,v 1.159 2005/08/30 10:58:33 tron Exp $
 ./.cshrc					etc-util-etc
 ./.profile					etc-util-etc
 ./dev/MAKEDEV					etc-sys-etc
@@ -67,10 +67,11 @@
 ./etc/mtree/NetBSD.dist				etc-sys-etc
 ./etc/mtree/set.etc				etc-sys-etc
 ./etc/mtree/special				etc-sys-etc
+./etc/named.conf				etc-bind-etc
 ./etc/namedb/127				etc-bind-etc
 ./etc/namedb/localhost				etc-bind-etc
 ./etc/namedb/loopback.v6			etc-bind-etc
-./etc/namedb/named.conf				etc-bind-etc
+./etc/namedb/named.conf				etc-obsolete		obsolete
 ./etc/namedb/root.cache				etc-bind-etc
 ./etc/netconfig					etc-net-etc
 ./etc/networks					etc-net-etc
diff --git a/etc/Makefile b/etc/Makefile
index d4f5eba60410..8ec503cba22c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.313 2005/05/22 14:34:20 lukem Exp $
+#	$NetBSD: Makefile,v 1.314 2005/08/30 10:58:33 tron Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -91,7 +91,7 @@ UTMPGRP= utmp
 BIN1+=	bootptab changelist csh.cshrc csh.login csh.logout daily \
 	daily.conf dm.conf floppytab ftpchroot ftpusers \
 	gettytab group hosts hosts.lpd inetd.conf lkm.conf locate.conf \
-	mailer.conf man.conf monthly monthly.conf mrouted.conf \
+	mailer.conf man.conf monthly monthly.conf mrouted.conf named.conf \
 	netconfig networks newsyslog.conf nsswitch.conf ntp.conf \
 	passwd.conf phones printcap profile protocols \
 	rbootd.conf rc rc.conf rc.lkm rc.local rc.subr rc.shutdown remote rpc \
diff --git a/etc/namedb/named.conf b/etc/named.conf
similarity index 94%
rename from etc/namedb/named.conf
rename to etc/named.conf
index 33d75cf283fe..dc3ccefd20a4 100644
--- a/etc/namedb/named.conf
+++ b/etc/named.conf
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.8 2002/02/26 08:48:35 itojun Exp $
+# $NetBSD: named.conf,v 1.1 2005/08/30 10:58:33 tron Exp $
 
 # boot file for secondary name server
 # Note that there should be one primary entry for each SOA record.
diff --git a/etc/namedb/Makefile b/etc/namedb/Makefile
index 2cf946ba2ddd..14c4ffeff94a 100644
--- a/etc/namedb/Makefile
+++ b/etc/namedb/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2004/05/16 09:53:09 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2005/08/30 10:58:33 tron Exp $
 
-CONFIGFILES=	127 root.cache named.conf localhost loopback.v6
+CONFIGFILES=	127 root.cache localhost loopback.v6
 FILESDIR=	/etc/namedb
 FILESMODE=	644