diff --git a/net/ooni-probe-cli/Makefile b/net/ooni-probe-cli/Makefile
index 214fbee57ce1..b87742f87e2c 100644
--- a/net/ooni-probe-cli/Makefile
+++ b/net/ooni-probe-cli/Makefile
@@ -1,26 +1,23 @@
 PORTNAME=		ooni-probe-cli
 DISTVERSIONPREFIX=	v
-DISTVERSION=		3.21.1
-PORTREVISION=	3
+DISTVERSION=		3.22.0
 CATEGORIES=		net www benchmarks
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Next generation OONI Probe CLI
 WWW=		https://ooni.org/about/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		https://bugs.freebsd.org/272643
-
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		go:modules
 
 GO_BUILDFLAGS=	-ldflags '-s -w -extldflags "-static"'
 GO_MODULE=	github.com/ooni/probe-cli/v3
 GO_TARGET=	./cmd/ooniprobe
 
 PLIST_FILES=	bin/ooniprobe
 
 .include <bsd.port.mk>
diff --git a/net/ooni-probe-cli/distinfo b/net/ooni-probe-cli/distinfo
index 46fd43070638..30aa678dabda 100644
--- a/net/ooni-probe-cli/distinfo
+++ b/net/ooni-probe-cli/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713008454
-SHA256 (go/net_ooni-probe-cli/ooni-probe-cli-v3.21.1/v3.21.1.mod) = c58314ed2588a8618365b4ee7ec03b570d53345c4c0e3b14850c17d044813112
-SIZE (go/net_ooni-probe-cli/ooni-probe-cli-v3.21.1/v3.21.1.mod) = 7615
-SHA256 (go/net_ooni-probe-cli/ooni-probe-cli-v3.21.1/v3.21.1.zip) = 0d1fd7edb7aff39edd24d63a41b4249678c72e0b264092fe148301edd267dae6
-SIZE (go/net_ooni-probe-cli/ooni-probe-cli-v3.21.1/v3.21.1.zip) = 3886575
+TIMESTAMP = 1721938352
+SHA256 (go/net_ooni-probe-cli/ooni-probe-cli-v3.22.0/v3.22.0.mod) = c87253b61d77580590a6f148e55e5123a03ce48dacf519e052743b93f89262d0
+SIZE (go/net_ooni-probe-cli/ooni-probe-cli-v3.22.0/v3.22.0.mod) = 7394
+SHA256 (go/net_ooni-probe-cli/ooni-probe-cli-v3.22.0/v3.22.0.zip) = 3808b7c0abd34c04f5ec409a4126109b9cc06740794db0f809eaa933b58f7ec5
+SIZE (go/net_ooni-probe-cli/ooni-probe-cli-v3.22.0/v3.22.0.zip) = 3288757
diff --git a/net/ooni-probe-cli/files/patch-internal_netxlite_getaddrinfo__cgo.go b/net/ooni-probe-cli/files/patch-internal_netxlite_getaddrinfo__cgo.go
new file mode 100644
index 000000000000..8ea2f1b8f21f
--- /dev/null
+++ b/net/ooni-probe-cli/files/patch-internal_netxlite_getaddrinfo__cgo.go
@@ -0,0 +1,10 @@
+--- internal/netxlite/getaddrinfo_cgo.go.orig	1979-11-30 00:00:00 UTC
++++ internal/netxlite/getaddrinfo_cgo.go
+@@ -9,6 +9,7 @@ package netxlite
+ 
+ #ifndef _WIN32
+ #include <netdb.h> // for getaddrinfo
++#include <sys/socket.h>
+ #else
+ #include <ws2tcpip.h> // for getaddrinfo
+ #endif