diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile
index ef5f390b49ca..0604586788ae 100644
--- a/audio/bambootracker/Makefile
+++ b/audio/bambootracker/Makefile
@@ -1,73 +1,69 @@
 PORTNAME=	bambootracker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1-19
-DISTVERSIONSUFFIX=	-g9bf6c7a0
+DISTVERSION=	0.6.2
 CATEGORIES=	audio
+MASTER_SITES=	https://github.com/BambooTracker/BambooTracker/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
+DISTNAME=	BambooTracker-src-${DISTVERSIONPREFIX}${DISTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Music tracker for the Yamaha YM2608 (OPNA) sound chip
 WWW=		https://github.com/rerrahkr/BambooTracker
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	librtaudio.so:audio/rtaudio \
 		librtmidi.so:audio/rtmidi
 
 USES=		compiler:c++14-lang desktop-file-utils gl qmake qt:5 \
 		shared-mime-info xorg
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	BambooTracker
-GH_PROJECT=	BambooTracker
-GH_TUPLE=	thestk:rtaudio:0e11b50a:rtaudio/submodules/RtAudio/src \
-		thestk:rtmidi:d2dd50da:rtmidi/submodules/RtMidi/src \
-		rerrahkr:emu2149:63c0fe07:emu2149/submodules/emu2149/src
-
 USE_GL=		gl
 USE_QT=		buildtools core gui multimedia network widgets \
 		linguisttools:build
 
 DATADIR=	${PREFIX}/share/BambooTracker
 DOCSDIR=	${PREFIX}/share/doc/BambooTracker
 EXAMPLESDIR=	${PREFIX}/share/examples/BambooTracker
 
+WRKSRC=		${WRKDIR}/BambooTracker-src-${DISTVERSIONPREFIX}${DISTVERSION}
+
 OPTIONS_DEFINE=		ALSA EXAMPLES JACK NLS PULSEAUDIO
 OPTIONS_DEFAULT=	PULSEAUDIO
 OPTIONS_SUB=		yes
 
 ALSA_DESC=	ALSA audio architecture support (EXPERIMENTAL)
 JACK_DESC=	JACK audio server support (EXPERIMENTAL)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
 QMAKE_ARGS+=	CONFIG+="use_alsa"
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
 QMAKE_ARGS+=	CONFIG+="jack_has_rename" CONFIG+="use_jack"
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 QMAKE_ARGS+=	CONFIG+="use_pulse"
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${MANPREFIX}/share/man/man1
 	${MV} ${STAGEDIR}${PREFIX}/share/BambooTracker/demos/* ${STAGEDIR}${EXAMPLESDIR}/
 	${MV} ${STAGEDIR}${MANPREFIX}/share/man/en/man1/BambooTracker.1 ${STAGEDIR}${MANPREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/BambooTracker/demos
 	${RMDIR} ${STAGEDIR}${MANPREFIX}/share/man/en/man1
 	${RMDIR} ${STAGEDIR}${MANPREFIX}/share/man/en
 
 # maintainer targets
 try-latest: clean extract
 	@${RM} -rf ${WRKSRC}
 	@git clone --recurse-submodules https://github.com/BambooTracker/BambooTracker.git ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/audio/bambootracker/distinfo b/audio/bambootracker/distinfo
index a44d3a08bce3..47d9c5d88485 100644
--- a/audio/bambootracker/distinfo
+++ b/audio/bambootracker/distinfo
@@ -1,9 +1,3 @@
-TIMESTAMP = 1690874252
-SHA256 (BambooTracker-BambooTracker-v0.6.1-19-g9bf6c7a0_GH0.tar.gz) = b24def593700eb649fbb36a5d7c247bf437441f7928158e5238f8567f11c83ea
-SIZE (BambooTracker-BambooTracker-v0.6.1-19-g9bf6c7a0_GH0.tar.gz) = 1067002
-SHA256 (thestk-rtaudio-0e11b50a_GH0.tar.gz) = a3494753bf133ceb6fc70365e3492877a98cc48c58b1c681806101bf0b7f2483
-SIZE (thestk-rtaudio-0e11b50a_GH0.tar.gz) = 254679
-SHA256 (thestk-rtmidi-d2dd50da_GH0.tar.gz) = fed7ad5852a8b0e58e989f0eb3d9485ad671a6f5adf58865a03a668851b4f285
-SIZE (thestk-rtmidi-d2dd50da_GH0.tar.gz) = 93519
-SHA256 (rerrahkr-emu2149-63c0fe07_GH0.tar.gz) = c13a24ca92821f9472e6bbeafa683ffddca358f5164b2505d505ed4d6628c4ba
-SIZE (rerrahkr-emu2149-63c0fe07_GH0.tar.gz) = 4351
+TIMESTAMP = 1690990569
+SHA256 (BambooTracker-src-v0.6.2.tar.gz) = 96b38865131ea188a55bdd5ef0da66ce7c8f00b93407bf9569506fee019b93d5
+SIZE (BambooTracker-src-v0.6.2.tar.gz) = 1404503