diff --git a/math/octave-forge-mqtt/Makefile b/math/octave-forge-mqtt/Makefile
index 7c858f5e65b5..5afe36ddeb7c 100644
--- a/math/octave-forge-mqtt/Makefile
+++ b/math/octave-forge-mqtt/Makefile
@@ -1,22 +1,24 @@
 PORTNAME=	octave-forge-mqtt
-PORTVERSION=	0.0.3
-PORTREVISION=	3
+DISTVERSIONPREFIX=	release-
+DISTVERSION=	0.0.4
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=octave-mqtt/v${PORTVERSION}
-DISTNAME=	octave-${OCTAVE_PKGNAME}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libpaho-mqtt3a.so:net/libpaho-mqtt3
 
 USES=		autoreconf localbase octave
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnu-octave
+GH_PROJECT=	octave-mqtt
+
+OCTAVE_SRC=	${GH_PROJECT}-release-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mqtt/distinfo b/math/octave-forge-mqtt/distinfo
index 92a1122100ba..c470a9184269 100644
--- a/math/octave-forge-mqtt/distinfo
+++ b/math/octave-forge-mqtt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666995277
-SHA256 (octave-forge/octave-mqtt-0.0.3.tar.gz) = 9aff75a326ee50b63bacfddf4c9318c72a1c2a39e558ed5d347d43f17009da64
-SIZE (octave-forge/octave-mqtt-0.0.3.tar.gz) = 392407
+TIMESTAMP = 1690295455
+SHA256 (octave-forge/gnu-octave-octave-mqtt-release-0.0.4_GH0.tar.gz) = 5970eeda201f0eb36cd5fa802fb4420c282058200bd7a1fa24e4256084ec8b39
+SIZE (octave-forge/gnu-octave-octave-mqtt-release-0.0.4_GH0.tar.gz) = 91110