diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 6fa94457fc64..d410b5e2289d 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	mosquitto
-PORTVERSION=	2.0.15
+DISTVERSION=	2.0.15
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Open source MQTT broker
 WWW=		https://mosquitto.org/
 
 LICENSE=	EPL
 
 BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 		docbook-xsl>0:textproc/docbook-xsl
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libcjson.so:devel/libcjson
 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"
 CPE_VENDOR=	eclipse
 
 USERS=		nobody
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=	CARES WS
-OPTIONS_DEFAULT=	CARES
+OPTIONS_DEFINE=	CARES WEBSOCKETS
+OPTIONS_DEFAULT=CARES WEBSOCKETS
 
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
-CARES_CMAKE_ON=	-DWITH_SRV:BOOL=ON
+CARES_CMAKE_ON=		-DWITH_SRV:BOOL=ON
 
-WS_DESC=	MQTT over Websockets support
-WS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
-WS_CMAKE_ON=	-DWITH_WEBSOCKETS:BOOL=ON
+WEBSOCKETS_DESC=	Websockets support via libwebsockets
+WEBSOCKETS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
+WEBSOCKETS_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
 
 .include <bsd.port.mk>
diff --git a/net/mosquitto/pkg-plist b/net/mosquitto/pkg-plist
index 03e7dac98bbe..8276473a059b 100644
--- a/net/mosquitto/pkg-plist
+++ b/net/mosquitto/pkg-plist
@@ -1,35 +1,35 @@
 bin/mosquitto_ctrl
 bin/mosquitto_passwd
 bin/mosquitto_pub
 bin/mosquitto_sub
 bin/mosquitto_rr
 @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_plugin.h
 include/mosquittopp.h
 include/mqtt_protocol.h
 lib/libmosquitto.so
 lib/libmosquitto.so.1
-lib/libmosquitto.so.%%PORTVERSION%%
+lib/libmosquitto.so.%%DISTVERSION%%
 lib/libmosquittopp.so
 lib/libmosquittopp.so.1
-lib/libmosquittopp.so.%%PORTVERSION%%
+lib/libmosquittopp.so.%%DISTVERSION%%
 lib/mosquitto_dynamic_security.so
 libdata/pkgconfig/libmosquitto.pc
 libdata/pkgconfig/libmosquittopp.pc
 share/man/man1/mosquitto_ctrl.1.gz
 share/man/man1/mosquitto_ctrl_dynsec.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_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/mqtt.7.gz
 share/man/man8/mosquitto.8.gz
 sbin/mosquitto