diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index c532be0aaa2a..3c1b8038cf05 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -1,19 +1,22 @@
 PORTNAME=	octave-forge-control
-PORTVERSION=	3.5.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	control-
+DISTVERSION=	3.5.1
 CATEGORIES=	math
-MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
-DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
-USES=			octave
+USES=		octave autoreconf
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnu-octave
+GH_PROJECT=	pkg-control
+
+OCTAVE_SRC=	${GH_PROJECT}-control-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-control/distinfo b/math/octave-forge-control/distinfo
index dd44b4830238..b70dfbf66bea 100644
--- a/math/octave-forge-control/distinfo
+++ b/math/octave-forge-control/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677007525
-SHA256 (octave-forge/control-3.5.0.tar.gz) = 507d14ea3ea80bdc55b67c146a9dc88229229714fe33febe983393a67dec714a
-SIZE (octave-forge/control-3.5.0.tar.gz) = 2984204
+TIMESTAMP = 1680453525
+SHA256 (octave-forge/gnu-octave-pkg-control-control-3.5.1_GH0.tar.gz) = 5f5c95d089c7a54efa6112274b35e614c17b33aacee8eb54ba51d879c20f14e4
+SIZE (octave-forge/gnu-octave-pkg-control-control-3.5.1_GH0.tar.gz) = 2903759