diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index a68de54b5fb9..50232487e0ce 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -1,50 +1,52 @@
 PORTNAME=	xinetd
-PORTVERSION=	2.3.15
+DISTVERSION=	2-3-15
 PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Replacement for inetd with better control and logging
 WWW=		https://github.com/xinetd-org/xinetd
 
 LICENSE=	XINETD
 LICENSE_NAME=	xinetd license
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cpe shebangfix
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	xinetd-org
-GH_TAGNAME=	xinetd-2-3-15
+GH_ACCOUNT=	${PORTNAME}-org
+GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 USE_RC_SUBR=	xinetd
 
 SHEBANG_FILES=	${WRKSRC}/xinetd/xconv.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-loadavg
 ALL_TARGET=	build
 
 OPTIONS_DEFINE=	IPV6 LIBWRAP XCONV
 OPTIONS_DEFAULT=	LIBWRAP XCONV
 OPTIONS_SUB=	yes
 
 XCONV_DESC=	Install xconv utility (requires perl)
 
 IPV6_CONFIGURE_WITH=	ipv6
 LIBWRAP_CONFIGURE_WITH=	libwrap
 XCONV_USES=	perl5
 XCONV_USE=	PERL5=run
 
+PORTSCOUT=	ignore:1
+
 post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xinetd/xinetd ${STAGEDIR}${PREFIX}/sbin/xinetd
 	${INSTALL_SCRIPT} ${WRKSRC}/xinetd/xconv.pl ${STAGEDIR}${PREFIX}/bin/xconv
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.conf.man ${STAGEDIR}${PREFIX}/man/man5/xinetd.conf.5
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xconv.pl.8 ${STAGEDIR}${PREFIX}/man/man8/xconv.8
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.man ${STAGEDIR}${PREFIX}/man/man8/xinetd.8
 	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.log.man ${STAGEDIR}${PREFIX}/man/man8/xinetd.log.8
 
 .include <bsd.port.mk>
diff --git a/security/xinetd/distinfo b/security/xinetd/distinfo
index 4cb935d7b310..91638fe74db7 100644
--- a/security/xinetd/distinfo
+++ b/security/xinetd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679407850
-SHA256 (xinetd-org-xinetd-2.3.15-xinetd-2-3-15_GH0.tar.gz) = 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c
-SIZE (xinetd-org-xinetd-2.3.15-xinetd-2-3-15_GH0.tar.gz) = 300870
+TIMESTAMP = 1685723690
+SHA256 (xinetd-org-xinetd-2-3-15-xinetd-2-3-15_GH0.tar.gz) = 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c
+SIZE (xinetd-org-xinetd-2-3-15-xinetd-2-3-15_GH0.tar.gz) = 300870