diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index 3a6557d5f134..811940b9d1f6 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -1,62 +1,61 @@
 # Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
 
 PORTNAME=	jfsw
-PORTVERSION=	20210130
-PORTREVISION=	3
+PORTVERSION=	20211225
 CATEGORIES=	games
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Jonathon Fowler's Shadow Warrior Port
 
 # Must be distributed only through the Internet and free of charge
 LICENSE=	GPLv2 BuildLic
 LICENSE_COMB=	multi
 LICENSE_NAME_BuildLic=	Build source code license
 LICENSE_FILE_BuildLic=	${WRKSRC}/jfbuild/buildlic.txt
 LICENSE_PERMS_BuildLic=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libfluidsynth.so:audio/fluidsynth
 
 USES=		alias compiler:c++11-lang dos2unix gl gmake gnome \
 		perl5 pkgconfig:build sdl
 USE_GL=		gl
 USE_GNOME=	gtk20
 USE_SDL=	mixer2 sdl2
 USE_PERL5=	build
 
 DOS2UNIX_REGEX=	.*(\.(c|h)|Makefile)(\.deps)?
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonof
 GH_PROJECT=	jfbuild:build jfaudiolib:audio jfmact:mact
 # See GH listing to get current (tested) submodule hashes:
 # https://github.com/jonof/jfsw
-GH_TAGNAME=	c434002 \
-		ed8c505:build \
-		0b82be9:audio \
-		1149eb1:mact
+GH_TAGNAME=	426fc18 \
+		ab02edc:build \
+		0e94055:audio \
+		14340ff:mact
 GH_SUBDIR=	jfbuild:build jfaudiolib:audio jfmact:mact
 
 MAKE_ENV+=	DATADIR="${DATADIR}"
 
 SUB_FILES=	pkg-message
 
 PORTDOCS=	README.md releasenotes.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' \
 		${WRKSRC}/jfbuild/Makefile
 	@${REINPLACE_CMD} 's|/usr|${LOCALBASE}|' \
 		${WRKSRC}/jfaudiolib/src/driver_fluidsynth.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sw ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/build ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-build
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/jfsw/distinfo b/games/jfsw/distinfo
index a174e4e199d7..43000a798d08 100644
--- a/games/jfsw/distinfo
+++ b/games/jfsw/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1614118422
-SHA256 (jonof-jfsw-20210130-c434002_GH0.tar.gz) = 34bd7c109b53b9df63aaef84c7b3a3e9fe775927e5402b6bece4206b626027f9
-SIZE (jonof-jfsw-20210130-c434002_GH0.tar.gz) = 1031571
-SHA256 (jonof-jfbuild-ed8c505_GH0.tar.gz) = 2c346e6ad5914e5fe1517c04ea13295b9cae9bf82131321c070fafefc4ca8d6f
-SIZE (jonof-jfbuild-ed8c505_GH0.tar.gz) = 1538705
-SHA256 (jonof-jfaudiolib-0b82be9_GH0.tar.gz) = 2d3478443ce37b69fe3311f755923324bdf5081787534d2b03e75dccc247f8ce
-SIZE (jonof-jfaudiolib-0b82be9_GH0.tar.gz) = 1483069
-SHA256 (jonof-jfmact-1149eb1_GH0.tar.gz) = f47c85d73feda14c709af0cb67137641b8d0d0f91bd62590e70babee7f5d9b18
-SIZE (jonof-jfmact-1149eb1_GH0.tar.gz) = 25492
+TIMESTAMP = 1641939106
+SHA256 (jonof-jfsw-20211225-426fc18_GH0.tar.gz) = 35acab2473256e40eeed7da398ed7cf790c05ea9c48013eaa6f5d3f0663ec53a
+SIZE (jonof-jfsw-20211225-426fc18_GH0.tar.gz) = 1058411
+SHA256 (jonof-jfbuild-ab02edc_GH0.tar.gz) = 6429e43443b7e2f2a3df6c47f1e915d4595d56321aafa32f59dbac4126866aac
+SIZE (jonof-jfbuild-ab02edc_GH0.tar.gz) = 1540887
+SHA256 (jonof-jfaudiolib-0e94055_GH0.tar.gz) = 2b53dd0986046fae38f50c05fb16026a050917afc8bac2debce5f0acc54f0f8a
+SIZE (jonof-jfaudiolib-0e94055_GH0.tar.gz) = 1519239
+SHA256 (jonof-jfmact-14340ff_GH0.tar.gz) = e9c8e30f2f5851b308819f651c881183a1eaf9a4067181e281dce56b660bc57f
+SIZE (jonof-jfmact-14340ff_GH0.tar.gz) = 25556