diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 7efec4c758b..5a0c9b5002a 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,25 +1,19 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=2.7.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk
- SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
+ DESTDIR=${DESTDIR} V=1 LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
+ SYSROOT=${XBPS_CROSS_BASE}/usr SYSROOT_LOCAL=${XBPS_CROSS_BASE}/usr
  LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib LIBDIR=/usr/lib${XBPS_TARGET_WORDSIZE}
- USE_SNAPSHOT=$(vopt_if video yes) USE_ALSA=yes USE_GST=yes USE_GST_VIDEO=yes
- USE_OSS=yes USE_SDL=yes $(vopt_if video '' 'USE_AVCODEC=tes USE_AVFORMAT=yes
- USE_SDL2=yes USE_V4L2=yes USE_VIDEO=yes USE_VPX=yes USE_X11=yes')
- $(vopt_if gtk '' 'USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes')"
+ USE_ALSA=y USE_GST=y USE_GST_VIDEO=y USE_OSS=y USE_SDL=y"
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config glib-devel"
 makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
- tiff-devel twolame-devel
- $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel
- v4l-utils-devel x265-devel libXext-devel')
- $(vopt_if gtk 'cairo-devel gst-plugins-base1-devel gstreamer1-devel
- gtk+-devel mpg123-devel') sndio-devel"
+ tiff-devel twolame-devel sndio-devel"
 short_desc="Modular SIP User-Agent with audio and video support"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
@@ -29,10 +23,23 @@ distfiles="https://github.com/baresip/baresip/archive/refs/tags/v${version}.tar.
 checksum=6bc3ac1b2a301b6de91a40079a9ec44545a00c57662ca0bdf2518fbb932ff181
 
 # Package build options
-build_options="gtk video"
-build_options_default="gtk video"
+build_options="gtk3 video"
+build_options_default="gtk3 video"
 desc_option_video="Enable support for video calling"
 
+if [ "$build_option_video" ]; then
+	make_build_args+=" USE_SNAPSHOT=y USE_AVCODEC=y USE_AVFORMAT=y
+	 USE_SDL2=y USE_V4L2=y USE_VIDEO=y USE_VPX=y USE_X11=y"
+	makedepends+=" SDL2-devel ffmpeg-devel libvpx-devel libX11-devel
+	 v4l-utils-devel x265-devel libXext-devel"
+fi
+
+if [ "$build_option_gtk3" ]; then
+	make_build_args+=" USE_GST1=y USE_GST_VIDEO1=y USE_GTK=y"
+	makedepends+=" cairo-devel gst-plugins-base1-devel gstreamer1-devel
+	 gtk+3-devel mpg123-devel"
+fi
+
 case $XBPS_TARGET_MACHINE in
 	i686*) arch="i686";;
 	x86_64*) arch="x86_64";;