diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 4ac71a68ce6f..6072297eb32b 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	baresip
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.21.0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	herbert@gojira.at
@@ -75,7 +76,7 @@ G711_VARS=		_MODULES_LIST+=g711
 G722_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 G722_VARS=		_MODULES_LIST+=g722
 G726_LIB_DEPENDS=	libspandsp.so:comms/spandsp
-G722_VARS=		_MODULES_LIST+=g726
+G726_VARS=		_MODULES_LIST+=g726
 GST_USES=		gnome gstreamer:1
 GST_VARS=		USE_GNOME+=glib20
 MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
@@ -83,7 +84,7 @@ MQTT_VARS=		_MODULES_LIST+=mqtt
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_VARS=		_MODULES_LIST+=opus
 OPUS_MS_LIB_DEPENDS=	libopus.so:audio/opus
-OPUS_VARS=		_MODULES_LIST+=opus_multistream
+OPUS_MS_VARS=		_MODULES_LIST+=opus_multistream
 PLC_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 PLC_VARS=		_MODULES_LIST+=plc
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
diff --git a/audio/baresip/pkg-plist b/audio/baresip/pkg-plist
index b822d5806886..93bbef0d4d36 100644
--- a/audio/baresip/pkg-plist
+++ b/audio/baresip/pkg-plist
@@ -21,6 +21,7 @@ lib/baresip/modules/ebuacip.so
 lib/baresip/modules/echo.so
 lib/baresip/modules/fakevideo.so
 %%G711%%lib/baresip/modules/g711.so
+%%G722%%lib/baresip/modules/g722.so
 %%G726%%lib/baresip/modules/g726.so
 lib/baresip/modules/httpd.so
 lib/baresip/modules/httpreq.so
@@ -33,6 +34,7 @@ lib/baresip/modules/mixminus.so
 lib/baresip/modules/mwi.so
 lib/baresip/modules/natpmp.so
 lib/baresip/modules/netroam.so
+%%OPUS%%lib/baresip/modules/opus.so
 %%OPUS_MS%%lib/baresip/modules/opus_multistream.so
 lib/baresip/modules/pcp.so
 %%PLC%%lib/baresip/modules/plc.so