diff --git a/src/etc/Makefile b/src/etc/Makefile
index 3c5280e8..af62d0a2 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.408 2015/09/12 14:48:06 sthen Exp $
+#	$OpenBSD: Makefile,v 1.409 2015/10/03 18:57:11 renato Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -46,13 +46,13 @@ EXAMPLES+= wsconsctl.conf
 .endif
 
 # -rw-------
-EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \
-	ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf radiusd.conf \
-	rc.local rc.securelevel rc.shutdown relayd.conf ripd.conf \
-	sasyncd.conf snmpd.conf ypldap.conf 
+EXAMPLES_600=bgpd.conf dvmrpd.conf eigrpd.conf hostapd.conf iked.conf \
+	ipsec.conf ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf \
+	radiusd.conf rc.local rc.securelevel rc.shutdown relayd.conf \
+	ripd.conf sasyncd.conf snmpd.conf ypldap.conf 
 
 # -r-xr-xr-x
-RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd \
+RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \
 	ftpproxy ftpproxy6 hostapd hotplugd httpd identd ifstated \
 	iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
 	lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
diff --git a/src/etc/changelist b/src/etc/changelist
index 0a8d9d4c..95c83e2a 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.109 2015/09/27 14:19:26 naddy Exp $
+#	$OpenBSD: changelist,v 1.110 2015/10/03 18:57:11 renato Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -28,6 +28,7 @@
 /etc/distfile
 /etc/doas.conf
 /etc/dvmrpd.conf
+/etc/eigrpd.conf
 /etc/ethers
 /etc/exports
 /etc/fbtab
diff --git a/src/etc/examples/eigrpd.conf b/src/etc/examples/eigrpd.conf
new file mode 100644
index 00000000..91f01013
--- /dev/null
+++ b/src/etc/examples/eigrpd.conf
@@ -0,0 +1,50 @@
+# global configuration
+# router-id 10.0.0.1
+# rdomain 1
+# fib-update yes
+# fib-priority-internal 28
+# fib-priority-external 52
+
+# IPv4
+address-family ipv4 {
+	autonomous-system 1 {
+		maximum-paths 4
+		variance 8
+
+		default-metric 100000 10 255 1 1500
+		redistribute default
+		redistribute connected
+		redistribute 30.0.1.0/24
+
+		interface em1
+		interface em2 {
+			hello-interval 3
+			holdtime 10
+			delay 20
+			bandwidth 1000000
+		}
+		interface em3 {
+			passive
+		}
+	}
+}
+
+# IPv6
+address-family ipv6 {
+	maximum-paths 2
+	variance 3
+	bandwidth 100000
+	delay 10
+
+	autonomous-system 1 {
+		default-metric 100000 10 255 1 1500
+		redistribute default
+
+		interface em1
+		interface em2
+	}
+	autonomous-system 2 {
+		interface em3
+		interface em4
+	}
+}
diff --git a/src/etc/rc b/src/etc/rc
index f7859ee4..d11b8638 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.464 2015/09/29 17:40:56 rpe Exp $
+#	$OpenBSD: rc,v 1.465 2015/10/03 18:57:11 renato Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -455,7 +455,7 @@ echo 'preserving editor files.'; /usr/libexec/vi.recover
 
 echo -n 'starting network daemons:'
 start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
-start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd
+start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd
 
 if ifconfig lo0 inet6 >/dev/null 2>&1; then
 	fw=`sysctl -n net.inet6.ip6.forwarding`
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 24d054c5..b85ab43a 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.205 2015/09/12 14:48:06 sthen Exp $
+#	$OpenBSD: rc.conf,v 1.206 2015/10/03 18:57:11 renato Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -20,6 +20,7 @@ cron_flags=
 dhcpd_flags=NO
 dhcrelay_flags=NO	# for normal use: "-i interface [server]"
 dvmrpd_flags=NO
+eigrpd_flags=NO
 ftpd_flags=NO		# set to NO if ftpd is running out of inetd
 ftpproxy_flags=NO
 ftpproxy6_flags=NO
diff --git a/src/etc/rc.d/eigrpd b/src/etc/rc.d/eigrpd
new file mode 100644
index 00000000..d93acf8e
--- /dev/null
+++ b/src/etc/rc.d/eigrpd
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+daemon="/usr/sbin/eigrpd"
+
+. /etc/rc.d/rc.subr
+
+pexp="eigrpd: parent.*"
+
+rc_cmd $1