diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index 933dcd30823a..88a7e530487d 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -1,33 +1,35 @@
 PORTNAME=	octave-forge-bim
-PORTVERSION=	1.1.5
-PORTREVISION=	16
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.6
 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=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	carlodefalco
+GH_PROJECT=	bim
+
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC=		${OCTAVE_PKGNAME}
+OCTSRC=		${GH_PROJECT}-${DISTVERSION}
 
 RUN_DEPENDS+=	${TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl
 RUN_DEPENDS+=	${TARBALLS_DIR}/msh.tar.gz:math/octave-forge-msh
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 do-build:
 	@${DO_NADA}
 
 NO_ARCH=	yes
 
 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-bim/distinfo b/math/octave-forge-bim/distinfo
index 83fa65f6ebae..ebe582ceda67 100644
--- a/math/octave-forge-bim/distinfo
+++ b/math/octave-forge-bim/distinfo
@@ -1,2 +1,3 @@
-SHA256 (octave-forge/bim-1.1.5.tar.gz) = e899c65e6c7fb0babdb0e2fb7990bae1f6ccf9b3dc1e19b4f58501242be2e078
-SIZE (octave-forge/bim-1.1.5.tar.gz) = 34575
+TIMESTAMP = 1667846208
+SHA256 (octave-forge/carlodefalco-bim-v1.1.6_GH0.tar.gz) = a6feb8b30acf960a29065b9ba4095fa03f4a265392805f7075b81d1c74dcafd7
+SIZE (octave-forge/carlodefalco-bim-v1.1.6_GH0.tar.gz) = 34627