diff --git a/sysutils/snmp_exporter/Makefile b/sysutils/snmp_exporter/Makefile
index 1cf9f92e4b37..a2b28e3c1696 100644
--- a/sysutils/snmp_exporter/Makefile
+++ b/sysutils/snmp_exporter/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	snmp_exporter
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.29.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	ivy@FreeBSD.org
 COMMENT=	SNMP Exporter for Prometheus
 WWW=		https://github.com/prometheus/snmp_exporter
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 USES=		go:modules
 USE_RC_SUBR=	snmp_exporter
 
 GO_MODULE=	github.com/prometheus/snmp_exporter
 GO_TARGET=	. \
 		./generator:snmp_exporter_generator
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp_exporter/
-	${INSTALL_DATA} ${FILESDIR}/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml.sample
+	${INSTALL_DATA} ${WRKSRC}/snmp.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/snmp.yml.sample
+	${INSTALL_DATA} ${WRKSRC}/generator/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/snmp_exporter/files/generator.yml b/sysutils/snmp_exporter/files/generator.yml
deleted file mode 100644
index 16c1d71b020a..000000000000
--- a/sysutils/snmp_exporter/files/generator.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-modules:
-  # Default IF-MIB interfaces table with ifIndex.
-  if_mib:
-    walk: [sysUpTime, interfaces, ifXTable]
-  # Interfaces if ifAlias is unique.
-  if_mib_ifalias:
-    walk: [sysUpTime, interfaces, ifXTable]
-    lookups:
-      - old_index: ifIndex
-        new_index: ifAlias
-  # Interfaces if ifDescr is unique.
-  if_mib_ifdescr:
-    walk: [sysUpTime, interfaces, ifXTable]
-    lookups:
-      - old_index: ifIndex
-        new_index: ifDescr
-  # Interfaces if ifName is unique.
-  if_mib_ifname:
-    walk: [sysUpTime, interfaces, ifXTable]
-    lookups:
-      - old_index: ifIndex
-        # Use OID to avoid conflict with Netscaler NS-ROOT-MIB.
-        new_index: 1.3.6.1.2.1.31.1.1.1.1 # ifName
diff --git a/sysutils/snmp_exporter/files/pkg-message.in b/sysutils/snmp_exporter/files/pkg-message.in
index d03707eb6b6e..fd08244f655e 100644
--- a/sysutils/snmp_exporter/files/pkg-message.in
+++ b/sysutils/snmp_exporter/files/pkg-message.in
@@ -1,52 +1,56 @@
 [
 { type: install
   message: <<EOM
-To generate the snmp.yml configuration file for snmp_exporter,
-edit %%ETCDIR%%/generator.yml and add relevant MIBs, then run
+Upstream's default configuration file has been installed as
+%%ETCDIR%%/snmp.yml.
+This configuration is suitable for most situations.
+
+To generate a custom configuration, use the configuration generator:
+edit %%ETCDIR%%/generator.yml as required, then run
 
     snmp_exporter_generator generate
 
 To run snmp_exporter, set the snmp_exporter_enable="YES" rcvar
 and point your prometheus instance at port 9116.
 EOM
 }
 { type: upgrade
   maximum_version: "0.28.0"
   message: <<EOM
 BREAKING CHANGES:
 
 In snmp_exporter 0.28.0 (actually, since 0.23.0 upstream), the configuration
 format for authentication has changed.  The previous configuration will not
 work and must be updated.  Please refer to the upstream documentation on how to
 migrate:
 
     https://github.com/prometheus/snmp_exporter/blob/main/auth-split-migration.md
 
 Alternatively, if you want to continue using your existing configuration,
 install the 'sysutils/snmp_exporter20' port instead, which contains the older
 0.20.0 version.
 
 ---
 
 In snmp_exporter 0.27.0, breaking changes were made affecting the 'synology',
 'ddwrt' and 'kemp_loadmaster' modules.  For migration instructions, see:
 
     https://github.com/prometheus/snmp_exporter/releases/tag/v0.27.0
 
 ---
 
 In snmp_exporter 0.28.0, the sysUpTime metric has been removed from the if_mib
 module.  For migration instructions, see:
 
     https://github.com/prometheus/snmp_exporter/releases/tag/v0.28.0
 
 ---
 
 (FreeBSD-specific) Since 0.28.0, the port no longer patches the generator to
 hardcode ${PREFIX}/etc in the paths used by snmp_exporter_generator.  If you
 were relying on this behaviour, you should update your scripts to specify the
 full pathname.
 
 EOM
 }
 ]
diff --git a/sysutils/snmp_exporter/pkg-plist b/sysutils/snmp_exporter/pkg-plist
index d2d24fcfb01e..b3a851ad1356 100644
--- a/sysutils/snmp_exporter/pkg-plist
+++ b/sysutils/snmp_exporter/pkg-plist
@@ -1,3 +1,4 @@
 bin/snmp_exporter
 bin/snmp_exporter_generator
 @sample %%ETCDIR%%/generator.yml.sample
+@sample %%ETCDIR%%/snmp.yml.sample