diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile
index ae0634faa7d6..e9d27fe1d3ba 100644
--- a/security/tailscale/Makefile
+++ b/security/tailscale/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	tailscale
-PORTVERSION=	1.58.0
+PORTVERSION=	1.58.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security net-vpn
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Mesh VPN that makes it easy to connect your devices
 WWW=		https://tailscale.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 USES=		go:1.21,modules
 
 GO_MODULE=	github.com/tailscale/tailscale
 
 USE_RC_SUBR=	tailscaled
 
 GO_TARGET=	./cmd/tailscale \
 		./cmd/tailscaled
 GO_BUILDFLAGS=	-tags xversion -ldflags "\
 		-X tailscale.com/version.longStamp=${PORTVERSION} \
 		-X tailscale.com/version.shortStamp=${PORTVERSION}"
 
 PLIST_FILES=	bin/tailscale  \
 		bin/tailscaled
 
 .include <bsd.port.mk>
diff --git a/security/tailscale/distinfo b/security/tailscale/distinfo
index b5738e3683a7..c8867f732844 100644
--- a/security/tailscale/distinfo
+++ b/security/tailscale/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1705616886
-SHA256 (go/security_tailscale/tailscale-v1.58.0/v1.58.0.mod) = da0c715d863dd50609914de1a7dd3339a341b64c21e5d594418be55c44e7d297
-SIZE (go/security_tailscale/tailscale-v1.58.0/v1.58.0.mod) = 18802
-SHA256 (go/security_tailscale/tailscale-v1.58.0/v1.58.0.zip) = 6eebed3e58865427e0e2086911d32446066e48cd2003fa234d7163888912784b
-SIZE (go/security_tailscale/tailscale-v1.58.0/v1.58.0.zip) = 3048752
+TIMESTAMP = 1706088613
+SHA256 (go/security_tailscale/tailscale-v1.58.2/v1.58.2.mod) = da0c715d863dd50609914de1a7dd3339a341b64c21e5d594418be55c44e7d297
+SIZE (go/security_tailscale/tailscale-v1.58.2/v1.58.2.mod) = 18802
+SHA256 (go/security_tailscale/tailscale-v1.58.2/v1.58.2.zip) = 50d342b8c23bed18ec917a9692643fad75849939da3b34ac33f9975872cc9493
+SIZE (go/security_tailscale/tailscale-v1.58.2/v1.58.2.zip) = 3052419