diff --git a/audio/schismtracker/Makefile b/audio/schismtracker/Makefile
index e39abe4a1fc0..dfe6b5847e30 100644
--- a/audio/schismtracker/Makefile
+++ b/audio/schismtracker/Makefile
@@ -1,37 +1,35 @@
 PORTNAME=	schismtracker
-DISTVERSION=	20240529
-DISTVERSIONSUFFIX=	.source
+DISTVERSION=	20240609
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/schismtracker/schismtracker/releases/download/${PORTVERSION}/
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Module tracker editor/player resembling impulse tracker
-WWW=		https://schismtracker.org/
+WWW=		https://schismtracker.org/ \
+		https://github.com/schismtracker/schismtracker
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libFLAC.so:audio/flac
 
-USES=		compiler:c++11-lib desktop-file-utils localbase pkgconfig \
-		python sdl xorg
+USES=		autoreconf compiler:c++11-lib desktop-file-utils localbase \
+		pkgconfig python sdl xorg
+USE_GITHUB=	yes
 USE_SDL=	sdl2
 USE_XORG=	x11 xext xv
 GNU_CONFIGURE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
 PLIST_FILES=	bin/schismtracker \
 		share/applications/schism.desktop \
 		share/man/man1/schismtracker.1.gz \
 		share/pixmaps/schism-icon-128.png \
 		share/pixmaps/schism-itf-icon-128.png
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/sys/fd.org/*.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/icons/schism-icon-128.png \
 		${WRKSRC}/icons/schism-itf-icon-128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/audio/schismtracker/distinfo b/audio/schismtracker/distinfo
index 1156fd7255f0..8af2b0c925dd 100644
--- a/audio/schismtracker/distinfo
+++ b/audio/schismtracker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717326458
-SHA256 (schismtracker-20240529.source.tar.gz) = 3bd6e5f77bb57845084019bc6c44633ae46a5cddc8be0c27d8e5bcacda60a5a2
-SIZE (schismtracker-20240529.source.tar.gz) = 1189815
+TIMESTAMP = 1718134024
+SHA256 (schismtracker-schismtracker-20240609_GH0.tar.gz) = 83d73236c3d9d30353371bb38380010bed2d0fec15adb77fe1e04e3394535350
+SIZE (schismtracker-schismtracker-20240609_GH0.tar.gz) = 1071047