5 files changed, 20 insertions, 6 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index a07b0691ef5..6754e20ca83 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.50 1999/12/11 10:33:26 itojun Exp $
+#	$OpenBSD: Makefile,v 1.51 1999/12/11 10:41:46 itojun Exp $
 
 # not yet done: catman
 
@@ -17,7 +17,7 @@ SUBDIR=	ac accton adduser amd arp bootpd bootpgw bootpef bootptest \
 	vipw vnconfig zdump zic
 
 # IPv6
-SUBDIR+=ifmcstat ndp rtadvd rtsold
+SUBDIR+=ifmcstat ndp route6d rtadvd rtsold
 
 .if (${AFS} == "yes")
 SUBDIR+=afs
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
new file mode 100644
index 00000000000..d234161ba84
--- /dev/null
+++ b/usr.sbin/route6d/Makefile
@@ -0,0 +1,8 @@
+#	$OpenBSD: Makefile,v 1.1 1999/12/11 10:41:46 itojun Exp $
+
+PROG=	route6d
+MAN=	route6d.8
+
+CPPFLAGS+=	-DADVAPI -DINET6
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 8223c58951a..74437eb41fb 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: route6d.8,v 1.2 1999/12/11 10:41:46 itojun Exp $
+.\"
 .\" Copyright (c) 1996 WIDE Project. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -13,7 +15,7 @@
 .\" A PARTICULAR PURPOSE.
 .Dd January 31, 1997
 .Dt ROUTE6D 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm route6d
 .Nd RIP6 Routing Daemon
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 9f4c4e8c623..98f9653ec31 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,5 +1,7 @@
+/*	$OpenBSD: route6d.c,v 1.2 1999/12/11 10:41:46 itojun Exp $	*/
+
 /*
- * $Header: /cvs/OpenBSD/src/usr.sbin/route6d/route6d.c,v 1.1 1999/12/11 10:36:07 itojun Exp $
+* KAME Header: /cvsroot/kame/kame/kame/kame/route6d/route6d.c,v 1.6 1999/09/10 08:20:59 itojun Exp
  */
 
 /*
@@ -32,7 +34,7 @@
  */
 
 #ifndef	lint
-static char _rcsid[] = "$Id: route6d.c,v 1.1 1999/12/11 10:36:07 itojun Exp $";
+static char _rcsid[] = "KAME Id: route6d.c,v 1.6 1999/09/10 08:20:59 itojun Exp";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/route6d/route6d.h b/usr.sbin/route6d/route6d.h
index 35fcf1e209e..8763f525cf3 100644
--- a/usr.sbin/route6d/route6d.h
+++ b/usr.sbin/route6d/route6d.h
@@ -1,5 +1,7 @@
+/*	$OpenBSD: route6d.h,v 1.2 1999/12/11 10:41:47 itojun Exp $	*/
+
 /*
- * $Header: /cvs/OpenBSD/src/usr.sbin/route6d/route6d.h,v 1.1 1999/12/11 10:36:02 itojun Exp $
+ * KAME Header: /cvsroot/kame/kame/kame/kame/route6d/route6d.h,v 1.1.1.1 1999/08/08 23:31:35 itojun Exp
  */
 
 /*