diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile
index 7e71933d4681..fae6b7ad0c05 100644
--- a/security/tailscale/Makefile
+++ b/security/tailscale/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	tailscale
-PORTVERSION=	1.8.6
+PORTVERSION=	1.8.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Mesh VPN that makes it easy to connect your devices
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 USES=		go: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.Long=${PORTVERSION} \
 		-X tailscale.com/version.Short=${PORTVERSION}"
 
 PLIST_FILES=	bin/tailscale  \
 		bin/tailscaled
 
 .include <bsd.port.mk>
diff --git a/security/tailscale/distinfo b/security/tailscale/distinfo
index a736f912166a..f2267e734c7c 100644
--- a/security/tailscale/distinfo
+++ b/security/tailscale/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1622192236
-SHA256 (go/security_tailscale/tailscale-v1.8.6/v1.8.6.mod) = 95419a6ec25c6dab7daab9e7abef61349e18de3dd3118acbb1a6d4084d8ee9ca
-SIZE (go/security_tailscale/tailscale-v1.8.6/v1.8.6.mod) = 2133
-SHA256 (go/security_tailscale/tailscale-v1.8.6/v1.8.6.zip) = 5afd4125e47f382886131f13f5a74079b565ca5cb6dfd290533028da83745c94
-SIZE (go/security_tailscale/tailscale-v1.8.6/v1.8.6.zip) = 897629
+TIMESTAMP = 1623861754
+SHA256 (go/security_tailscale/tailscale-v1.8.7/v1.8.7.mod) = 95419a6ec25c6dab7daab9e7abef61349e18de3dd3118acbb1a6d4084d8ee9ca
+SIZE (go/security_tailscale/tailscale-v1.8.7/v1.8.7.mod) = 2133
+SHA256 (go/security_tailscale/tailscale-v1.8.7/v1.8.7.zip) = 737db75fc809ec024958712892da1807eb96d86f55a579d36105ea0aba21a201
+SIZE (go/security_tailscale/tailscale-v1.8.7/v1.8.7.zip) = 898336