diff --git a/src/etc/Makefile b/src/etc/Makefile
index dcaf0ac1..89bcb728 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.358 2014/07/11 16:59:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.359 2014/07/11 17:10:30 henning Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -40,7 +40,7 @@ BIN1=	changelist csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
 	moduli pf.os sensorsd.conf mixerctl.conf
 
-EXAMPLES=chio.conf dvmrpd.conf hostapd.conf ifstated.conf ldpd.conf \
+EXAMPLES=bgpd.conf chio.conf dvmrpd.conf hostapd.conf ifstated.conf ldpd.conf \
 	ospf6d.conf ospfd.conf
 
 .if ${MACHINE} != "aviion" 
@@ -111,7 +111,6 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g crontab -m 600 crontab ${DESTDIR}/var/cron/tabs/root
 	${INSTALL} -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc
 	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 ripd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 relayd.conf ${DESTDIR}/etc
diff --git a/src/etc/changelist b/src/etc/changelist
index 3bf44bc5..b9fc5c90 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.88 2014/07/11 16:59:03 deraadt Exp $
+#	$OpenBSD: changelist,v 1.89 2014/07/11 17:10:30 henning Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -10,7 +10,7 @@
 /etc/Distfile
 /etc/adduser.conf
 /etc/adduser.message
-/etc/bgpd.conf
++/etc/bgpd.conf
 /etc/boot.conf
 /etc/bootparams
 /etc/changelist
diff --git a/src/etc/bgpd.conf b/src/etc/examples/bgpd.conf
similarity index 98%
rename from src/etc/bgpd.conf
rename to src/etc/examples/bgpd.conf
index 3ad21b9b..d5fe6672 100644
--- a/src/etc/bgpd.conf
+++ b/src/etc/examples/bgpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: bgpd.conf,v 1.16 2014/02/15 00:18:07 pelikan Exp $
+# $OpenBSD: bgpd.conf,v 1.1 2014/07/11 17:10:30 henning Exp $
 # sample bgpd configuration file
 # see bgpd.conf(5)