diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20250610:
+  AFFECTS: users of devel/py-gql, games/DDNet, net/mosquitto
+  AUTHOR: michaelo@FreeBSD.org
+
+  The WEBSOCKETS option has been renamed to WEBSOCKET to match the name from
+  RFC 6455, other ports and the description from Mk/bsd.options.desc.mk.
+
 20250606:
   AFFECTS: users of net-mgmt/unifi9
   AUTHOR: ronald@FreeBSD.org
diff --git a/devel/py-gql/Makefile b/devel/py-gql/Makefile
--- a/devel/py-gql/Makefile
+++ b/devel/py-gql/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gql
 DISTVERSION=	3.5.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -28,14 +29,13 @@
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=		AIOHTTP BOTOCORE DOCS HTTPX REQUESTS WEBSOCKETS
-OPTIONS_DEFAULT=	AIOHTTP BOTOCORE HTTPX REQUESTS WEBSOCKETS
+OPTIONS_DEFINE=		AIOHTTP BOTOCORE DOCS HTTPX REQUESTS WEBSOCKET
+OPTIONS_DEFAULT=	AIOHTTP BOTOCORE HTTPX REQUESTS WEBSOCKET
 
 AIOHTTP_DESC=		AIOHTTP Support
 BOTOCORE_DESC=		BOTOCORE Support
 HTTPX_DESC=		HTTPX Support
 REQUESTS_DESC=		Requests Support
-WEBSOCKETS_DESC=	Websockets Support
 
 AIOHTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8.0<4:www/py-aiohttp@${PY_FLAVOR}
 
@@ -53,7 +53,7 @@
 REQUESTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=1.0.0<2:www/py-requests-toolbelt@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests>=2.26<3:www/py-requests@${PY_FLAVOR}
 
-WEBSOCKETS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}websockets>=10:devel/py-websockets@${PY_FLAVOR}
+WEBSOCKET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}websockets>=10:devel/py-websockets@${PY_FLAVOR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests -vv --run-online
diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile
--- a/games/DDNet/Makefile
+++ b/games/DDNet/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	DDNet
 PORTVERSION=	19.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	https://ddnet.tw/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -40,7 +40,7 @@
 
 TEST_ENV=	${MAKE_ENV} GTEST_FILTER=-Io.CurrentExe:Jobs.LookupHost:Io.CurrentExe:Jobs.LookupHostWebsocket
 
-OPTIONS_DEFINE=		TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP VULKAN
+OPTIONS_DEFINE=		TEST WEBSOCKET MYSQL VIDEORECORDER UPNP VULKAN
 OPTIONS_MULTI=		COMPONENTS
 OPTIONS_MULTI_COMPONENTS=CLIENT SERVER
 OPTIONS_DEFAULT=	CLIENT SERVER VIDEORECORDER UPNP VULKAN
@@ -68,9 +68,8 @@
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_TEST_TARGET=	run_tests  # tests are broken
 
-WEBSOCKETS_DESC=	Enable WebSocket support for server
-WEBSOCKETS_CMAKE_BOOL=	WEBSOCKETS
-WEBSOCKETS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
+WEBSOCKET_CMAKE_BOOL=	WEBSOCKETS
+WEBSOCKET_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 
 MYSQL_DESC=		Enable MySQL/MariaDB support for server
 MYSQL_CMAKE_BOOL=	MYSQL
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mosquitto
 DISTVERSION=	2.0.20
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
 
@@ -25,15 +26,14 @@
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=	CARES WEBSOCKETS
-OPTIONS_DEFAULT=CARES WEBSOCKETS
+OPTIONS_DEFINE=	CARES WEBSOCKET
+OPTIONS_DEFAULT=CARES WEBSOCKET
 
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 CARES_CMAKE_ON=		-DWITH_SRV:BOOL=ON
 
-WEBSOCKETS_DESC=	Websockets support via libwebsockets
-WEBSOCKETS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
-WEBSOCKETS_CMAKE_ON=	-DWITH_WEBSOCKETS: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 \