diff --git a/multimedia/supersonic/Makefile b/multimedia/supersonic/Makefile
index 91dd4b70cb37..7d3f498c106f 100644
--- a/multimedia/supersonic/Makefile
+++ b/multimedia/supersonic/Makefile
@@ -1,44 +1,47 @@
 PORTNAME=	supersonic
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.21.1
-PORTREVISION=	4
+DISTVERSION=	0.22.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	dtxdf@FreeBSD.org
 COMMENT=	Lightweight cross-platform desktop client for Subsonic music servers
 WWW=		https://github.com/dweymouth/${PORTNAME}/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+# TODO: For wayland support.
+#BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libmpv.so:multimedia/mpv
 
 USES=		desktop-file-utils gl go:modules localbase:ldflags pkgconfig \
 		xorg
 USE_GL=		gl
 USE_XORG=	x11 xau xcb xcursor xdmcp xi
 GO_MODULE=	github.com/dweymouth/${PORTNAME}
+# TODO: Adding the 'wayland' tag won't compile. I need to investigate further to find out why.
+GO_BUILDFLAGS=	-tags "migrated_fynedo,x11"
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/supersonic-desktop.desktop \
 		share/icons/hicolor/128x128/apps/supersonic-desktop.png \
 		share/icons/hicolor/256x256/apps/supersonic-desktop.png \
 		share/icons/hicolor/512x512/apps/supersonic-desktop.png \
 		share/pixmaps/supersonic-desktop.png
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Exec=supersonic-desktop|Exec=supersonic|' \
 		${WRKSRC}/res/supersonic-desktop.desktop
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/res/supersonic-desktop.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 .for s in 128 256 512
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/res/appicon-${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/supersonic-desktop.png
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/res/appicon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/supersonic-desktop.png
 
 .include <bsd.port.mk>
diff --git a/multimedia/supersonic/distinfo b/multimedia/supersonic/distinfo
index 7a0866141ed3..64952f2be284 100644
--- a/multimedia/supersonic/distinfo
+++ b/multimedia/supersonic/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1779223935
-SHA256 (go/multimedia_supersonic/supersonic-v0.21.1/v0.21.1.mod) = a9381920c103e8ec207c00dfc135a110effffdb2810e77d3c48266ecfca65a22
-SIZE (go/multimedia_supersonic/supersonic-v0.21.1/v0.21.1.mod) = 3435
-SHA256 (go/multimedia_supersonic/supersonic-v0.21.1/v0.21.1.zip) = f5997a36db8c354fe2f53e13dfb64abe1b1a0a6ee057a2adc3139b0cd22b4102
-SIZE (go/multimedia_supersonic/supersonic-v0.21.1/v0.21.1.zip) = 65509917
+TIMESTAMP = 1787290327
+SHA256 (go/multimedia_supersonic/supersonic-v0.22.1/v0.22.1.mod) = a605ffd115c276e7f5c789f12745f41daf7f80e2deff82696f737dc9c80227e5
+SIZE (go/multimedia_supersonic/supersonic-v0.22.1/v0.22.1.mod) = 3343
+SHA256 (go/multimedia_supersonic/supersonic-v0.22.1/v0.22.1.zip) = 3bd80c669df326a8186fe93c7ddbb5989950da1f5af2cb4dee9b0fb8bfbf8229
+SIZE (go/multimedia_supersonic/supersonic-v0.22.1/v0.22.1.zip) = 67355452
diff --git a/multimedia/supersonic/files/patch-vendor_github.com_go-gl_glfw_v3.4_glfw_c__glfw__bsd.go b/multimedia/supersonic/files/patch-vendor_github.com_go-gl_glfw_v3.4_glfw_c__glfw__bsd.go
new file mode 100644
index 000000000000..3912233d1fed
--- /dev/null
+++ b/multimedia/supersonic/files/patch-vendor_github.com_go-gl_glfw_v3.4_glfw_c__glfw__bsd.go
@@ -0,0 +1,10 @@
+--- vendor/github.com/go-gl/glfw/v3.4/glfw/c_glfw_bsd.go.orig	2026-08-21 05:47:56 UTC
++++ vendor/github.com/go-gl/glfw/v3.4/glfw/c_glfw_bsd.go
+@@ -21,7 +21,6 @@ package glfw
+ 	#include "glfw/src/x11_window.c"
+ 	#include "glfw/src/glx_context.c"
+ #endif
+-#include "glfw/src/null_joystick.c"
+ #include "glfw/src/posix_module.c"
+ #include "glfw/src/posix_poll.c"
+ #include "glfw/src/posix_time.c"