diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
index efbfee2b1c18..ea8f3407bfe2 100644
--- a/gnustep-apps/sogo/metadata.xml
+++ b/gnustep-apps/sogo/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="activesync">Build the ActiveSync support code</flag>
+		<flag name="sodium">Enable support for Argon2 password schemes using <pkg>dev-libs/libsodium</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">inverse-inc/sogo</remote-id>
diff --git a/gnustep-apps/sogo/sogo-5.1.1.ebuild b/gnustep-apps/sogo/sogo-5.1.1.ebuild
index 61f0f3783496..4738c446bcdd 100644
--- a/gnustep-apps/sogo/sogo-5.1.1.ebuild
+++ b/gnustep-apps/sogo/sogo-5.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="activesync gnutls +ssl"
+IUSE="activesync gnutls +ssl sodium"
 
 RDEPEND="
 	acct-user/sogo
@@ -25,6 +25,7 @@ RDEPEND="
 	!gnutls? (
 		dev-libs/openssl:0=
 	)
+	sodium? ( dev-libs/libsodium:= )
 "
 DEPEND="${RDEPEND}
 	>=gnustep-base/gnustep-make-2.6.3"
@@ -55,11 +56,15 @@ src_configure() {
 
 	egnustep_env
 
+	# saml2 requires liblasso, mfa requires liboath
 	./configure \
 		--disable-strip \
 		--prefix=/usr \
 		--with-ssl="${ssl_provider}" \
 		$(use_enable debug) \
+		$(use_enable sodium) \
+		--disable-mfa \
+		--disable-saml2 \
 		|| die "configure failed"
 }