diff --git a/net/wireguard-tools/Makefile b/net/wireguard-tools/Makefile
index a9a0f4d02aad..735738c14d6f 100644
--- a/net/wireguard-tools/Makefile
+++ b/net/wireguard-tools/Makefile
@@ -1,59 +1,57 @@
 PORTNAME=	wireguard-tools
-PORTVERSION=	1.0.20250521
+DISTVERSION=	1.0.20250521
+PORTREVISION=	1
 CATEGORIES=	net net-vpn
 MASTER_SITES=	https://git.zx2c4.com/wireguard-tools/snapshot/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	juhani@krekela.fi
 COMMENT=	Fast, modern and secure VPN Tunnel
 WWW=		https://git.zx2c4.com/wireguard-tools/about/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 FLAVORS=	default lite
 lite_PKGNAMESUFFIX=	-lite
 
 USES=		gmake tar:xz
 
-WRKSRC_SUBDIR=	src
-
 MAKE_ARGS+=	DEBUG=no WITH_BASHCOMPLETION=yes WITH_SYSTEMDUNITS=no
-MAKE_ENV+=	MANDIR="${PREFIX}/share/man" \
-		SYSCONFDIR="${PREFIX}/etc"
+MAKE_ENV+=	SYSCONFDIR="${PREFIX}/etc"
+
+WRKSRC_SUBDIR=	src
 
-OPTIONS_DEFINE=	WGQUICK
-OPTIONS_DEFAULT=WGQUICK
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		WGQUICK
+OPTIONS_DEFAULT=	WGQUICK
+OPTIONS_SUB=		yes
 
 WGQUICK_DESC=		wg-quick(8) userland utility
 WGQUICK_RUN_DEPENDS=	bash:shells/bash
 WGQUICK_MAKE_ARGS=	WITH_WGQUICK=yes
 WGQUICK_MAKE_ARGS_OFF=	WITH_WGQUICK=no
+WGQUICK_VARS=		USE_RC_SUBR=wireguard_wgquick
 
 .if ${FLAVOR:U} == lite
-USE_RC_SUBR=	wireguard_lite
-OPTIONS_EXCLUDE=WGQUICK
-COMMENT+=	(lite flavor)
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWGQUICK}
-USE_RC_SUBR=	wireguard_wgquick
+COMMENT+=		(lite flavor)
+USE_RC_SUBR=		wireguard_lite
+OPTIONS_EXCLUDE=	WGQUICK
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/completion/wg-quick.bash-completion \
 		${WRKSRC}/wg-quick/freebsd.bash
 
 install-rc-script:
 	@${ECHO_MSG} "===> Staging rc.d startup script(s)"
 	@for i in ${USE_RC_SUBR}; do \
 		_prefix=${PREFIX}; \
 		[ "${PREFIX}" = "/usr" ] && _prefix="" ; \
 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/wireguard; \
 		${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/wireguard" >> ${TMPPLIST}; \
 	done
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wg
+
 .include <bsd.port.mk>