diff --git a/audio/linuxwave/Makefile b/audio/linuxwave/Makefile
index fbe9442fc239..67068696cad8 100644
--- a/audio/linuxwave/Makefile
+++ b/audio/linuxwave/Makefile
@@ -1,39 +1,57 @@
 PORTNAME=	linuxwave
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	audio
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	bbb9a15b41ed.patch:-p1 # https://github.com/orhun/linuxwave/pull/28
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Generate music from the entropy of Linux
 WWW=		https://orhun.dev/linuxwave/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	zig010>=0.10.0:lang/zig010
+BUILD_DEPENDS=	zig>=0.12.0:lang/zig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	orhun
-GH_TUPLE=	Hejsil:zig-clap:0.6.0:zig_clap/libs/zig-clap
+GH_TUPLE=	Hejsil:zig-clap:0.8.0:zig_clap/libs/zig-clap
 MAKE_ENV=	DESTDIR="${STAGEDIR}"
 CONFIGURE_ARGS=	--prefix "${PREFIX}" \
-		${WITH_DEBUG:D:U-Drelease-fast} \
+		${WITH_DEBUG:D:U-Doptimize=ReleaseFast} \
 		${WITH_PIE:D-Dpie} \
 		${WITH_RELRO:D-Drelro} \
 		-Dcpu=${CPUTYPE:Ubaseline} \
 		--verbose
 NO_INSTALL=	yes # strip(1) breaks runtime
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
+pre-patch:
+.if defined(PATCHFILES) && ${PATCHFILES:Mbbb9a15b41ed*}
+# Pretend to be a regular file for vendor patch to apply as is
+	@${MV} ${WRKSRC}/libs/zig-clap ${WRKSRC}/libs/zig-clap.moved
+	@${ECHO_CMD} "Subproject commit 749c43f1f846adc950a5920ed61b40cbc3ec2c54" \
+		>${WRKSRC}/libs/zig-clap
+.endif
+
+post-patch:
+.if defined(PATCHFILES) && ${PATCHFILES:Mbbb9a15b41ed*}
+	@${RM} ${WRKSRC}/libs/zig-clap
+	@${MV} ${WRKSRC}/libs/zig-clap.moved ${WRKSRC}/libs/zig-clap
+.endif
+
 do-build:
 	@(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS})
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-test:
 	@(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS})
 
 .include <bsd.port.mk>
diff --git a/audio/linuxwave/distinfo b/audio/linuxwave/distinfo
index ed3a167ef65c..7d2d02ee64cb 100644
--- a/audio/linuxwave/distinfo
+++ b/audio/linuxwave/distinfo
@@ -1,5 +1,7 @@
 TIMESTAMP = 1689941107
 SHA256 (orhun-linuxwave-v0.1.5_GH0.tar.gz) = c3cbbca353c1cbe837a55b28e35a26d963ad7a4264f677cdd033bdb545447e32
 SIZE (orhun-linuxwave-v0.1.5_GH0.tar.gz) = 372387
-SHA256 (Hejsil-zig-clap-0.6.0_GH0.tar.gz) = 07c426248a729fbd443d3cc42c70c6bcf5bd2a18cf6a08ab9097f31a397a374f
-SIZE (Hejsil-zig-clap-0.6.0_GH0.tar.gz) = 21914
+SHA256 (Hejsil-zig-clap-0.8.0_GH0.tar.gz) = 82c43de5298c38e513220c9986ae48154817bc8a7abe525f5d5e26eb0086b3c1
+SIZE (Hejsil-zig-clap-0.8.0_GH0.tar.gz) = 22573
+SHA256 (bbb9a15b41ed.patch) = 6bf0b34cd1c24552e70c37e3660bceafaed2444985c639e6eec0445297abc823
+SIZE (bbb9a15b41ed.patch) = 20938