diff --git a/usr.sbin/mrouted/LICENSE b/gnu/dist/mrouted/LICENSE
similarity index 100%
rename from usr.sbin/mrouted/LICENSE
rename to gnu/dist/mrouted/LICENSE
diff --git a/usr.sbin/mrouted/callout.c b/gnu/dist/mrouted/callout.c
similarity index 98%
rename from usr.sbin/mrouted/callout.c
rename to gnu/dist/mrouted/callout.c
index 3f2b9821c66f..6635e62b95ec 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/gnu/dist/mrouted/callout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: callout.c,v 1.5 2002/07/14 16:30:41 wiz Exp $	*/
+/*	$NetBSD: callout.c,v 1.1 2002/10/01 03:31:05 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/cfparse.y b/gnu/dist/mrouted/cfparse.y
similarity index 99%
rename from usr.sbin/mrouted/cfparse.y
rename to gnu/dist/mrouted/cfparse.y
index 0023ede2ebd5..5785f772c4ed 100644
--- a/usr.sbin/mrouted/cfparse.y
+++ b/gnu/dist/mrouted/cfparse.y
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: cfparse.y,v 1.8 2002/07/14 16:30:42 wiz Exp $	*/
+/*	$NetBSD: cfparse.y,v 1.1 2002/10/01 03:31:06 itojun Exp $	*/
 
 /*
  * Configuration file parser for mrouted.
diff --git a/usr.sbin/mrouted/config.c b/gnu/dist/mrouted/config.c
similarity index 98%
rename from usr.sbin/mrouted/config.c
rename to gnu/dist/mrouted/config.c
index e152358df078..70b8000af7cb 100644
--- a/usr.sbin/mrouted/config.c
+++ b/gnu/dist/mrouted/config.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.c,v 1.9 2002/08/01 23:47:46 itojun Exp $	*/
+/*	$NetBSD: config.c,v 1.1 2002/10/01 03:31:06 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/defs.h b/gnu/dist/mrouted/defs.h
similarity index 99%
rename from usr.sbin/mrouted/defs.h
rename to gnu/dist/mrouted/defs.h
index a595d493211a..9bbe5b8763b5 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/gnu/dist/mrouted/defs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.9 2002/07/14 16:30:42 wiz Exp $	*/
+/*	$NetBSD: defs.h,v 1.1 2002/10/01 03:31:06 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/dvmrp.h b/gnu/dist/mrouted/dvmrp.h
similarity index 99%
rename from usr.sbin/mrouted/dvmrp.h
rename to gnu/dist/mrouted/dvmrp.h
index b4f2bf440bfd..a7e71a9bdc31 100644
--- a/usr.sbin/mrouted/dvmrp.h
+++ b/gnu/dist/mrouted/dvmrp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: dvmrp.h,v 1.5 1995/12/10 10:07:00 mycroft Exp $	*/
+/*	$NetBSD: dvmrp.h,v 1.1 2002/10/01 03:31:07 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/igmp.c b/gnu/dist/mrouted/igmp.c
similarity index 99%
rename from usr.sbin/mrouted/igmp.c
rename to gnu/dist/mrouted/igmp.c
index a06c74f9724a..22bc5698f6ad 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/gnu/dist/mrouted/igmp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: igmp.c,v 1.8 2002/08/01 03:40:34 itojun Exp $	*/
+/*	$NetBSD: igmp.c,v 1.1 2002/10/01 03:31:07 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/inet.c b/gnu/dist/mrouted/inet.c
similarity index 98%
rename from usr.sbin/mrouted/inet.c
rename to gnu/dist/mrouted/inet.c
index 5bede272fc6f..725a30adcd59 100644
--- a/usr.sbin/mrouted/inet.c
+++ b/gnu/dist/mrouted/inet.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inet.c,v 1.7 2002/08/01 08:33:14 itojun Exp $	*/
+/*	$NetBSD: inet.c,v 1.1 2002/10/01 03:31:08 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/kern.c b/gnu/dist/mrouted/kern.c
similarity index 98%
rename from usr.sbin/mrouted/kern.c
rename to gnu/dist/mrouted/kern.c
index 9056d7ee4e8a..b71443902231 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/gnu/dist/mrouted/kern.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.c,v 1.5 2002/07/14 16:30:42 wiz Exp $	*/
+/*	$NetBSD: kern.c,v 1.1 2002/10/01 03:31:08 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/main.c b/gnu/dist/mrouted/main.c
similarity index 99%
rename from usr.sbin/mrouted/main.c
rename to gnu/dist/mrouted/main.c
index f44189f94fb7..69120182365e 100644
--- a/usr.sbin/mrouted/main.c
+++ b/gnu/dist/mrouted/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.16 2002/08/09 02:17:29 itojun Exp $	*/
+/*	$NetBSD: main.c,v 1.1 2002/10/01 03:31:08 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("@(#) $NetBSD: main.c,v 1.16 2002/08/09 02:17:29 itojun Exp $");
+__RCSID("@(#) $NetBSD: main.c,v 1.1 2002/10/01 03:31:08 itojun Exp $");
 #endif
 
 #include <err.h>
diff --git a/usr.sbin/mrouted/mrouted.8 b/gnu/dist/mrouted/mrouted.8
similarity index 99%
rename from usr.sbin/mrouted/mrouted.8
rename to gnu/dist/mrouted/mrouted.8
index 776c6cbf0cc7..35d13383d385 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/gnu/dist/mrouted/mrouted.8
@@ -1,4 +1,4 @@
-'\"	$NetBSD: mrouted.8,v 1.11 2002/02/08 01:38:51 ross Exp $
+'\"	$NetBSD: mrouted.8,v 1.1 2002/10/01 03:31:08 itojun Exp $
 '\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
 .TH MROUTED 8
 .UC 5
diff --git a/usr.sbin/mrouted/pathnames.h b/gnu/dist/mrouted/pathnames.h
similarity index 91%
rename from usr.sbin/mrouted/pathnames.h
rename to gnu/dist/mrouted/pathnames.h
index eed6b309582a..74c49faebee5 100644
--- a/usr.sbin/mrouted/pathnames.h
+++ b/gnu/dist/mrouted/pathnames.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.5 1999/06/06 03:27:35 thorpej Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.1 2002/10/01 03:31:09 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/prune.c b/gnu/dist/mrouted/prune.c
similarity index 99%
rename from usr.sbin/mrouted/prune.c
rename to gnu/dist/mrouted/prune.c
index 854b4b7540d0..9d4c3672810a 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/gnu/dist/mrouted/prune.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prune.c,v 1.9 2002/07/14 16:30:42 wiz Exp $	*/
+/*	$NetBSD: prune.c,v 1.1 2002/10/01 03:31:09 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/prune.h b/gnu/dist/mrouted/prune.h
similarity index 98%
rename from usr.sbin/mrouted/prune.h
rename to gnu/dist/mrouted/prune.h
index 12d57312bf28..9f0ad8b8e95b 100644
--- a/usr.sbin/mrouted/prune.h
+++ b/gnu/dist/mrouted/prune.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: prune.h,v 1.4 1999/01/14 21:54:10 he Exp $	*/
+/*	$NetBSD: prune.h,v 1.1 2002/10/01 03:31:09 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/route.c b/gnu/dist/mrouted/route.c
similarity index 99%
rename from usr.sbin/mrouted/route.c
rename to gnu/dist/mrouted/route.c
index ed20becc37e6..59d3be906f1a 100644
--- a/usr.sbin/mrouted/route.c
+++ b/gnu/dist/mrouted/route.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.7 2002/07/14 16:30:42 wiz Exp $	*/
+/*	$NetBSD: route.c,v 1.1 2002/10/01 03:31:09 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/route.h b/gnu/dist/mrouted/route.h
similarity index 97%
rename from usr.sbin/mrouted/route.h
rename to gnu/dist/mrouted/route.h
index a01a16dac5c3..a81ba2944c1a 100644
--- a/usr.sbin/mrouted/route.h
+++ b/gnu/dist/mrouted/route.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.h,v 1.4 1995/12/10 10:07:13 mycroft Exp $	*/
+/*	$NetBSD: route.h,v 1.1 2002/10/01 03:31:10 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/rsrr.c b/gnu/dist/mrouted/rsrr.c
similarity index 99%
rename from usr.sbin/mrouted/rsrr.c
rename to gnu/dist/mrouted/rsrr.c
index afba70caf948..02df7fa89cce 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/gnu/dist/mrouted/rsrr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsrr.c,v 1.5 2002/07/14 16:30:42 wiz Exp $	*/
+/*	$NetBSD: rsrr.c,v 1.1 2002/10/01 03:31:10 itojun Exp $	*/
 
 /*
  * Copyright (c) 1993 by the University of Southern California
diff --git a/usr.sbin/mrouted/rsrr.h b/gnu/dist/mrouted/rsrr.h
similarity index 98%
rename from usr.sbin/mrouted/rsrr.h
rename to gnu/dist/mrouted/rsrr.h
index bdbf429714c4..d04549d7cbf7 100644
--- a/usr.sbin/mrouted/rsrr.h
+++ b/gnu/dist/mrouted/rsrr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsrr.h,v 1.2 1995/10/09 03:51:57 thorpej Exp $	*/
+/*	$NetBSD: rsrr.h,v 1.1 2002/10/01 03:31:10 itojun Exp $	*/
 
 /*
  * Copyright (c) 1993 by the University of Southern California
diff --git a/usr.sbin/mrouted/rsrr_var.h b/gnu/dist/mrouted/rsrr_var.h
similarity index 96%
rename from usr.sbin/mrouted/rsrr_var.h
rename to gnu/dist/mrouted/rsrr_var.h
index e63efec0ae9b..15cca34ed73c 100644
--- a/usr.sbin/mrouted/rsrr_var.h
+++ b/gnu/dist/mrouted/rsrr_var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsrr_var.h,v 1.1 1995/12/10 10:07:15 mycroft Exp $	*/
+/*	$NetBSD: rsrr_var.h,v 1.1 2002/10/01 03:31:11 itojun Exp $	*/
 
 /*
  * Copyright (c) 1993 by the University of Southern California
diff --git a/usr.sbin/mrouted/snmp.c b/gnu/dist/mrouted/snmp.c
similarity index 99%
rename from usr.sbin/mrouted/snmp.c
rename to gnu/dist/mrouted/snmp.c
index 3396a494c63b..2dba206548f5 100644
--- a/usr.sbin/mrouted/snmp.c
+++ b/gnu/dist/mrouted/snmp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: snmp.c,v 1.7 2002/08/01 03:40:34 itojun Exp $	*/
+/*	$NetBSD: snmp.c,v 1.1 2002/10/01 03:31:11 itojun Exp $	*/
 
 #include "defs.h"
 #include <netinet/in_var.h>
diff --git a/usr.sbin/mrouted/snmp.h b/gnu/dist/mrouted/snmp.h
similarity index 69%
rename from usr.sbin/mrouted/snmp.h
rename to gnu/dist/mrouted/snmp.h
index 6889dfdf1f4e..8cf99e84e656 100644
--- a/usr.sbin/mrouted/snmp.h
+++ b/gnu/dist/mrouted/snmp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: snmp.h,v 1.4 2002/08/01 03:40:34 itojun Exp $	*/
+/*	$NetBSD: snmp.h,v 1.1 2002/10/01 03:31:11 itojun Exp $	*/
 
 extern int portlist[32], sdlen;
 extern in_port_t dest_port;
diff --git a/usr.sbin/mrouted/vif.c b/gnu/dist/mrouted/vif.c
similarity index 99%
rename from usr.sbin/mrouted/vif.c
rename to gnu/dist/mrouted/vif.c
index d4b1766f7767..8f1c9dc7397f 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/gnu/dist/mrouted/vif.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vif.c,v 1.10 2002/07/14 16:30:42 wiz Exp $	*/
+/*	$NetBSD: vif.c,v 1.1 2002/10/01 03:31:12 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/usr.sbin/mrouted/vif.h b/gnu/dist/mrouted/vif.h
similarity index 98%
rename from usr.sbin/mrouted/vif.h
rename to gnu/dist/mrouted/vif.h
index bb3a0f05b06d..80bbc99ccb56 100644
--- a/usr.sbin/mrouted/vif.h
+++ b/gnu/dist/mrouted/vif.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vif.h,v 1.6 1995/12/10 10:07:20 mycroft Exp $	*/
+/*	$NetBSD: vif.h,v 1.1 2002/10/01 03:31:12 itojun Exp $	*/
 
 /*
  * The mrouted program is covered by the license in the accompanying file
diff --git a/gnu/usr.sbin/Makefile b/gnu/usr.sbin/Makefile
index e519649dd614..f9ab527f2667 100644
--- a/gnu/usr.sbin/Makefile
+++ b/gnu/usr.sbin/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 2001/12/15 03:23:39 thorpej Exp $
+#	$NetBSD: Makefile,v 1.6 2002/10/01 03:30:51 itojun Exp $
 
 # XXX Temporary for NO_SENDMAIL
 .include <bsd.own.mk>
 
-SUBDIR=		dbsym mdsetimage postfix
+SUBDIR=		dbsym mdsetimage mrouted postfix
 
 .if !defined(NO_SENDMAIL)
 SUBDIR+=	sendmail
diff --git a/usr.sbin/mrouted/Makefile b/gnu/usr.sbin/mrouted/Makefile
similarity index 67%
rename from usr.sbin/mrouted/Makefile
rename to gnu/usr.sbin/mrouted/Makefile
index 3140964c9e6a..0abe4416e541 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/gnu/usr.sbin/mrouted/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.10 2000/07/04 20:27:38 matt Exp $
+#	$NetBSD: Makefile,v 1.1 2002/10/01 03:31:13 itojun Exp $
 #	from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
 
+.include <bsd.own.mk>
+
 PROG=	mrouted
 SRCS=	callout.c cfparse.y config.c igmp.c inet.c kern.c main.c prune.c \
 	route.c vif.c
@@ -10,4 +12,6 @@ LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
 CPPFLAGS+=-I${.CURDIR}
 
+.PATH:	${NETBSDSRCDIR}/gnu/dist/mrouted
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 507c79f746bd..e2f900d3cac4 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.179 2002/09/17 23:18:28 thorpej Exp $
+#	$NetBSD: Makefile,v 1.180 2002/10/01 03:30:50 itojun Exp $
 #	from: @(#)Makefile	5.20 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -10,7 +10,7 @@ SUBDIR=	ac accton altq amd apm apmd arp bad144 bind bootp catman \
 	grfinfo gspa hilinfo ifwatchd inetd installboot \
 	iopctl iostat ipf irdaattach isdn iteconfig \
 	kgmon kvm_mkdb lastlogin link lpr mailwrapper makefs map-mbone \
-	mdconfig memswitch mlxctl mopd mountd moused mrinfo mrouted mscdlabel \
+	mdconfig memswitch mlxctl mopd mountd moused mrinfo mscdlabel \
 	mtrace mtree ndbootd netgroup_mkdb nfsd ntp pcictl pkg_install pppd \
 	pstat pwd_mkdb quot quotacheck quotaon rarpd rbootd rdate \
 	repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \