diff --git a/net/czmq4/Makefile b/net/czmq4/Makefile
index 43864e3f1167..01ec8b0105ae 100644
--- a/net/czmq4/Makefile
+++ b/net/czmq4/Makefile
@@ -2,11 +2,11 @@
 
 PORTNAME=	czmq
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.1.1
+DISTVERSION=	4.2.1
 CATEGORIES=	net
 PKGNAMESUFFIX=	4
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	krion@FreeBSD.org
 COMMENT=	High-level C Binding for ZeroMQ (Version 4)
 
 LICENSE=	MPL20
@@ -30,11 +30,7 @@ SHEBANG_FILES=	doc/mkman mkdoc \
 
 CONFLICTS_INSTALL=	czmq-3.*
 
-# uuid_CFLAGS and uuid_LIBS required
-# to avoid conflicts with misc/e2fsprogs-libuuid
-CONFIGURE_ARGS=	uuid_CFLAGS="-I/usr/include ${CFLAGS}" \
-		uuid_LIBS="-lc" \
-		--with-libzmq=${LOCALBASE} \
+CONFIGURE_ARGS=	--with-libzmq=${LOCALBASE} \
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
 		--enable-drafts="yes" \
 		--with-docs="yes"
diff --git a/net/czmq4/distinfo b/net/czmq4/distinfo
index b41810afb2e1..edd0c541c334 100644
--- a/net/czmq4/distinfo
+++ b/net/czmq4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521866607
-SHA256 (zeromq-czmq-v4.1.1_GH0.tar.gz) = b7623433547aa4b6e79722796c27ebc7c0470fea4204e920fd05e717c648f889
-SIZE (zeromq-czmq-v4.1.1_GH0.tar.gz) = 1094718
+TIMESTAMP = 1610964330
+SHA256 (zeromq-czmq-v4.2.1_GH0.tar.gz) = 83457cd32a2c2615b8d7ebcf91b198cb0d8df383a2072b96835ab250164d8a83
+SIZE (zeromq-czmq-v4.2.1_GH0.tar.gz) = 1340835
diff --git a/net/czmq4/files/patch-src_zosc.c b/net/czmq4/files/patch-src_zosc.c
new file mode 100644
index 000000000000..7d2f6b240716
--- /dev/null
+++ b/net/czmq4/files/patch-src_zosc.c
@@ -0,0 +1,11 @@
+--- src/zosc.c.orig	2021-01-18 10:20:29 UTC
++++ src/zosc.c
+@@ -23,7 +23,7 @@
+ #endif
+ #include "czmq_classes.h"
+ #if __unix__ && !__APPLE__
+-#include <endian.h>
++#include <sys/endian.h>
+ #define htonll(x) htobe64(x)
+ #define ntohll(x) be64toh(x)
+ #endif
diff --git a/net/czmq4/files/patch-src_zuuid.c b/net/czmq4/files/patch-src_zuuid.c
new file mode 100644
index 000000000000..b70baeef0a42
--- /dev/null
+++ b/net/czmq4/files/patch-src_zuuid.c
@@ -0,0 +1,11 @@
+--- src/zuuid.c.orig	2021-01-18 10:17:46 UTC
++++ src/zuuid.c
+@@ -67,7 +67,7 @@ zuuid_new (void)
+     uuid_t uuid;
+     assert (sizeof (uuid) == ZUUID_LEN);
+     uuid_generate (uuid);
+-    zuuid_set (self, (byte *) uuid);
++    zuuid_set (self, (byte *) &uuid);
+ #elif defined (__UTYPE_OPENBSD) || defined (__UTYPE_FREEBSD) || defined (__UTYPE_NETBSD)
+     uuid_t uuid;
+     uint32_t status = 0;
diff --git a/net/czmq4/pkg-plist b/net/czmq4/pkg-plist
index edaad4a811f2..ea40898860a5 100644
--- a/net/czmq4/pkg-plist
+++ b/net/czmq4/pkg-plist
@@ -1,7 +1,7 @@
 bin/zmakecert
+include/czmq.h
 include/czmq_library.h
 include/czmq_prelude.h
-include/czmq.h
 include/zactor.h
 include/zargs.h
 include/zarmour.h
@@ -13,19 +13,25 @@ include/zchunk.h
 include/zclock.h
 include/zconfig.h
 include/zdigest.h
-include/zdir_patch.h
 include/zdir.h
+include/zdir_patch.h
 include/zfile.h
 include/zframe.h
 include/zgossip.h
 include/zhash.h
 include/zhashx.h
+include/zhttp_client.h
+include/zhttp_request.h
+include/zhttp_response.h
+include/zhttp_server.h
+include/zhttp_server_options.h
 include/ziflist.h
 include/zlist.h
 include/zlistx.h
 include/zloop.h
 include/zmonitor.h
 include/zmsg.h
+include/zosc.h
 include/zpoller.h
 include/zproc.h
 include/zproxy.h
@@ -39,7 +45,7 @@ include/zuuid.h
 lib/libczmq.a
 lib/libczmq.so
 lib/libczmq.so.4
-lib/libczmq.so.4.1.1
+lib/libczmq.so.4.2.1
 libdata/pkgconfig/libczmq.pc
 man/man1/zmakecert.1.gz
 man/man3/zactor.3.gz
@@ -53,19 +59,25 @@ man/man3/zchunk.3.gz
 man/man3/zclock.3.gz
 man/man3/zconfig.3.gz
 man/man3/zdigest.3.gz
-man/man3/zdir_patch.3.gz
 man/man3/zdir.3.gz
+man/man3/zdir_patch.3.gz
 man/man3/zfile.3.gz
 man/man3/zframe.3.gz
 man/man3/zgossip.3.gz
 man/man3/zhash.3.gz
 man/man3/zhashx.3.gz
+man/man3/zhttp_client.3.gz
+man/man3/zhttp_request.3.gz
+man/man3/zhttp_response.3.gz
+man/man3/zhttp_server.3.gz
+man/man3/zhttp_server_options.3.gz
 man/man3/ziflist.3.gz
 man/man3/zlist.3.gz
 man/man3/zlistx.3.gz
 man/man3/zloop.3.gz
 man/man3/zmonitor.3.gz
 man/man3/zmsg.3.gz
+man/man3/zosc.3.gz
 man/man3/zpoller.3.gz
 man/man3/zproc.3.gz
 man/man3/zproxy.3.gz
@@ -87,22 +99,28 @@ share/zproject/czmq/zchunk.api
 share/zproject/czmq/zclock.api
 share/zproject/czmq/zconfig.api
 share/zproject/czmq/zdigest.api
-share/zproject/czmq/zdir_patch.api
 share/zproject/czmq/zdir.api
+share/zproject/czmq/zdir_patch.api
 share/zproject/czmq/zfile.api
 share/zproject/czmq/zframe.api
 share/zproject/czmq/zgossip_msg.api
 share/zproject/czmq/zhash.api
 share/zproject/czmq/zhashx.api
+share/zproject/czmq/zhttp_client.api
+share/zproject/czmq/zhttp_request.api
+share/zproject/czmq/zhttp_response.api
+share/zproject/czmq/zhttp_server.api
+share/zproject/czmq/zhttp_server_options.api
 share/zproject/czmq/ziflist.api
 share/zproject/czmq/zlist.api
 share/zproject/czmq/zlistx.api
 share/zproject/czmq/zloop.api
 share/zproject/czmq/zmsg.api
+share/zproject/czmq/zosc.api
 share/zproject/czmq/zpoller.api
 share/zproject/czmq/zproc.api
-share/zproject/czmq/zsock_option.api
 share/zproject/czmq/zsock.api
+share/zproject/czmq/zsock_option.api
 share/zproject/czmq/zstr.api
 share/zproject/czmq/zsys.api
 share/zproject/czmq/ztimerset.api