diff --git a/audio/cyanrip/Makefile b/audio/cyanrip/Makefile
index 74581563a8f5..51e030a13779 100644
--- a/audio/cyanrip/Makefile
+++ b/audio/cyanrip/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	cyanrip
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.3.1
-PORTREVISION=	4
+#DISTVERSIONPREFIX=	v
+#DISTVERSION=	0.9.3.1
+DISTVERSION=	0.9.4-rc2.20260821
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/cyanreg/${PORTNAME}/releases/download/${DISTVERSIONFULL}/
-DISTNAME=	${PORTNAME}-src-${DISTVERSIONFULL}
-
-PATCH_SITES=	https://github.com/cyanreg/cyanrip/commit/
-PATCHFILES=	70c0a4c04d5ce74135719cf8afc1309b29679395.patch:-p1 \
-		8cae5f548a606bfd723fbcfccabcd5da189063cb.patch:-p1 \
-		462a71c75b4d326c0ce787cd13f7048e7f5da630.patch:-p1 \
-		7f74e52f278fd9d8474b1afb5979b9ecd525285e.patch:-p1
+#MASTER_SITES=	https://github.com/cyanreg/${PORTNAME}/releases/download/${DISTVERSIONFULL}/
+#DISTNAME=	${PORTNAME}-src-${DISTVERSIONFULL}
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	Audio CD ripper with command-line interface and focus on accuracy
 WWW=		https://github.com/cyanreg/cyanrip
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libcdio.so:sysutils/libcdio \
 		libcdio_paranoia.so:sysutils/libcdio-paranoia \
 		libcurl.so:ftp/curl \
-		libmusicbrainz5.so:audio/libmusicbrainz5
+		libmusicbrainz5.so:audio/libmusicbrainz5 \
+		libqrencode.so:graphics/libqrencode
+
+USES=		localbase:ldflags meson pkgconfig
 
-USES=		localbase meson pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	cyanreg
+GH_TAGNAME=	f8ebf48fc0d6926796c785fe2dbd9dec54ac15a5
 
-NO_WRKSUBDIR=	yes
+#NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	bin/cyanrip
+PLIST_FILES=	bin/cyanrip \
+		share/metainfo/com.github.cyanreg.cyanrip.metainfo.xml
 
 .include <bsd.port.mk>
diff --git a/audio/cyanrip/distinfo b/audio/cyanrip/distinfo
index 4702781816f4..93c80e68b85a 100644
--- a/audio/cyanrip/distinfo
+++ b/audio/cyanrip/distinfo
@@ -1,11 +1,3 @@
-TIMESTAMP = 1755935295
-SHA256 (cyanrip-src-v0.9.3.1.tar.gz) = fa7bc916ff91a17992b1695fa40dcb17eeeb840cd65c0cf26c1f1ddbc11f42eb
-SIZE (cyanrip-src-v0.9.3.1.tar.gz) = 66339
-SHA256 (70c0a4c04d5ce74135719cf8afc1309b29679395.patch) = 427a068b6ff44f844eda78136a131259261ce23630b5bf770f7d08051339c729
-SIZE (70c0a4c04d5ce74135719cf8afc1309b29679395.patch) = 2072
-SHA256 (8cae5f548a606bfd723fbcfccabcd5da189063cb.patch) = e6045c6fd3d0b09cd26b21655276dfe81bf5ed4bff8ef965174f101fd25f2fc6
-SIZE (8cae5f548a606bfd723fbcfccabcd5da189063cb.patch) = 3486
-SHA256 (462a71c75b4d326c0ce787cd13f7048e7f5da630.patch) = ad973febf87284d24a4b3d51b4592be86384b7b79fc090c34b0827a126daf000
-SIZE (462a71c75b4d326c0ce787cd13f7048e7f5da630.patch) = 3206
-SHA256 (7f74e52f278fd9d8474b1afb5979b9ecd525285e.patch) = 77cae197fa1a3e67485d82961113d36773d619b7a7a69a95afbdb5fed6f3202b
-SIZE (7f74e52f278fd9d8474b1afb5979b9ecd525285e.patch) = 3792
+TIMESTAMP = 1787395801
+SHA256 (cyanreg-cyanrip-0.9.4-rc2.20260821-f8ebf48fc0d6926796c785fe2dbd9dec54ac15a5_GH0.tar.gz) = 4be3a8e9fdce62f682b24d51f8b120d3f56429430d466720814445cb18ad3c33
+SIZE (cyanreg-cyanrip-0.9.4-rc2.20260821-f8ebf48fc0d6926796c785fe2dbd9dec54ac15a5_GH0.tar.gz) = 3177895