diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 37be21cf92a7..5cd7c0966f6f 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,54 +1,51 @@
 PORTNAME=	mosquitto
-DISTVERSION=	2.0.22
-PORTREVISION=	1
+DISTVERSION=	2.1.1
 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=	-DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata"
+CMAKE_ARGS=	-DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata" \
+		-DWITH_TESTS:BOOL=OFF
 CPE_VENDOR=	eclipse
 
+
 USERS=		nobody
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=		CARES WEBSOCKET
 OPTIONS_DEFAULT=	CARES WEBSOCKET
 
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 CARES_CMAKE_ON=		-DWITH_SRV:BOOL=ON
 
 WEBSOCKET_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 WEBSOCKET_CMAKE_ON=	-DWITH_WEBSOCKETS:BOOL=ON
 
 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:
-	${SED} -e '/cafile/s,/usr/local,${LOCALBASE},' \
-		${STAGEDIR}${ETCDIR}/mosquitto.conf > \
-		${STAGEDIR}${ETCDIR}/mosquitto.conf.sample
-	${MV} ${STAGEDIR}${ETCDIR}/pwfile.example \
-		${STAGEDIR}${ETCDIR}/pwfile.sample
-	${MV} ${STAGEDIR}${ETCDIR}/pskfile.example \
-		${STAGEDIR}${ETCDIR}/pskfile.sample
-	${MV} ${STAGEDIR}${ETCDIR}/aclfile.example \
-		${STAGEDIR}${ETCDIR}/aclfile.sample
+.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/distinfo b/net/mosquitto/distinfo
index 8935947337eb..75da6f5c211a 100644
--- a/net/mosquitto/distinfo
+++ b/net/mosquitto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1753476242
-SHA256 (mosquitto-2.0.22.tar.gz) = 2f752589ef7db40260b633fbdb536e9a04b446a315138d64a7ff3c14e2de6b68
-SIZE (mosquitto-2.0.22.tar.gz) = 805967
+TIMESTAMP = 1770314454
+SHA256 (mosquitto-2.1.1.tar.gz) = d93026a8f8255a32fe146ca77df5e26259b7947745370a3944a68ddb4ec663ff
+SIZE (mosquitto-2.1.1.tar.gz) = 2879424
diff --git a/net/mosquitto/files/patch-CMakeLists.txt b/net/mosquitto/files/patch-CMakeLists.txt
index f9d012481893..d1603e3d9e6e 100644
--- a/net/mosquitto/files/patch-CMakeLists.txt
+++ b/net/mosquitto/files/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
---- CMakeLists.txt.orig	2025-07-11 21:32:27 UTC
+--- CMakeLists.txt.orig	2026-02-04 22:33:13 UTC
 +++ CMakeLists.txt
-@@ -13,6 +13,9 @@ add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
+@@ -23,6 +23,9 @@ add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
  
  add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
  
 +include_directories("/usr/local/include")
 +link_directories("/usr/local/lib")
 +
- if (WIN32)
+ if(WIN32)
  	add_definitions("-D_CRT_SECURE_NO_WARNINGS")
  	add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE")
diff --git a/net/mosquitto/files/patch-config.mk b/net/mosquitto/files/patch-config.mk
index 770ab63d9ce1..0fac599b178b 100644
--- a/net/mosquitto/files/patch-config.mk
+++ b/net/mosquitto/files/patch-config.mk
@@ -1,11 +1,11 @@
---- config.mk.orig	2025-07-11 21:32:27 UTC
+--- config.mk.orig	2026-02-04 22:33:13 UTC
 +++ config.mk
-@@ -347,7 +347,7 @@ INSTALL?=install
- endif
+@@ -180,7 +180,7 @@ INSTALL?=install
+ ARCH:=$(shell uname -p)
  
  INSTALL?=install
 -prefix?=/usr/local
 +prefix?=${PREFIX}
  incdir?=${prefix}/include
  libdir?=${prefix}/lib${LIB_SUFFIX}
  localedir?=${prefix}/share/locale
diff --git a/net/mosquitto/files/patch-mosquitto.conf b/net/mosquitto/files/patch-mosquitto.conf
index 2bf7472095b9..eea89a5b2883 100644
--- a/net/mosquitto/files/patch-mosquitto.conf
+++ b/net/mosquitto/files/patch-mosquitto.conf
@@ -1,20 +1,20 @@
---- mosquitto.conf.orig	2025-07-11 21:32:27 UTC
+--- mosquitto.conf.orig	2026-02-04 22:33:13 UTC
 +++ mosquitto.conf
-@@ -167,7 +167,7 @@
+@@ -186,7 +186,7 @@
  # This should be set to /var/run/mosquitto/mosquitto.pid if mosquitto is
  # being run automatically on boot with an init script and
  # start-stop-daemon or similar.
 -#pid_file
 +pid_file /var/run/mosquitto.pid
  
  # Set to true to queue messages with QoS 0 when a persistent client is
  # disconnected. These messages are included in the limit imposed by
-@@ -206,7 +206,7 @@
+@@ -225,7 +225,7 @@
  # If run as a non-root user, this setting has no effect.
  # Note that on Windows this has no effect and so mosquitto should be started by
  # the user you wish it to run as.
 -#user mosquitto
 +user nobody
  
  # =================================================================
  # Listeners
diff --git a/net/mosquitto/files/patch-src_CMakeLists.txt b/net/mosquitto/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 8f024918eedc..000000000000
--- a/net/mosquitto/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/CMakeLists.txt.orig	2025-07-11 21:32:27 UTC
-+++ src/CMakeLists.txt
-@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS)
- 
- if (WITH_WEBSOCKETS)
- 	if (STATIC_WEBSOCKETS)
--		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
- 		if (WIN32)
- 			set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi)
- 			link_directories(${mosquitto_SOURCE_DIR})