diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index aac554b3bc74..d4c48a879303 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -1,141 +1,142 @@
 # $FreeBSD$
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
 .include <src.opts.mk>
 
 CONTRIB= ${SRCTOP}/contrib/bsnmp/lib
 .PATH: ${CONTRIB}
 
 LIB=	bsnmp
 SHLIB_MAJOR=	6
 LD_FATAL_WARNINGS=	no
 
 CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
 
 CFLAGS+= -DBOGUS_CVE_2019_5610_FIX
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+= -DHAVE_LIBCRYPTO
 LIBADD=	crypto
 .endif
 
 SRCS=	asn1.c snmp.c snmpagent.c snmpclient.c snmpcrypto.c support.c
 SRCS+=	snmptc.h
 INCS=	asn1.h snmp.h snmpagent.h snmpclient.h
 MAN=	asn1.3 bsnmpagent.3 bsnmpclient.3 bsnmplib.3
 
 .if ${MK_DIRDEPS_BUILD} == "yes"
 GENSNMPTREE?= ${HOST_OBJTOP}/usr.sbin/bsnmpd/gensnmptree/gensnmptree
 .endif
 GENSNMPTREE?= gensnmptree
 
 snmptc.h : tc.def
 	(\
 	echo "/* autogenerated from tc.def */";\
 	echo "#ifndef snmptc_h_1529923773";\
 	echo "#define snmptc_h_1529923773";\
 	${GENSNMPTREE} -E -f <${.ALLSRC};\
 	echo "#endif" ; \
 	) >${.TARGET}
 
 CLEANFILES+= snmptc.h
 
 MLINKS+=	asn1.3	asn_append_oid.3
 MLINKS+=	asn1.3	asn_commit_header.3
 MLINKS+=	asn1.3	asn_compare_oid.3
 MLINKS+=	asn1.3	asn_get_counter64_raw.3
 MLINKS+=	asn1.3	asn_get_header.3
 MLINKS+=	asn1.3	asn_get_integer.3
 MLINKS+=	asn1.3	asn_get_integer_raw.3
 MLINKS+=	asn1.3	asn_get_ipaddress.3
 MLINKS+=	asn1.3	asn_get_ipaddress_raw.3
 MLINKS+=	asn1.3	asn_get_null.3
 MLINKS+=	asn1.3	asn_get_null_raw.3
 MLINKS+=	asn1.3	asn_get_objid.3
 MLINKS+=	asn1.3	asn_get_objid_raw.3
 MLINKS+=	asn1.3	asn_get_octetstring.3
 MLINKS+=	asn1.3	asn_get_octetstring_raw.3
 MLINKS+=	asn1.3	asn_get_sequence.3
 MLINKS+=	asn1.3	asn_get_timeticks.3
 MLINKS+=	asn1.3	asn_get_uint32_raw.3
 MLINKS+=	asn1.3	asn_is_suboid.3
 MLINKS+=	asn1.3	asn_oid2str.3
 MLINKS+=	asn1.3	asn_oid2str_r.3
 MLINKS+=	asn1.3	asn_put_counter64.3
 MLINKS+=	asn1.3	asn_put_exception.3
 MLINKS+=	asn1.3	asn_put_header.3
 MLINKS+=	asn1.3	asn_put_integer.3
 MLINKS+=	asn1.3	asn_put_ipaddress.3
 MLINKS+=	asn1.3	asn_put_null.3
 MLINKS+=	asn1.3	asn_put_objid.3
 MLINKS+=	asn1.3	asn_put_octetstring.3
 MLINKS+=	asn1.3	asn_put_temp_header.3
 MLINKS+=	asn1.3	asn_put_timeticks.3
 MLINKS+=	asn1.3	asn_put_uint32.3
 MLINKS+=	asn1.3	asn_skip.3
 MLINKS+=	asn1.3	asn_slice_oid.3
 
 MLINKS+=	bsnmpagent.3	snmp_debug.3
 MLINKS+=	bsnmpagent.3	snmp_dep_commit.3
 MLINKS+=	bsnmpagent.3	snmp_dep_finish.3
 MLINKS+=	bsnmpagent.3	snmp_dep_lookup.3
 MLINKS+=	bsnmpagent.3	snmp_dep_rollback.3
 MLINKS+=	bsnmpagent.3	snmp_depop_t.3
 MLINKS+=	bsnmpagent.3	snmp_get.3
 MLINKS+=	bsnmpagent.3	snmp_getbulk.3
 MLINKS+=	bsnmpagent.3	snmp_getnext.3
 MLINKS+=	bsnmpagent.3	snmp_init_context.3
 MLINKS+=	bsnmpagent.3	snmp_make_errresp.3
 MLINKS+=	bsnmpagent.3	snmp_op_t.3
 MLINKS+=	bsnmpagent.3	snmp_set.3
 MLINKS+=	bsnmpagent.3	snmp_trace.3
 MLINKS+=	bsnmpagent.3	tree_size.3
 
 MLINKS+=	bsnmpclient.3	snmp_add_binding.3
 MLINKS+=	bsnmpclient.3	snmp_client.3
 MLINKS+=	bsnmpclient.3	snmp_client_init.3
 MLINKS+=	bsnmpclient.3	snmp_client_set_host.3
 MLINKS+=	bsnmpclient.3	snmp_client_set_port.3
 MLINKS+=	bsnmpclient.3	snmp_close.3
 MLINKS+=	bsnmpclient.3	snmp_dialog.3
 MLINKS+=	bsnmpclient.3	snmp_discover_engine.3
 MLINKS+=	bsnmpclient.3	snmp_oid_append.3
 MLINKS+=	bsnmpclient.3	snmp_open.3
 MLINKS+=	bsnmpclient.3	snmp_parse_server.3
 MLINKS+=	bsnmpclient.3	snmp_pdu_check.3
 MLINKS+=	bsnmpclient.3	snmp_pdu_create.3
 MLINKS+=	bsnmpclient.3	snmp_pdu_send.3
 MLINKS+=	bsnmpclient.3	snmp_receive.3
 MLINKS+=	bsnmpclient.3	snmp_send_cb_f.3
 MLINKS+=	bsnmpclient.3	snmp_table_cb_f.3
 MLINKS+=	bsnmpclient.3	snmp_table_fetch.3
 MLINKS+=	bsnmpclient.3	snmp_table_fetch_async.3
 MLINKS+=	bsnmpclient.3	snmp_timeout_cb_f.3
 MLINKS+=	bsnmpclient.3	snmp_timeout_start_f.3
 MLINKS+=	bsnmpclient.3	snmp_timeout_stop_f.3
 
 MLINKS+=	bsnmplib.3	TRUTH_GET.3
 MLINKS+=	bsnmplib.3	TRUTH_MK.3
 MLINKS+=	bsnmplib.3	TRUTH_OK.3
 MLINKS+=	bsnmplib.3	snmp_calc_keychange.3
 MLINKS+=	bsnmplib.3	snmp_get_local_keys.3
 MLINKS+=	bsnmplib.3	snmp_passwd_to_keys.3
 MLINKS+=	bsnmplib.3	snmp_pdu_decode.3
 MLINKS+=	bsnmplib.3	snmp_pdu_decode_header.3
 MLINKS+=	bsnmplib.3	snmp_pdu_decode_scoped.3
 MLINKS+=	bsnmplib.3	snmp_pdu_decode_secmode.3
 MLINKS+=	bsnmplib.3	snmp_pdu_dump.3
 MLINKS+=	bsnmplib.3	snmp_pdu_encode.3
 MLINKS+=	bsnmplib.3	snmp_pdu_free.3
 MLINKS+=	bsnmplib.3	snmp_pdu_init_secparams.3
 MLINKS+=	bsnmplib.3	snmp_value_copy.3
 MLINKS+=	bsnmplib.3	snmp_value_free.3
 MLINKS+=	bsnmplib.3	snmp_value_parse.3
 
 FILESGROUPS+=	DEFS
 DEFS=	tc.def
 DEFSDIR?=	${SHAREDIR}/snmp/defs
+DEFSPACKAGE=	bsnmp
 
 .include <bsd.lib.mk>
diff --git a/share/mk/bsd.snmpmod.mk b/share/mk/bsd.snmpmod.mk
index 6ecbbcf09bf7..7956b89382b5 100644
--- a/share/mk/bsd.snmpmod.mk
+++ b/share/mk/bsd.snmpmod.mk
@@ -1,49 +1,52 @@
 # $FreeBSD$
 
 INCSDIR=	${INCLUDEDIR}/bsnmp
 
 SHLIB_NAME=	snmp_${MOD}.so.${SHLIB_MAJOR}
 SRCS+=		${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h
 CLEANFILES+=	${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h
 CFLAGS+=	-I.
 GENSNMPTREEFLAGS+=	-I${SHAREDIR}/snmpdefs
 
 
 ${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} ${EXTRAMIBSYMS}
 	cat ${.ALLSRC} | gensnmptree ${GENSNMPTREEFLAGS} -e ${XSYM} > ${.TARGET}
 
 # Multi-output targets both expect a .meta file and will fight over it. Only
 # allow it on the .c file instead.
 ${MOD}_tree.h: ${MOD}_tree.c .NOMETA
 # Force rebuild the .c file if any of its other outputs are missing.
 .if !exists(${MOD}_tree.h)
 ${MOD}_tree.c: .PHONY .META
 .endif
 ${MOD}_tree.c: ${MOD}_tree.def ${EXTRAMIBDEFS}
 	cat ${.ALLSRC} | gensnmptree -f ${GENSNMPTREEFLAGS} -p ${MOD}_
 
 .if defined(DEFS)
 FILESGROUPS+=	DEFS
 DEFSDIR?=	${SHAREDIR}/snmp/defs
 .endif
 
 .if defined(BMIBS)
 FILESGROUPS+=	BMIBS
 BMIBSDIR?=	${SHAREDIR}/snmp/mibs
 .endif
 
+DEFSPACKAGE=	bsnmp
+BMIBSPACKAGE=	bsnmp
+
 .if !target(smilint) && !empty(BMIBS)
 LOCALBASE?=	/usr/local
 
 SMILINT?=	${LOCALBASE}/bin/smilint
 
 SMIPATH?=	${BMIBSDIR}:${LOCALBASE}/share/snmp/mibs
 
 SMILINT_FLAGS?=	-c /dev/null -l6 -i group-membership
 
 smilint: ${BMIBS}
 	SMIPATH=${SMIPATH} ${SMILINT} ${SMILINT_FLAGS} ${.ALLSRC}
 .endif
 smilint: .PHONY
 
 .include <bsd.lib.mk>
diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile
index 8bee4c85624e..e4cc1d1d6fb0 100644
--- a/share/snmp/mibs/Makefile
+++ b/share/snmp/mibs/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	bsnmp
+
 FILES=	FREEBSD-MIB.txt
 FILESDIR=	${SHAREDIR}/snmp/mibs
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index 8555eaee67b8..05d617279ff0 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -1,155 +1,158 @@
 # $FreeBSD$
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
 .include <src.opts.mk>
 
 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+=	trans_inet.c oid.h tree.c tree.h
 XSYM=	snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \
 	sysUpTime snmpTrapOID coldStart authenticationFailure \
 	begemotSnmpdTransUdp begemotSnmpdTransLsock begemotSnmpdLocalPortTable \
 	freeBSD freeBSDVersion begemotSnmpdTransInet
 CLEANFILES= oid.h tree.c tree.h
 
 MAN=	bsnmpd.1 snmpmod.3
 
 MLINKS+=	snmpmod.3 FIND_OBJECT_INT.3
 MLINKS+=	snmpmod.3 FIND_OBJECT_INT_LINK.3
 MLINKS+=	snmpmod.3 FIND_OBJECT_INT_LINK_INDEX.3
 MLINKS+=	snmpmod.3 FIND_OBJECT_OID.3
 MLINKS+=	snmpmod.3 FIND_OBJECT_OID_LINK.3
 MLINKS+=	snmpmod.3 FIND_OBJECT_OID_LINK_INDEX.3
 MLINKS+=	snmpmod.3 INSERT_OBJECT_INT.3
 MLINKS+=	snmpmod.3 INSERT_OBJECT_INT_LINK.3
 MLINKS+=	snmpmod.3 INSERT_OBJECT_INT_LINK_INDEX.3
 MLINKS+=	snmpmod.3 INSERT_OBJECT_OID.3
 MLINKS+=	snmpmod.3 INSERT_OBJECT_OID_LINK.3
 MLINKS+=	snmpmod.3 INSERT_OBJECT_OID_LINK_INDEX.3
 MLINKS+=	snmpmod.3 NEXT_OBJECT_INT.3
 MLINKS+=	snmpmod.3 NEXT_OBJECT_INT_LINK.3
 MLINKS+=	snmpmod.3 NEXT_OBJECT_INT_LINK_INDEX.3
 MLINKS+=	snmpmod.3 NEXT_OBJECT_OID.3
 MLINKS+=	snmpmod.3 NEXT_OBJECT_OID_LINK.3
 MLINKS+=	snmpmod.3 NEXT_OBJECT_OID_LINK_INDEX.3
 MLINKS+=	snmpmod.3 bsnmpd_get_target_stats.3
 MLINKS+=	snmpmod.3 bsnmpd_get_usm_stats.3
 MLINKS+=	snmpmod.3 bsnmpd_reset_usm_stats.3
 MLINKS+=	snmpmod.3 buf_alloc.3
 MLINKS+=	snmpmod.3 buf_size.3
 MLINKS+=	snmpmod.3 comm_define.3
 MLINKS+=	snmpmod.3 community.3
 MLINKS+=	snmpmod.3 fd_deselect.3
 MLINKS+=	snmpmod.3 fd_resume.3
 MLINKS+=	snmpmod.3 fd_select.3
 MLINKS+=	snmpmod.3 fd_suspend.3
 MLINKS+=	snmpmod.3 get_ticks.3
 MLINKS+=	snmpmod.3 index_append.3
 MLINKS+=	snmpmod.3 index_append_off.3
 MLINKS+=	snmpmod.3 index_compare.3
 MLINKS+=	snmpmod.3 index_compare_off.3
 MLINKS+=	snmpmod.3 index_decode.3
 MLINKS+=	snmpmod.3 ip_commit.3
 MLINKS+=	snmpmod.3 ip_get.3
 MLINKS+=	snmpmod.3 ip_rollback.3
 MLINKS+=	snmpmod.3 ip_save.3
 MLINKS+=	snmpmod.3 or_register.3
 MLINKS+=	snmpmod.3 or_unregister.3
 MLINKS+=	snmpmod.3 oid_commit.3
 MLINKS+=	snmpmod.3 oid_get.3
 MLINKS+=	snmpmod.3 oid_rollback.3
 MLINKS+=	snmpmod.3 oid_save.3
 MLINKS+=	snmpmod.3 oid_usmNotInTimeWindows.3
 MLINKS+=	snmpmod.3 oid_usmUnknownEngineIDs.3
 MLINKS+=	snmpmod.3 oid_zeroDotZero.3
 MLINKS+=	snmpmod.3 reqid_allocate.3
 MLINKS+=	snmpmod.3 reqid_base.3
 MLINKS+=	snmpmod.3 reqid_istype.3
 MLINKS+=	snmpmod.3 reqid_next.3
 MLINKS+=	snmpmod.3 reqid_type.3
 MLINKS+=	snmpmod.3 snmp_input_finish.3
 MLINKS+=	snmpmod.3 snmp_input_start.3
 MLINKS+=	snmpmod.3 snmp_output.3
 MLINKS+=	snmpmod.3 snmp_pdu_auth_access.3
 MLINKS+=	snmpmod.3 snmp_send_port.3
 MLINKS+=	snmpmod.3 snmp_send_trap.3
 MLINKS+=	snmpmod.3 snmpd_target_stat.3
 MLINKS+=	snmpmod.3 snmpd_usmstats.3
 MLINKS+=	snmpmod.3 start_tick.3
 MLINKS+=	snmpmod.3 string_commit.3
 MLINKS+=	snmpmod.3 string_free.3
 MLINKS+=	snmpmod.3 string_get.3
 MLINKS+=	snmpmod.3 string_get_max.3
 MLINKS+=	snmpmod.3 string_rollback.3
 MLINKS+=	snmpmod.3 string_save.3
 MLINKS+=	snmpmod.3 systemg.3
 MLINKS+=	snmpmod.3 this_tick.3
 MLINKS+=	snmpmod.3 timer_start.3
 MLINKS+=	snmpmod.3 timer_start_repeat.3
 MLINKS+=	snmpmod.3 timer_stop.3
 MLINKS+=	snmpmod.3 target_activate_address.3
 MLINKS+=	snmpmod.3 target_address.3
 MLINKS+=	snmpmod.3 target_delete_address.3
 MLINKS+=	snmpmod.3 target_delete_notify.3
 MLINKS+=	snmpmod.3 target_delete_param.3
 MLINKS+=	snmpmod.3 target_first_address.3
 MLINKS+=	snmpmod.3 target_first_notify.3
 MLINKS+=	snmpmod.3 target_first_param.3
 MLINKS+=	snmpmod.3 target_flush_all.3
 MLINKS+=	snmpmod.3 target_next_address.3
 MLINKS+=	snmpmod.3 target_next_notify.3
 MLINKS+=	snmpmod.3 target_next_param.3
 MLINKS+=	snmpmod.3 target_new_address.3
 MLINKS+=	snmpmod.3 target_new_notify.3
 MLINKS+=	snmpmod.3 target_new_param.3
 MLINKS+=	snmpmod.3 target_notify.3
 MLINKS+=	snmpmod.3 target_param.3
 MLINKS+=	snmpmod.3 usm_delete_user.3
 MLINKS+=	snmpmod.3 usm_find_user.3
 MLINKS+=	snmpmod.3 usm_first_user.3
 MLINKS+=	snmpmod.3 usm_flush_users.3
 MLINKS+=	snmpmod.3 usm_next_user.3
 MLINKS+=	snmpmod.3 usm_new_user.3
 MLINKS+=	snmpmod.3 usm_user.3
 
 FILESGROUPS= BMIBS DEFS
 
+DEFSPACKAGE=	bsnmp
+BMIBSPACKAGE=	bsnmp
+
 BMIBS=	FOKUS-MIB.txt BEGEMOT-MIB.txt BEGEMOT-SNMPD.txt
 BMIBSDIR= ${SHAREDIR}/snmp/mibs
 DEFS=	tree.def
 DEFSDIR= ${SHAREDIR}/snmp/defs
 
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
 LIBADD=	begemot bsnmp
 
 LDFLAGS= -Wl,-export-dynamic
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+= -DHAVE_LIBCRYPTO
 .endif
 
 .if ${MK_TCP_WRAPPERS} != "no"
 CFLAGS+=	-DUSE_TCPWRAPPERS
 LIBADD+=	wrap
 .endif
 
 oid.h: tree.def Makefile
 	gensnmptree -I${CONTRIB}/lib -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}
 
 .ORDER: tree.c tree.h
 tree.h: .NOMETA
 tree.c tree.h: tree.def
 	gensnmptree -I${CONTRIB}/lib -l -f < ${.ALLSRC}
 
 MANFILTER=	sed -e 's%@MODPATH@%${LIBDIR}/%g'		\
 		    -e 's%@DEFPATH@%${DEFSDIR}/%g'		\
 		    -e 's%@MIBSPATH@%${BMIBSDIR}/%g'
 
 .include <bsd.prog.mk>