diff --git a/security/headscale/Makefile b/security/headscale/Makefile
index b1b156424fc3..1272ab0c745a 100644
--- a/security/headscale/Makefile
+++ b/security/headscale/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	headscale
-PORTVERSION=	0.16.3
+PORTVERSION=	0.16.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	m.muenz@gmail.com
 COMMENT=	Mesh VPN that makes it easy to connect your devices
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	fails to compile: modernc.org/libc
 BROKEN_armv6=	fails to compile: modernc.org/libc
 BROKEN_armv7=	fails to compile: modernc.org/libc
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 USES=		go:modules
 USE_RC_SUBR=	headscale
 
 GO_MODULE=	github.com/juanfont/headscale
 
 GO_TARGET=	./cmd/headscale
 
 PLIST_FILES=	"@sample ${ETCDIR}/config.yaml.sample" \
 		"@dir /var/cache/${PORTNAME}" \
 		"@dir /var/db/${PORTNAME}" \
 		bin/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/headscale|${PREFIX}/etc/${PORTNAME}|g' \
 		${WRKSRC}/cmd/headscale/cli/utils.go
 	@${REINPLACE_CMD} -e 's|/var/lib/headscale/db.sqlite|/var/db/${PORTNAME}/db.sqlite|g' \
 		${WRKSRC}/config-example.yaml
 	@${REINPLACE_CMD} -e 's|/var/lib/headscale/cache|/var/cache/${PORTNAME}|g' \
 		${WRKSRC}/config-example.yaml
 	@${REINPLACE_CMD} -e 's|/var/lib/headscale/private.key|${PREFIX}/etc/${PORTNAME}/private.key|g' \
 		${WRKSRC}/config-example.yaml
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/config-example.yaml ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/config.yaml.sample
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/cache/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/headscale/distinfo b/security/headscale/distinfo
index 87ccca1c7922..47cabd4a61fb 100644
--- a/security/headscale/distinfo
+++ b/security/headscale/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1660817629
-SHA256 (go/security_headscale/headscale-v0.16.3/v0.16.3.mod) = 5a1e6a81c94588289a91ad0ed5afab20d2c472a7acaedbf5315bbfc267865bf9
-SIZE (go/security_headscale/headscale-v0.16.3/v0.16.3.mod) = 6809
-SHA256 (go/security_headscale/headscale-v0.16.3/v0.16.3.zip) = 8bca8d472881fa9852b437e850b65d7699fbf3234b3796ce8df3cd26bb668ed6
-SIZE (go/security_headscale/headscale-v0.16.3/v0.16.3.zip) = 461913
+TIMESTAMP = 1661076406
+SHA256 (go/security_headscale/headscale-v0.16.4/v0.16.4.mod) = 5a1e6a81c94588289a91ad0ed5afab20d2c472a7acaedbf5315bbfc267865bf9
+SIZE (go/security_headscale/headscale-v0.16.4/v0.16.4.mod) = 6809
+SHA256 (go/security_headscale/headscale-v0.16.4/v0.16.4.zip) = 14f0a916f5477479b73501da559c84874d5ef9bd05ad029ab16049a298aa9c63
+SIZE (go/security_headscale/headscale-v0.16.4/v0.16.4.zip) = 464386