--- b/security/vaultwarden/Makefile	
+++ b/security/vaultwarden/Makefile	
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	vaultwarden
 DISTVERSION=	1.21.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web
 DISTFILES=	${WV_DISTFILE}:web
@@ -23,6 +23,7 @@ DISTVERSION_WV=	2.20.1
 WV_DISTFILE=	bw_web_v${DISTVERSION_WV}.tar.gz
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
+SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
@@ -202,7 +203,6 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		opaque-debug-0.3.0 \
 		openssl-0.10.34 \
 		openssl-probe-0.1.2 \
-		openssl-src-111.15.0+1.1.1k \
 		openssl-sys-0.9.62 \
 		owning_ref-0.3.3 \
 		parity-ws-0.10.0 \
@@ -379,14 +379,15 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		yubico-0.10.0
 CARGO_USE_GITHUB=	yes
 
+post-patch:
+	${REINPLACE_CMD} 's/^vendored_openssl/#&/' ${WRKSRC}/Cargo.toml
+
 post-install:
 	${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d
-	${CP} ${FILESDIR}/vaultwarden_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample
+	${CP} ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample
 	${MKDIR} ${STAGEDIR}/${WWWDIR}
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/data
-	# ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data
 	(cd ${WRKDIR} && ${COPYTREE_SHARE} web-vault ${STAGEDIR}/${WWWDIR})
-	# @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/data' >> ${TMPPLIST}
 	${ECHO_CMD} \
 		'@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \
 		>> ${TMPPLIST}
--- b/security/vaultwarden/distinfo	
+++ b/security/vaultwarden/distinfo	
@@ -327,8 +327,6 @@ SHA256 (rust/crates/openssl-0.10.34.crate) = 6d7830286ad6a3973c0f1d9b73738f69c76
 SIZE (rust/crates/openssl-0.10.34.crate) = 203996
 SHA256 (rust/crates/openssl-probe-0.1.2.crate) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de
 SIZE (rust/crates/openssl-probe-0.1.2.crate) = 6427
-SHA256 (rust/crates/openssl-src-111.15.0+1.1.1k.crate) = b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a
-SIZE (rust/crates/openssl-src-111.15.0+1.1.1k.crate) = 5087962
 SHA256 (rust/crates/openssl-sys-0.9.62.crate) = fa52160d45fa2e7608d504b7c3a3355afed615e6d8b627a74458634ba21b69bd
 SIZE (rust/crates/openssl-sys-0.9.62.crate) = 52116
 SHA256 (rust/crates/owning_ref-0.3.3.crate) = cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37
--- b/security/vaultwarden/files/pkg-message.in	
+++ b/security/vaultwarden/files/pkg-message.in	
@@ -2,6 +2,14 @@ 
 { type: install
   message: <<EOM
 
+Setup vaultwarden environment:
+
+Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+
 Note to former bitwarden_rs user to update from bitwarden_rs to vaulwarden : 
 
 Stop and disable bitwarden_rs service 
@@ -10,16 +18,6 @@ Copy %%PREFIX%%/etc/rc.conf.d/bitwarden_rs to %%PREFIX%%/etc/rc.conf.d/vaultward
 
 Copy %%PREFIX%%/www/bitwarden_rs/data to %%PREFIX%%/www/vaultwarden/data
 
-Enable and start vaultwarden service
-
----------------------------------------------------------------------------------------
- 
-Setup vaultwarden environment:
-
-Copy %%PREFIX%%/etc/rc.conf.d/vaultwarden.sample to  %%PREFIX%%/etc/rc.conf.d/vaultwarden
-
-Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.
-
 Enable and start vaultwarden service
 EOM
 }
--- b/security/vaultwarden/files/vaultwarden.in	
+++ b/security/vaultwarden/files/vaultwarden.in	
@@ -16,8 +16,8 @@ rcvar=vaultwarden_enable
 load_rc_config ${name}
 
 : ${vaultwarden_chdir=%%PREFIX%%/www/vaultwarden}
-: ${vaultwarden_user:=www}
-: ${vaultwarden_group:=www}
+: ${vaultwarden_user:=%%WWWOWN%%}
+: ${vaultwarden_group:=%%WWWGRP%%}
 
 # This is the tool init launches
 command="/usr/sbin/daemon"
--- b/security/vaultwarden/pkg-plist	
+++ b/security/vaultwarden/pkg-plist	
@@ -1,6 +1,5 @@ 
 bin/vaultwarden
-etc/rc.conf.d/vaultwarden.sample
-etc/rc.d/vaultwarden
+@sample etc/rc.conf.d/vaultwarden.sample
 %%WWWDIR%%/web-vault/.nojekyll
 %%WWWDIR%%/web-vault/404.html
 %%WWWDIR%%/web-vault/404/bootstrap.min.css