diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index 28f6c2f6c618..c0405f36f4fa 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -1,18 +1,18 @@
-PORTNAME=      xonix
-PORTVERSION=   1.5
-CATEGORIES=    games
-MASTER_SITES=  https://github.com/dl8dtl/xonix/archive/refs/tags/
-DISTNAME=      v${PORTVERSION}
-DIST_SUBDIR=   xonix
+PORTNAME=	xonix
+DISTVERSIONPREFIX=	v
+DISTVERSION=   1.5
+CATEGORIES=	games
 
-MAINTAINER=    joerg@FreeBSD.org
-COMMENT=       Try to win land without colliding with "flyers" and "eaters"
-WWW=           https://github.com/dl8dtl/xonix
+MAINTAINER=	joerg@FreeBSD.org
+COMMENT=	Try to win land without colliding with "flyers" and "eaters"
+WWW=		https://github.com/dl8dtl/xonix
 
-LICENSE=       BSD2CLAUSE
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=          imake
-WRKSRC=        ${WRKDIR}/xonix-${PORTVERSION}
-USE_XORG=      x11 xaw xorgproto
+USES=		imake xorg
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
+USE_GITHUB=	yes
+GH_ACCOUNT=	dl8dtl
 
 .include <bsd.port.mk>
diff --git a/games/xonix/distinfo b/games/xonix/distinfo
index 3ba1b4dadc69..d9af418b0543 100644
--- a/games/xonix/distinfo
+++ b/games/xonix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1775860432
-SHA256 (xonix/v1.5.tar.gz) = 206621925b58ade832f9defd7b61e38dec3d5de23ca8ba826ea78eaf53968ba7
-SIZE (xonix/v1.5.tar.gz) = 46279
+TIMESTAMP = 1775891399
+SHA256 (dl8dtl-xonix-v1.5_GH0.tar.gz) = 206621925b58ade832f9defd7b61e38dec3d5de23ca8ba826ea78eaf53968ba7
+SIZE (dl8dtl-xonix-v1.5_GH0.tar.gz) = 46279