diff --git a/Makefile.inc1 b/Makefile.inc1
index 90719e0da6de..1dc55e1b59db 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -258,7 +258,7 @@ _worldtmp:
 .for _dir in \
     lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
     usr/libexec usr/sbin usr/share/misc \
-    usr/share/bsnmp/defs usr/share/bsnmp/mibs
+    usr/share/snmp/defs usr/share/snmp/mibs
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 018735183294..0e54ed7b6d1f 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -44,12 +44,6 @@
     sbin
     ..
     share
-        bsnmp
-            defs
-            ..
-            mibs
-            ..
-        ..
         calendar
             de_DE.ISO8859-1
             ..
@@ -1130,6 +1124,12 @@
         ..
         skel
         ..
+        snmp
+            defs
+            ..
+            mibs
+            ..
+        ..
         syscons
             fonts
             ..
diff --git a/lib/libbsnmp/modules/Makefile.inc b/lib/libbsnmp/modules/Makefile.inc
index 2aa608e65302..e9203cd6f009 100644
--- a/lib/libbsnmp/modules/Makefile.inc
+++ b/lib/libbsnmp/modules/Makefile.inc
@@ -14,12 +14,12 @@ ${MOD}_tree.c ${MOD}_tree.h: ${MOD}_tree.def
 
 .if defined(DEFS)
 FILESGROUPS+=	DEFS
-DEFSDIR=	${SHAREDIR}/bsnmp/defs
 .endif
+DEFSDIR=	${SHAREDIR}/snmp/defs
 
 .if defined(BMIBS)
 FILESGROUPS+=	BMIBS
-BMIBSDIR=	${SHAREDIR}/bsnmp/mibs
 .endif
+BMIBSDIR=	${SHAREDIR}/snmp/mibs
 
 .include "../Makefile.inc"
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 12f450f14427..cce8709fa8e3 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -181,6 +181,8 @@ standard C include files
 .Bl -tag -width "kerberos5/" -compact
 .It Pa arpa/
 C include files for Internet service protocols
+.It Pa bsnmp/
+C include files for the SNMP daemon
 .It Pa cam/
 C include files for the Common Access Methods Layer
 .Bl -tag -width "kerberos5/" -compact
@@ -538,6 +540,15 @@ data files for security policies such as
 configuration files
 .It Pa skel/
 example . (dot) files for new accounts
+.It Pa snmp/
+MIBs, example files and tree definitions for the SNMP daemon.
+.Bl -tag -width Fl -compact
+.It Pa defs/
+Tree definition files for use with
+.Xr gensnmptree 1
+.It Pa mibs/
+MIB files
+.El
 .It Pa syscons/
 files used by syscons;
 see
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index 2aa608e65302..e9203cd6f009 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -14,12 +14,12 @@ ${MOD}_tree.c ${MOD}_tree.h: ${MOD}_tree.def
 
 .if defined(DEFS)
 FILESGROUPS+=	DEFS
-DEFSDIR=	${SHAREDIR}/bsnmp/defs
 .endif
+DEFSDIR=	${SHAREDIR}/snmp/defs
 
 .if defined(BMIBS)
 FILESGROUPS+=	BMIBS
-BMIBSDIR=	${SHAREDIR}/bsnmp/mibs
 .endif
+BMIBSDIR=	${SHAREDIR}/snmp/mibs
 
 .include "../Makefile.inc"