diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 68462a1e3a50..72efb012f0f1 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	mosquitto
 DISTVERSION=	2.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Open source MQTT broker
 WWW=		https://mosquitto.org/
 
 LICENSE=	EPL
 
 BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libcjson.so:devel/libcjson \
 		libsqlite3.so:databases/sqlite3 \
 		libuuid.so:misc/libuuid
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		cmake cpe ssl
 USE_RC_SUBR=	mosquitto
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DCJSON_INCLUDE_DIR:PATH="${PREFIX}/include/json" \
 		-DCJSON_LIBRARY:PATH="${PREFIX}/lib/libcjson.so" \
 		-DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata" \
 		-DWITH_TESTS:BOOL=OFF
 CPE_VENDOR=	eclipse
 
 USERS=		nobody
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=		CARES WEBSOCKETS WEBSOCKETS_BUILTIN
 OPTIONS_DEFAULT=	CARES WEBSOCKETS WEBSOCKETS_BUILTIN
 
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 CARES_CMAKE_ON=		-DWITH_SRV:BOOL=ON
 
 WEBSOCKETS_DESC=		$(WEBSOCKET_DESC)
 WEBSOCKETS_CMAKE_OFF=		-DWITH_WEBSOCKETS:BOOL=OFF
 WEBSOCKETS_BUILTIN_CMAKE_OFF=	-DWITH_WEBSOCKETS_BUILTIN:BOOL=OFF
 WEBSOCKETS_BUILTIN_DESC=	Use bundled version of websockets
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWEBSOCKETS} && !${PORT_OPTIONS:MWEBSOCKETS_BUILTIN}
 LIB_DEPENDS+=	libwebsockets.so:net/libwebsockets
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
 		${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/CMakeLists.txt
 
 post-install:
 .for F in mosquitto.conf pwfile pskfile aclfile
 	${MV} ${STAGEDIR}${ETCDIR}/${F}.example \
 		${STAGEDIR}${ETCDIR}/${F}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/mosquitto/pkg-plist b/net/mosquitto/pkg-plist
index b9fabcd12ace..5fe4e76b5b5c 100644
--- a/net/mosquitto/pkg-plist
+++ b/net/mosquitto/pkg-plist
@@ -1,77 +1,77 @@
 bin/mosquitto_ctrl
 bin/mosquitto_db_dump
 bin/mosquitto_passwd
 bin/mosquitto_pub
 bin/mosquitto_rr
 bin/mosquitto_signal
 bin/mosquitto_sub
-%%ETCDIR%%/aclfile.sample
-%%ETCDIR%%/mosquitto.conf.sample
-%%ETCDIR%%/pskfile.sample
-%%ETCDIR%%/pwfile.sample
+@sample %%ETCDIR%%/aclfile.sample
+@sample %%ETCDIR%%/mosquitto.conf.sample
+@sample %%ETCDIR%%/pskfile.sample
+@sample %%ETCDIR%%/pwfile.sample
 include/mosquitto.h
 include/mosquitto/broker.h
 include/mosquitto/broker_control.h
 include/mosquitto/broker_plugin.h
 include/mosquitto/defs.h
 include/mosquitto/libcommon.h
 include/mosquitto/libcommon_base64.h
 include/mosquitto/libcommon_cjson.h
 include/mosquitto/libcommon_file.h
 include/mosquitto/libcommon_memory.h
 include/mosquitto/libcommon_password.h
 include/mosquitto/libcommon_properties.h
 include/mosquitto/libcommon_random.h
 include/mosquitto/libcommon_string.h
 include/mosquitto/libcommon_time.h
 include/mosquitto/libcommon_topic.h
 include/mosquitto/libcommon_utf8.h
 include/mosquitto/libmosquitto.h
 include/mosquitto/libmosquitto_auth.h
 include/mosquitto/libmosquitto_callbacks.h
 include/mosquitto/libmosquitto_connect.h
 include/mosquitto/libmosquitto_create_delete.h
 include/mosquitto/libmosquitto_helpers.h
 include/mosquitto/libmosquitto_loop.h
 include/mosquitto/libmosquitto_message.h
 include/mosquitto/libmosquitto_options.h
 include/mosquitto/libmosquitto_publish.h
 include/mosquitto/libmosquitto_socks.h
 include/mosquitto/libmosquitto_subscribe.h
 include/mosquitto/libmosquitto_tls.h
 include/mosquitto/libmosquitto_unsubscribe.h
 include/mosquitto/libmosquitto_will.h
 include/mosquitto/libmosquittopp.h
 include/mosquitto/mqtt_protocol.h
 include/mosquitto_broker.h
 include/mosquitto_plugin.h
 include/mosquittopp.h
 include/mqtt_protocol.h
 lib/libmosquitto.so
 lib/libmosquitto.so.1
 lib/libmosquitto.so.%%DISTVERSION%%
 lib/libmosquittopp.so
 lib/libmosquittopp.so.1
 lib/libmosquittopp.so.%%DISTVERSION%%
 lib/mosquitto_acl_file.so
 lib/mosquitto_dynamic_security.so
 lib/mosquitto_password_file.so
 lib/mosquitto_persist_sqlite.so
 lib/mosquitto_sparkplug_aware.so
 libdata/pkgconfig/libmosquitto.pc
 libdata/pkgconfig/libmosquittopp.pc
 sbin/mosquitto
 share/man/man1/mosquitto_ctrl.1.gz
 share/man/man1/mosquitto_ctrl_dynsec.1.gz
 share/man/man1/mosquitto_ctrl_shell.1.gz
 share/man/man1/mosquitto_passwd.1.gz
 share/man/man1/mosquitto_pub.1.gz
 share/man/man1/mosquitto_rr.1.gz
 share/man/man1/mosquitto_signal.1.gz
 share/man/man1/mosquitto_sub.1.gz
 share/man/man3/libmosquitto.3.gz
 share/man/man5/mosquitto.conf.5.gz
 share/man/man7/mosquitto-tls.7.gz
 share/man/man7/mosquitto.7.gz
 share/man/man7/mqtt.7.gz
 share/man/man8/mosquitto.8.gz