diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 9abc01449936..a18c3b430cca 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	mosquitto
-DISTVERSION=	2.1.1
-PORTREVISION=	2
+DISTVERSION=	2.1.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=	-DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata" \
+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
-WEBSOCKETS_BUILTIN_LIB_DEPENDS_OFF=	libwebsockets.so:net/libwebsockets
+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}
-BROKEN=		building without WEBSOCKETS_BUILTIN fails
+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/distinfo b/net/mosquitto/distinfo
index 75da6f5c211a..1d9c9d04683e 100644
--- a/net/mosquitto/distinfo
+++ b/net/mosquitto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770314454
-SHA256 (mosquitto-2.1.1.tar.gz) = d93026a8f8255a32fe146ca77df5e26259b7947745370a3944a68ddb4ec663ff
-SIZE (mosquitto-2.1.1.tar.gz) = 2879424
+TIMESTAMP = 1770849685
+SHA256 (mosquitto-2.1.2.tar.gz) = fd905380691ac65ea5a93779e8214941829e3d6e038d5edff9eac5fd74cbed02
+SIZE (mosquitto-2.1.2.tar.gz) = 2882727
diff --git a/net/mosquitto/files/patch-apps_mosquitto__ctrl_ctrl__shell.c b/net/mosquitto/files/patch-apps_mosquitto__ctrl_ctrl__shell.c
deleted file mode 100644
index f041f1d4db3e..000000000000
--- a/net/mosquitto/files/patch-apps_mosquitto__ctrl_ctrl__shell.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- apps/mosquitto_ctrl/ctrl_shell.c.orig	2026-02-05 18:26:53 UTC
-+++ apps/mosquitto_ctrl/ctrl_shell.c
-@@ -19,6 +19,7 @@ Contributors:
- #include <config.h>
- 
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/net/mosquitto/files/patch-lib_connect.c b/net/mosquitto/files/patch-lib_connect.c
deleted file mode 100644
index 9830f16aa418..000000000000
--- a/net/mosquitto/files/patch-lib_connect.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/connect.c.orig	2026-02-04 22:33:13 UTC
-+++ lib/connect.c
-@@ -26,6 +26,7 @@ Contributors:
- #else
- #  include <arpa/inet.h>
- #endif
-+#include <netinet/in.h>
- 
- #include "callbacks.h"
- #include "http_client.h"
diff --git a/net/mosquitto/files/patch-lib_mosquitto__internal.h b/net/mosquitto/files/patch-lib_mosquitto__internal.h
deleted file mode 100644
index 88ec7d34dd68..000000000000
--- a/net/mosquitto/files/patch-lib_mosquitto__internal.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/mosquitto_internal.h.orig	2026-02-05 18:32:43 UTC
-+++ lib/mosquitto_internal.h
-@@ -22,6 +22,7 @@ Contributors:
- 
- #include "config.h"
- 
-+#include <sys/types.h>
- #ifdef WIN32
- #  include <winsock2.h>
- #endif
diff --git a/net/mosquitto/files/patch-src_proxy__v1.c b/net/mosquitto/files/patch-src_proxy__v1.c
deleted file mode 100644
index 27e9bde5e105..000000000000
--- a/net/mosquitto/files/patch-src_proxy__v1.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/proxy_v1.c.orig	2026-02-04 22:33:13 UTC
-+++ src/proxy_v1.c
-@@ -4,6 +4,7 @@
- #else
- #  include <arpa/inet.h>
- #endif
-+#include <netinet/in.h>
- #include <stdint.h>
- #include "mosquitto_broker_internal.h"
- #include "mosquitto_internal.h"