diff --git a/graphics/ogre3d19/Makefile b/graphics/ogre3d19/Makefile
index cf81add138dc..f529250e78f1 100644
--- a/graphics/ogre3d19/Makefile
+++ b/graphics/ogre3d19/Makefile
@@ -1,10 +1,8 @@
 PORTNAME=	ogre3d
-PORTVERSION=	1.9.0
-PORTREVISION=	21
+DISTVERSION=	1.9.0
+PORTREVISION=	22
 CATEGORIES=	graphics devel
-MASTER_SITES=	https://bitbucket.org/sinbad/ogre/get/
 PKGNAMESUFFIX=	19
-DISTNAME=	v1-9-0
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Scene-oriented, flexible 3D engine written in C++ (legacy version 1.9)
@@ -13,12 +11,9 @@ WWW=		https://www.ogre3d.org/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-#BROKEN_aarch64=	does not compile: OgreMain/include/OgreStringConverter.h:126:23: class member cannot be redeclared
-#BROKEN_powerpc=	does not install
-#BROKEN_riscv64=	does not compile: OgreMain/include/OgreStringConverter.h:126:23: class member cannot be redeclared
-BROKEN=		Unfetchable
-DEPRECATED=	Unfetchable
-EXPIRATION_DATE=2025-03-31
+BROKEN_aarch64=	does not compile: OgreMain/include/OgreStringConverter.h:126:23: class member cannot be redeclared
+BROKEN_powerpc=	does not install
+BROKEN_riscv64=	does not compile: OgreMain/include/OgreStringConverter.h:126:23: class member cannot be redeclared
 
 LIB_DEPENDS=	libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
@@ -26,6 +21,10 @@ LIB_DEPENDS=	libfreeimage.so:graphics/freeimage \
 
 USES=		cmake compiler:c++11-lib gl pkgconfig sdl tar:bzip2 xorg
 USE_CXXSTD=	c++14
+USE_GITHUB=	yes
+GH_ACCOUNT=	OGRECave
+GH_PROJECT=	ogre
+GH_TAGNAME=	v${DISTVERSION:S/./-/g}
 USE_GL=		gl glu
 USE_LDCONFIG=	yes
 USE_SDL=	sdl
@@ -33,8 +32,6 @@ USE_XORG=	ice sm x11 xaw xext xrandr xt
 
 CONFLICTS=	ogre3d
 
-WRKSRC=		${WRKDIR}/sinbad-ogre-dd30349ea667
-
 OPTIONS_DEFINE=	BOOST DOCS
 OPTIONS_SUB=	yes
 
diff --git a/graphics/ogre3d19/distinfo b/graphics/ogre3d19/distinfo
index 68fa9e9f2465..2a7e6356fcbf 100644
--- a/graphics/ogre3d19/distinfo
+++ b/graphics/ogre3d19/distinfo
@@ -1,2 +1,3 @@
-SHA256 (v1-9-0.tar.bz2) = 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82
-SIZE (v1-9-0.tar.bz2) = 128098305
+TIMESTAMP = 1739716001
+SHA256 (OGRECave-ogre-1.9.0-v1-9-0_GH0.tar.gz) = 27843c1ff520e0c6b2b4ffafc90a435b7a9ef48a4c1347cbfed98b5fed7490ba
+SIZE (OGRECave-ogre-1.9.0-v1-9-0_GH0.tar.gz) = 131793709