diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile
index 3ca23e689d61..15ea20698519 100644
--- a/net/libwebsockets/Makefile
+++ b/net/libwebsockets/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libwebsockets
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.1.6
+DISTVERSION=	4.2.0
 CATEGORIES=	net devel
 MASTER_SITES=	https://libwebsockets.org/git/libwebsockets/snapshot/
 
@@ -15,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		cmake localbase pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
+CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=True
 CMAKE_ON=	LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \
 		LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \
 		LWS_WITHOUT_TEST_SERVER_EXTPOLL \
@@ -22,7 +23,7 @@ CMAKE_ON=	LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \
 
 OPTIONS_DEFINE=		HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \
 			SECURE_STREAMS SOCKS SQLITE WEBSERVER
-OPTIONS_DEFAULT=	HTTP2 OPENSSL LIBUV
+OPTIONS_DEFAULT=	HTTP2 MQTT OPENSSL LIBUV
 OPTIONS_SUB=		yes
 
 OPTIONS_SINGLE=		SSL
@@ -75,4 +76,10 @@ LIBEVENT_CMAKE_BOOL=	LWS_WITH_LIBEVENT
 LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
 LIBUV_CMAKE_BOOL=	LWS_WITH_LIBUV
 
+BUILDINFO=	${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%BUILDINFO%%|${BUILDINFO}|g' \
+	    ${PATCH_WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo
index 5b26cf42e526..a8c1000b0aa6 100644
--- a/net/libwebsockets/distinfo
+++ b/net/libwebsockets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607873825
-SHA256 (libwebsockets-v4.1.6.tar.xz) = d24b644bb1686c6dd6e3499b9407bb7e22f08f43da22ae7be435c74433a2641f
-SIZE (libwebsockets-v4.1.6.tar.xz) = 8570880
+TIMESTAMP = 1621466017
+SHA256 (libwebsockets-v4.2.0.tar.xz) = 4d1e42c2be5951b49cda195008f9c39b7dd29a8956ea00bbe52fcf7efb6a623a
+SIZE (libwebsockets-v4.2.0.tar.xz) = 12769280
diff --git a/net/libwebsockets/files/patch-CMakeLists.txt b/net/libwebsockets/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..eaf71b297c70
--- /dev/null
+++ b/net/libwebsockets/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2021-05-19 23:49:00 UTC
++++ CMakeLists.txt
+@@ -369,6 +369,7 @@ if(GIT_EXECUTABLE)
+ 	message("Git commit hash: ${LWS_BUILD_HASH}")
+ endif()
+ 
++set(LWS_BUILD_HASH "%%BUILDINFO%%")
+ set(PACKAGE "libwebsockets")
+ set(CPACK_RPM_PACKAGE_LICENSE "MIT")
+ set(CPACK_PACKAGE_NAME "${PACKAGE}")
diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist
index 1a05235c2685..dfc61553e02a 100644
--- a/net/libwebsockets/pkg-plist
+++ b/net/libwebsockets/pkg-plist
@@ -14,14 +14,15 @@ include/libwebsockets/lws-button.h
 include/libwebsockets/lws-callbacks.h
 include/libwebsockets/lws-cgi.h
 include/libwebsockets/lws-client.h
+include/libwebsockets/lws-conmon.h
 include/libwebsockets/lws-context-vhost.h
 include/libwebsockets/lws-dbus.h
-include/libwebsockets/lws-detailed-latency.h
 include/libwebsockets/lws-diskcache.h
 include/libwebsockets/lws-display.h
 include/libwebsockets/lws-dll2.h
 include/libwebsockets/lws-dsh.h
 include/libwebsockets/lws-eventlib-exports.h
+include/libwebsockets/lws-fault-injection.h
 include/libwebsockets/lws-freertos.h
 include/libwebsockets/lws-fts.h
 include/libwebsockets/lws-genaes.h
@@ -41,6 +42,7 @@ include/libwebsockets/lws-led.h
 include/libwebsockets/lws-lejp.h
 include/libwebsockets/lws-logs.h
 include/libwebsockets/lws-lwsac.h
+include/libwebsockets/lws-metrics.h
 include/libwebsockets/lws-misc.h
 include/libwebsockets/lws-mqtt.h
 include/libwebsockets/lws-netdev.h
@@ -63,12 +65,12 @@ include/libwebsockets/lws-spa.h
 include/libwebsockets/lws-spi.h
 include/libwebsockets/lws-ssd1306-i2c.h
 include/libwebsockets/lws-state.h
-include/libwebsockets/lws-stats.h
 include/libwebsockets/lws-struct.h
 include/libwebsockets/lws-system.h
 include/libwebsockets/lws-test-sequencer.h
 include/libwebsockets/lws-threadpool.h
 include/libwebsockets/lws-timeout-timer.h
+include/libwebsockets/lws-tls-sessions.h
 include/libwebsockets/lws-tokenize.h
 include/libwebsockets/lws-vfs.h
 include/libwebsockets/lws-write.h
@@ -89,7 +91,7 @@ lib/cmake/libwebsockets/libwebsockets-config.cmake
 %%LIBUV%%lib/libwebsockets-evlib_uv.so
 lib/libwebsockets.a
 lib/libwebsockets.so
-lib/libwebsockets.so.17
+lib/libwebsockets.so.18
 libdata/pkgconfig/libwebsockets.pc
 libdata/pkgconfig/libwebsockets_static.pc
 %%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css