diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile
index 26b28ab49488..0585ae6ee650 100644
--- a/audio/yoshimi/Makefile
+++ b/audio/yoshimi/Makefile
@@ -1,35 +1,33 @@
 PORTNAME=	yoshimi
 DISTVERSION=	2.2.2
 CATEGORIES=	audio
+MASTER_SITES=	SF/${PORTNAME}/${DISTVERSION:R}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sophisticated software synthesizer
 WWW=		https://yoshimi.github.io/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3 \
 		dssi>0:audio/dssi \
 		lv2>0:audio/lv2
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libfftw3f.so:math/fftw3-float \
 		libfltk.so:x11-toolkits/fltk \
 		libjack.so:audio/jack \
 		libmxml.so:textproc/mxml
 
-USES=		cmake compiler:c++14-lang gnome ncurses pkgconfig readline
+USES=		cmake compiler:c++14-lang gnome ncurses pkgconfig readline tar:bz2
 USE_GNOME=	cairo
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Yoshimi
-
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 LDFLAGS+=		-Wl,--as-needed
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/audio/yoshimi/distinfo b/audio/yoshimi/distinfo
index 7789896ddfdb..448e263df1b8 100644
--- a/audio/yoshimi/distinfo
+++ b/audio/yoshimi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662791822
-SHA256 (Yoshimi-yoshimi-2.2.2_GH0.tar.gz) = bc2a72f31efb38886e16e4637e9150c0876273172d664b4fd69f1092b3e4eaf9
-SIZE (Yoshimi-yoshimi-2.2.2_GH0.tar.gz) = 8038296
+TIMESTAMP = 1662795199
+SHA256 (yoshimi-2.2.2.tar.bz2) = 3552f2f19db88aa3322bdbecfca106dc1baecb4f09884b44750c23cae29480cb
+SIZE (yoshimi-2.2.2.tar.bz2) = 7792956