diff --git a/src/etc/Makefile b/src/etc/Makefile
index 0e08032f..0fec8b75 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.253 2007/08/01 21:23:25 miod Exp $
+#	$OpenBSD: Makefile,v 1.254 2007/10/08 12:16:35 norby Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -76,6 +76,7 @@ distribution-etc-root-var: distrib-dirs
 	pwd_mkdb -p -d ${DESTDIR}/etc /etc/master.passwd
 	${INSTALL} -c -o root -g wheel -m 600 bgpd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ospfd.conf ${DESTDIR}/etc
+	${INSTALL} -c -o root -g wheel -m 600 ospf6d.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ripd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 dvmrpd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
diff --git a/src/etc/changelist b/src/etc/changelist
index 0e8a3bbb..3da154c5 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.53 2007/09/03 06:18:01 joel Exp $
+#	$OpenBSD: changelist,v 1.54 2007/10/08 12:16:35 norby Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -89,6 +89,7 @@
 /etc/newsyslog.conf
 /etc/ntpd.conf
 /etc/ospfd.conf
+/etc/ospf6d.conf
 /etc/passwd
 /etc/pf.conf
 /etc/pf.os
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index f53f1196..6f1c88d8 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.75 2007/08/02 03:21:59 david Exp $
+#	$OpenBSD: special,v 1.76 2007/10/08 12:16:35 norby Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -65,6 +65,7 @@ moduli		type=file mode=0644 uname=root gname=wheel
 netstart	type=file mode=0644 uname=root gname=wheel
 ntpd.conf	type=file mode=0644 uname=root gname=wheel
 ospfd.conf	type=file mode=0600 uname=root gname=wheel
+ospf6d.conf	type=file mode=0600 uname=root gname=wheel
 passwd		type=file mode=0644 uname=root gname=wheel
 pf.conf		type=file mode=0600 uname=root gname=wheel optional
 printcap	type=file mode=0644 uname=root gname=wheel
diff --git a/src/etc/ospf6d.conf b/src/etc/ospf6d.conf
new file mode 100644
index 00000000..83ae5e0f
--- /dev/null
+++ b/src/etc/ospf6d.conf
@@ -0,0 +1,36 @@
+# $OpenBSD: ospf6d.conf,v 1.1 2007/10/08 12:16:35 norby Exp $
+
+# macros
+password="secret"
+
+# global configuration
+# router-id 10.0.0.1
+# fib-update no
+# stub router no
+# spf-delay 1
+# spf-holdtime 5
+
+# hello-interval 10
+# metric 10
+# retransmit-interval 5
+# router-dead-time 40
+# router-priority 1
+# transmit-delay 1
+
+# rtlabel "DMZ" external-tag 1
+
+# areas
+area 0.0.0.5 {
+	interface em0 {
+		router-dead-time 20
+	}
+
+	interface em1 {
+	}
+}
+
+area 0.0.0.7 {
+	interface em2 {
+		router-priority 5
+	}
+}