diff --git a/ports-mgmt/octopkg/Makefile b/ports-mgmt/octopkg/Makefile
index a04c94a44994..c06c966f15b3 100644
--- a/ports-mgmt/octopkg/Makefile
+++ b/ports-mgmt/octopkg/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	octopkg
-DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
+MASTER_SITES=	https://github.com/aarnt/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Graphical front-end to the FreeBSD pkg-ng package manager
 WWW=		https://tintaescura.com/projects/octopkg/
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++17-lang desktop-file-utils gl qmake qt:6
-USE_GITHUB=	yes
-GH_ACCOUNT=	aarnt
-USE_GL=		gl
+USE_GL=		opengl
 USE_LOCALE=	en_US.UTF-8
 USE_QT=		base tools
 
 PLIST_FILES=	bin/${PORTNAME} \
 		lib/${PORTNAME}/${PORTNAME}-doas \
 		share/applications/${PORTNAME}.desktop
 
 post-patch:
 	${REINPLACE_CMD} 's#/usr/lib#${PREFIX}/lib#' \
 		${WRKSRC}/src/strconstants.cpp
 	${REINPLACE_CMD} 's#/usr/local#${PREFIX}#' \
 		${WRKSRC}/src/constants.h \
 		${WRKSRC}/src/main.cpp
 
 do-configure:
 	cd ${WRKSRC} && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
 	cd ${WRKSRC}/doas && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 	cd ${WRKSRC}/doas && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/doas/${PORTNAME}-doas ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/octopkg/distinfo b/ports-mgmt/octopkg/distinfo
index 8be6a03d851c..80a4a470761f 100644
--- a/ports-mgmt/octopkg/distinfo
+++ b/ports-mgmt/octopkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694249222
-SHA256 (aarnt-octopkg-v0.3.3_GH0.tar.gz) = 6c36e1ee9d45aa362536eb8cdf65cdd494f63a7858642febbdbbbccc6301b614
-SIZE (aarnt-octopkg-v0.3.3_GH0.tar.gz) = 359261
+TIMESTAMP = 1695394369
+SHA256 (octopkg-0.3.3.tar.gz) = 6c36e1ee9d45aa362536eb8cdf65cdd494f63a7858642febbdbbbccc6301b614
+SIZE (octopkg-0.3.3.tar.gz) = 359261