diff --git a/security/headscale/Makefile b/security/headscale/Makefile
index 69422c915829..a7ec5ef862b1 100644
--- a/security/headscale/Makefile
+++ b/security/headscale/Makefile
@@ -1,47 +1,46 @@
 PORTNAME=	headscale
-PORTVERSION=	0.16.0
+PORTVERSION=	0.16.2
 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_i386=	fails to compile: github.com/puzpuzpuz/xsync/issues/38
 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=	${ETCDIR}/config.yaml \
+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
+	${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 2a155d23b179..3fe10f3eb4fb 100644
--- a/security/headscale/distinfo
+++ b/security/headscale/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1658744904
-SHA256 (go/security_headscale/headscale-v0.16.0/v0.16.0.mod) = d8d3f754a312f4653f43f296c721476003b1b9a699e83b46dae551ba572d969a
-SIZE (go/security_headscale/headscale-v0.16.0/v0.16.0.mod) = 6735
-SHA256 (go/security_headscale/headscale-v0.16.0/v0.16.0.zip) = b048f9bf92ec191b10eba34e7c8c440ca9609c72b917131d28ab1e3abdae9eeb
-SIZE (go/security_headscale/headscale-v0.16.0/v0.16.0.zip) = 461116
+TIMESTAMP = 1660544340
+SHA256 (go/security_headscale/headscale-v0.16.2/v0.16.2.mod) = 5a1e6a81c94588289a91ad0ed5afab20d2c472a7acaedbf5315bbfc267865bf9
+SIZE (go/security_headscale/headscale-v0.16.2/v0.16.2.mod) = 6809
+SHA256 (go/security_headscale/headscale-v0.16.2/v0.16.2.zip) = 38dba15361a7c3777d1a6f9cd483440c3883b8578827fe381bee7a516a07b650
+SIZE (go/security_headscale/headscale-v0.16.2/v0.16.2.zip) = 461736