diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index f4320a1eb11..a37b9d08f14 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,23 +1,29 @@
 # Template file for 'guitarix2'
 pkgname=guitarix2
-version=0.36.1
+version=0.37.1
 revision=1
 wrksrc="guitarix-${version}"
 build_style=waf
-configure_args="--no-faust --no-lv2"
-hostmakedepends="python pkg-config intltool gperf"
-makedepends="boost-devel gtkmm2-devel liblrdf-devel eigen
- libbluetooth-devel zita-convolver-devel zita-resampler-devel jack-devel
- libsndfile-devel fftw-devel ladspa-sdk lilv-devel sratom-devel avahi-glib-libs-devel"
+configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust --no-lv2
+ $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')"
+make_build_args="--progress"
+hostmakedepends="gperf intltool pkg-config"
+makedepends="boost-devel eigen fftw-devel gtkmm2-devel jack-devel
+ ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel sratom-devel
+ zita-convolver-devel zita-resampler-devel
+ $(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)"
 depends="desktop-file-utils"
-maintainer="cr6git <quark6@protonmail.com>"
 short_desc="Virtual guitar amplifier running on Jack Audio Connection Kit"
+maintainer="cr6git <quark6@protonmail.com>"
+license="GPL-3.0-or-later"
 homepage="http://guitarix.org"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz"
-checksum=608d641bebed88691b2f2154606bc99d0785565b6c0e2d7b29c70ac86522a9bc
+checksum=51a9375ef12e0e7242c7a346253fcf7f296d55fcd2a88f1c7fa93fdcbf049318
+
+build_options="avahi bluez"
+desc_option_avahi="Build with avahi support"
+desc_option_bluez="Build with bluez support"
 
-CFLAGS="-fpermissive"
 CXXFLAGS="-fpermissive"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -29,7 +35,7 @@ if [ -n "$CROSS_BUILD" ]; then
 	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/raptor2"
 	post_extract() {
 		# don’t test load the ladspa plugin when cross compiling
-		sed -i -e "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript
+		sed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript
 	}
 fi