diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 4958c9e491e2..aad8b7b35a76 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -1,135 +1,136 @@
 PORTNAME=	gnash
 PORTVERSION=	0.8.11.20190130
 PORTREVISION=	4
 CATEGORIES=	graphics multimedia
-MASTER_SITES=	https://cgit.git.savannah.gnu.org/cgit/gnash.git/snapshot/
-DISTNAME=	gnash-583ccbc1275c7701dc4843ec12142ff86bb305b4
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNU Flash movie player
 WWW=		https://www.gnu.org/software/gnash/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libnspr4.so:devel/nspr \
 		libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl \
 		libspeex.so:audio/speex \
 		libspeexdsp.so:audio/speexdsp \
 		libboost_thread.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libavcodec.so.58:multimedia/ffmpeg4 \
 		libtheora.so:multimedia/libtheora \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libdca.so:multimedia/libdca \
 		libgsm.so:audio/gsm \
 		libcairo.so:graphics/cairo \
 		libdc1394.so:multimedia/libdc1394
 
 USES=		cpe tar:bzip2 compiler:c++11-lang autoreconf gmake libtool \
 		pkgconfig jpeg gnome gl sdl desktop-file-utils xorg localbase:ldflags
 CPE_VENDOR=	gnu
+USE_GITHUB=	yes
 USE_CSTD=	gnu11
 USE_CXXSTD=	c++11
 USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm xv
 USE_GNOME=	atk gdkpixbuf gtk20 libxml2 pango
 USE_GL=		egl
 USE_SDL=	sound2
+GH_ACCOUNT=	GitMirroring
+GH_PROJECT=	gnash
+GH_TAGNAME=	583ccbc1
 GNU_CONFIGURE=	yes
 
 SYSCONFIGDIR=	${PREFIX}/etc
 
 # jemalloc leads to infinite recursion on FreeBSD
 CFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
 CPPFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
 LDFLAGS+=	-L${LOCALBASE}/ffmpeg4/lib
 CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl2-config
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
 		--with-plugins-install=prefix \
 		--sysconfdir="${SYSCONFIGDIR}" \
 		--enable-gui=gtk \
 		--enable-renderer=cairo \
 		--enable-media=ffmpeg \
 		--enable-sound=sdl \
 		--with-ffmpeg-incl="${LOCALBASE}/ffmpeg4/include/libavcodec" \
 		--with-ffmpeg-lib=${LOCALBASE}/ffmpeg4/lib \
 		--disable-testsuite \
 		--disable-kparts3 \
 		--disable-jemalloc \
 		--without-gconf
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-#MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include/ffmpeg"
+#MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include/ffmpeg4"
 
 GNASHVER=	0.8.11dev
 CONFIG_FILES=	gnashpluginrc gnashrc
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
 PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
 OPTIONS_DEFINE=	CYGNAL VAAPI DOCS NLS
 OPTIONS_SINGLE=	MEDIA RENDERER
 OPTIONS_DEFAULT=VAAPI
 
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 CYGNAL_DESC=	Cygnal media server
 VAAPI_DESC=	VAAPI support
 
 CYGNAL_CONFIGURE_ENABLE=	cygnal
 VAAPI_CPPFLAGS=	-I../libdevice/vaapi
 
 .include <bsd.port.options.mk>
 
 # Cygnal option processing
 .if ${PORT_OPTIONS:MCYGNAL}
 CONFIG_FILES+=	cygnalrc
 .endif
 
 # NLS option processing (not sure if --disable-nls actually has any effect)
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 CONFIGURE_ARGS+=	--disable-npapi --disable-kparts4
 
 #
 # Hardware acceleration options processing
 #
 .if ${PORT_OPTIONS:MVAAPI}
 LIB_DEPENDS+=		libva.so:multimedia/libva
 CONFIGURE_ARGS+=	--enable-device=egl,x11,vaapi
 .else
 CONFIGURE_ARGS+=	--enable-hwaccel=none # XVideo
 CONFIGURE_ARGS+=	--enable-device=egl,x11
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|lib64|lib|g' -e 's|lib32|lib|g' \
 		${WRKSRC}/macros/libslist
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 			-e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/macros/incllist
 	${REINPLACE_CMD} -e 's|CODEC_ID_|AV_CODEC_ID_|' \
 		${WRKSRC}/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.cpp
 
 post-install:
 	# eglinfo conflicts with mesa-demos
 	${MV} ${STAGEDIR}/${PREFIX}/bin/eglinfo ${STAGEDIR}/${PREFIX}/bin/eglinfo-gnash
 .for conf in ${CONFIG_FILES}
 	${MV} ${STAGEDIR}/${SYSCONFIGDIR}/${conf} ${STAGEDIR}${SYSCONFIGDIR}/${conf}.dist
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gnash/distinfo b/graphics/gnash/distinfo
index 9ee378e54aa6..691739f096eb 100644
--- a/graphics/gnash/distinfo
+++ b/graphics/gnash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744962947
-SHA256 (gnash-583ccbc1275c7701dc4843ec12142ff86bb305b4.tar.bz2) = c66214d99778bcf3d03057760d16525c817c6cf4b88acfc3a014950222cd64f2
-SIZE (gnash-583ccbc1275c7701dc4843ec12142ff86bb305b4.tar.bz2) = 4866740
+TIMESTAMP = 1768326550
+SHA256 (GitMirroring-gnash-0.8.11.20190130-583ccbc1_GH0.tar.gz) = 40e4752d3baf4fffb442ce9614902b7235c876deb2b1afee2c8f0dbf75c226ef
+SIZE (GitMirroring-gnash-0.8.11.20190130-583ccbc1_GH0.tar.gz) = 6237516