diff --git a/audio/guitarix-lv2/Makefile b/audio/guitarix-lv2/Makefile
index 26287aae9155..4538426cb744 100644
--- a/audio/guitarix-lv2/Makefile
+++ b/audio/guitarix-lv2/Makefile
@@ -1,69 +1,74 @@
 PORTNAME=	guitarix
+DISTVERSIONPREFIX=	V
 DISTVERSION=	0.44.1
 PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/
-PKGNAMESUFFIX=	-lv2
-DISTNAME=	${PORTNAME}2-${DISTVERSION}
+
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	53560efbbc44a971b7b10290d96b059b67c71eed.patch:-p2
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Virtual versatile amplification for Jack and set of LV2 plugins
 WWW=		https://sourceforge.net/projects/guitarix/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		faust:audio/faust \
 		${LOCALBASE}/include/fftw3.h:math/fftw3 \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		sassc:textproc/sassc \
 		ladspa>0:audio/ladspa # https://sourceforge.net/p/guitarix/bugs/61/
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libfftw3f.so:math/fftw3-float \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjack.so:audio/jack \
 		liblilv-0.so:audio/lilv \
 		liblo.so:audio/liblo \
 		liblrdf.so:textproc/liblrdf \
 		libserd-0.so:devel/serd \
 		libsndfile.so:audio/libsndfile \
 		libsord-0.so:devel/sord \
 		libsratom-0.so:audio/sratom \
 		libzita-convolver.so:audio/zita-convolver \
 		libzita-resampler.so:audio/zita-resampler
 RUN_DEPENDS=	roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf
 
 USES=		compiler:c++11-lang eigen:3 gnome libarchive localbase:ldflags \
 		pkgconfig python:build readline shebangfix waf xorg tar:xz
 USE_GNOME=	atkmm cairo gtk30 gtkmm30 gdkpixbuf2 pangomm
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_BINUTILS=	yes # linking needs some GNU features, fails on 12 without this, see https://github.com/brummer10/GxPlugins.lv2/issues/9
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	brummer10
+
 SHEBANG_FILES=	tools/coverage tools/dsp2cc tools/dsp2insert tools/dsp2insert tools/tube_transfer.py # see https://github.com/brummer10/guitarix/issues/97
 
 CONFIGURE_ARGS=	--enable-lfs --ldflags="${LDFLAGS}" --jack-session
 
 LDFLAGS+=	-B${LOCALBASE}/bin # Use ld provided by USE_BINUTILS for GNU features, otherwise GNU ld isn't called
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+WRKSRC_SUBDIR=	trunk
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD} ld=${LOCALBASE}/bin/ld
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 NLS_USE=	GNOME=intltool
 
 post-install:
 	# strip, see https://sourceforge.net/p/guitarix/bugs/60/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/guitarix
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/audio/guitarix-lv2/distinfo b/audio/guitarix-lv2/distinfo
index b200352e0a3e..c0db8bc3591e 100644
--- a/audio/guitarix-lv2/distinfo
+++ b/audio/guitarix-lv2/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1651601911
-SHA256 (guitarix2-0.44.1.tar.xz) = 77e83d754f51ac38c5423f38eeb55de5b3e26128e60b511b02d2defcf36e6c18
-SIZE (guitarix2-0.44.1.tar.xz) = 71754176
+TIMESTAMP = 1677683937
+SHA256 (brummer10-guitarix-V0.44.1_GH0.tar.gz) = 88f1206233b8b3eae4a021daab926c86cb559bda2059fe2a5ed2c745daa146c1
+SIZE (brummer10-guitarix-V0.44.1_GH0.tar.gz) = 94638472
+SHA256 (53560efbbc44a971b7b10290d96b059b67c71eed.patch) = b6738405f3894236986541497aa313f4e761c365f6199e6101288e03f9040c7d
+SIZE (53560efbbc44a971b7b10290d96b059b67c71eed.patch) = 2282