diff --git a/src/etc/bgpd.conf b/src/etc/bgpd.conf
index 9aa37b81..18580dc7 100644
--- a/src/etc/bgpd.conf
+++ b/src/etc/bgpd.conf
@@ -1,10 +1,10 @@
-# $OpenBSD: bgpd.conf,v 1.4 2004/05/05 15:25:04 henning Exp $
+# $OpenBSD: bgpd.conf,v 1.5 2004/05/08 18:43:06 henning Exp $
 # sample bgpd configuration file
 # see bgpd.conf(5)
 
 #macros
-peer1="10.0.0.2"
-peer2="10.0.0.3"
+peer1="10.1.0.2"
+peer2="10.1.0.3"
 
 # global configuration
 AS 65001
@@ -12,7 +12,9 @@ router-id 10.0.0.1
 holdtime 180
 holdtime min 3
 listen on 127.0.0.1
+listen on ::1
 fib-update no
+# route-collector yes
 # log updates
 # network 10.0.1.0/24
 
@@ -25,11 +27,21 @@ group "peering AS65002" {
 		tcp md5sig password mekmitasdigoat
 	}
 	neighbor $peer2 {
-		descr	"AS 65001 peer 2"
+		descr "AS 65001 peer 2"
 		announce all
+		local-address 10.0.0.8
+		ipsec esp ike
 	}
 }
 
+group "peering AS65042" {
+	descr "peering AS 65042"
+	local-address 10.0.0.8
+	ipsec ah ike
+	neighbor 10.2.0.1
+	neighbor 10.2.0.2
+}
+
 neighbor 10.0.1.0 {
 	remote-as	65003
 	descr		upstream
@@ -42,6 +54,17 @@ neighbor 10.0.1.0 {
 	tcp md5sig key	deadbeef
 }
 
+neighbor 10.0.2.0 {
+	remote-as	65004
+	descr		upstream2
+	local-address	10.0.0.8
+	ipsec ah ike
+}
+
+neighbor 10.0.0.0/24 {
+	descr		"template for local peers"
+}
+
 # filter out prefixes longer than 24 or shorter than 8 bits
 deny from any
 allow from any prefixlen 8 - 24