diff --git a/math/octave-forge-cfitsio/Makefile b/math/octave-forge-cfitsio/Makefile
index 98cea8d31a451..1137848410220 100644
--- a/math/octave-forge-cfitsio/Makefile
+++ b/math/octave-forge-cfitsio/Makefile
@@ -1,10 +1,7 @@
 PORTNAME=	octave-forge-cfitsio
-PORTVERSION=	0.0.4
-PORTREVISION=	3
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.0.5
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=octave-cfitsio/v${PORTVERSION}
-DISTNAME=	octave-${OCTAVE_PKGNAME}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
@@ -16,6 +13,11 @@ LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 LIB_DEPENDS+=	libcfitsio.so:astro/cfitsio
 
 USES=		autoreconf octave
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnu-octave
+GH_PROJECT=	octave-cfitsio
+
+OCTAVE_SRC=	${GH_PROJECT}-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 
diff --git a/math/octave-forge-cfitsio/distinfo b/math/octave-forge-cfitsio/distinfo
index 17a9712c69e67..cd313147b6897 100644
--- a/math/octave-forge-cfitsio/distinfo
+++ b/math/octave-forge-cfitsio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666981649
-SHA256 (octave-forge/octave-cfitsio-0.0.4.tar.gz) = cc76307f99a3b7755a4ea72d1c4d40758329f20807e48d5df59da74e6bfee88e
-SIZE (octave-forge/octave-cfitsio-0.0.4.tar.gz) = 626713
+TIMESTAMP = 1686608279
+SHA256 (octave-forge/gnu-octave-octave-cfitsio-v0.0.5_GH0.tar.gz) = 3165828db1cbecb383f79b108010118c0f6fc414ee793288b29d40b8f1d03fc9
+SIZE (octave-forge/gnu-octave-octave-cfitsio-v0.0.5_GH0.tar.gz) = 254333