diff --git a/etc/Makefile b/etc/Makefile
index 8b492ed6456..68b3c15d1c3 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -158,11 +158,6 @@ distribution:
 		${DESTDIR}/etc/services;
 .endif
 
-.if ${MK_BSNMP} != "no"
-	cd ${.CURDIR}; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
-		snmpd.config ${DESTDIR}/etc;
-.endif
 .if ${MK_TCSH} == "no"
 	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index 24d58361099..06fac61f937 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -7,6 +7,8 @@
 CONTRIB=${SRCTOP}/contrib/bsnmp
 .PATH: ${CONTRIB}/snmpd
 
+CONFS=	snmpd.config
+CONFSMODE=	600
 PROG=	bsnmpd
 SRCS=	main.c action.c config.c export.c trap.c trans_udp.c trans_lsock.c
 SRCS+=	oid.h tree.c tree.h
diff --git a/etc/snmpd.config b/usr.sbin/bsnmpd/bsnmpd/snmpd.config
similarity index 100%
rename from etc/snmpd.config
rename to usr.sbin/bsnmpd/bsnmpd/snmpd.config