diff --git a/math/octave-forge-ponchon-savarit/Makefile b/math/octave-forge-ponchon-savarit/Makefile
index 8955c3657280..a2f8495ee3a5 100644
--- a/math/octave-forge-ponchon-savarit/Makefile
+++ b/math/octave-forge-ponchon-savarit/Makefile
@@ -1,30 +1,32 @@
 PORTNAME=	octave-forge-ponchon-savarit
-PORTVERSION=	0.1.1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.1
 CATEGORIES=	math
-MASTER_SITES=	https://github.com/aumpierre-unb/Ponchon-Savarit-for-GNU-Octave/archive/refs/tags/
-DISTNAME=	v${PORTVERSION}
-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=	aumpierre-unb
+GH_PROJECT=	Ponchon-Savarit-for-GNU-Octave
+
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC=		Ponchon-Savarit-for-GNU-Octave-${PORTVERSION}
+OCTSRC=		${GH_PROJECT}-${DISTVERSION}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
 do-build:
 	@${DO_NADA}
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 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-ponchon-savarit/distinfo b/math/octave-forge-ponchon-savarit/distinfo
index b5c30981424c..2b9f97a8b358 100644
--- a/math/octave-forge-ponchon-savarit/distinfo
+++ b/math/octave-forge-ponchon-savarit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666497483
-SHA256 (octave-forge/octave-forge-ponchon-savarit/v0.1.1.tar.gz) = a33b16463352ffeaf35f53cb6ccc5781b413085c6027f27113d4cb58693abdc1
-SIZE (octave-forge/octave-forge-ponchon-savarit/v0.1.1.tar.gz) = 140676
+TIMESTAMP = 1666573009
+SHA256 (octave-forge/aumpierre-unb-Ponchon-Savarit-for-GNU-Octave-v0.1.1_GH0.tar.gz) = a33b16463352ffeaf35f53cb6ccc5781b413085c6027f27113d4cb58693abdc1
+SIZE (octave-forge/aumpierre-unb-Ponchon-Savarit-for-GNU-Octave-v0.1.1_GH0.tar.gz) = 140676