diff --git a/math/octave-forge-websockets/Makefile b/math/octave-forge-websockets/Makefile
index 920dde40ddb6..10a7a58d5570 100644
--- a/math/octave-forge-websockets/Makefile
+++ b/math/octave-forge-websockets/Makefile
@@ -1,30 +1,32 @@
 PORTNAME=	octave-forge-websockets
-PORTVERSION=	0.1.0
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.0
 CATEGORIES=	math
-MASTER_SITES=	https://github.com/gnu-octave/octave-websockets/archive/
-DISTNAME=	v${DISTVERSIONFULL}
-DIST_SUBDIR=	octave-forge/${PORTNAME}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		http://octave.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnu-octave
+GH_PROJECT=	octave-websockets
+
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC=		octave-${OCTAVE_PKGNAME}-${PORTVERSION}
+OCTSRC=		${GH_PROJECT}-${DISTVERSION}
 
 RUN_DEPENDS+=	${TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 do-build:
 	@${DO_NADA}
 
 post-build:
 	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-websockets/distinfo b/math/octave-forge-websockets/distinfo
index 3e61f1ba7e95..616dbe621914 100644
--- a/math/octave-forge-websockets/distinfo
+++ b/math/octave-forge-websockets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666497529
-SHA256 (octave-forge/octave-forge-websockets/v0.1.0.tar.gz) = 926ef8d711935ecae1384f5476e10104c1d83c2526ae7782588da804aa42df94
-SIZE (octave-forge/octave-forge-websockets/v0.1.0.tar.gz) = 12915
+TIMESTAMP = 1666573432
+SHA256 (octave-forge/gnu-octave-octave-websockets-v0.1.0_GH0.tar.gz) = 926ef8d711935ecae1384f5476e10104c1d83c2526ae7782588da804aa42df94
+SIZE (octave-forge/gnu-octave-octave-websockets-v0.1.0_GH0.tar.gz) = 12915