diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile
index 5bfd4a965a44..4b5ff8f8e64a 100644
--- a/security/vaultwarden/Makefile
+++ b/security/vaultwarden/Makefile
@@ -1,54 +1,62 @@
 PORTNAME=	vaultwarden
 DISTVERSION=	1.29.2
 PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Bitwarden compatible backend server
 WWW=		https://github.com/dani-garcia/vaultwarden
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS+=	libcapnp.so:devel/capnproto \
 		libgmp.so:math/gmp \
 		libnettle.so:security/nettle
 
-USES=		cargo mysql:client pgsql ssl
+USES=		cargo ssl
 
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 USE_GITHUB=	yes
 GH_ACCOUNT=	dani-garcia
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 OPTIONS_DEFINE=	WEBVAULT
-OPTIONS_DEFAULT=WEBVAULT
+OPTIONS_DEFAULT=${OPTIONS_DEFINE} ${OPTIONS_MULTI_DATABASE}
+OPTIONS_MULTI=	DATABASE
+OPTIONS_MULTI_DATABASE=	MYSQL PGSQL SQLITE
 
+DATABASE_DESC=	Database support
 WEBVAULT_DESC=	Vaultwarden web (bw_web_builds)
 
+MYSQL_USES=	mysql:client
+MYSQL_VARS=	cargo_features+=mysql
+PGSQL_USES=	pgsql
+PGSQL_VARS=	cargo_features+=postgresql
+SQLITE_VARS=	cargo_features+=sqlite
 WEBVAULT_RUN_DEPENDS=	${WWWDIR}/web-vault/index.html:www/vaultwarden-web_vault
 
 # make cargo-crates > Makefile.crates
 
-CARGO_FEATURES=	mysql postgresql sqlite #vendored_openssl
+CARGO_FEATURES=	--no-default-features
 #CARGO_ENV+=	RUSTC_BOOTSTRAP=1
 
 INSTALL_TARGET=	install-strip
 
 SUB_LIST=	WWWGRP=${WWWGRP} \
 		WWWOWN=${WWWOWN}
 
 #post-patch:
 #	${REINPLACE_CMD} 's/^rust-version = "1.60"/rust-version = "1.59"/' \
 #		${WRKSRC}/Cargo.toml
 
 post-install:
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/data
 	${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${WWWDIR}/data/config.json.sample
 
 .include <bsd.port.mk>