diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile
index acf9165b0da7..dd32ec6f4f57 100644
--- a/sysutils/appjail-devel/Makefile
+++ b/sysutils/appjail-devel/Makefile
@@ -1,34 +1,42 @@
 PORTNAME=	appjail
 DISTVERSIONPREFIX=	v
-DISTVERSION=	g20230515
+DISTVERSION=	g20230518
 CATEGORIES=	sysutils
 PKGNAMESUFFIX= -devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Simple and easy-to-use tool for creating portable jails (devel)
 WWW=		https://github.com/DtxdF/AppJail
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	appjail
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DtxdF
 GH_PROJECT=	AppJail
-GH_TAGNAME=	f32080a9de86dfe1acd80b8728ad637994227a9a
+GH_TAGNAME=	357c296ed3d9e1b5e0bca0caec726c14bc79d35b
 
 ALL_TARGET=	utils-strip
 
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=			DEBOOTSTRAP DOCS GIT
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFINE=			DEBOOTSTRAP DOCS DOAS GIT
 DEBOOTSTRAP_DESC=		Support for Debian and Ubuntu jails
 DEBOOTSTRAP_RUN_DEPENDS=	debootstrap>0:sysutils/debootstrap
+DOAS_DESC=			Add support for unprivileged users
+DOAS_RUN_DEPENDS=		doas>0:security/doas
 GIT_RUN_DEPENDS=		git>0:devel/git
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
 
+post-install:
+	${MKDIR} ${STAGEDIR}/${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/share/appjail/files/default.conf ${STAGEDIR}/${ETCDIR}/appjail.conf.sample
+
 .include <bsd.port.mk>
diff --git a/sysutils/appjail-devel/distinfo b/sysutils/appjail-devel/distinfo
index 3d3f62bcad20..e0c501cc9e80 100644
--- a/sysutils/appjail-devel/distinfo
+++ b/sysutils/appjail-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684183081
-SHA256 (DtxdF-AppJail-vg20230515-f32080a9de86dfe1acd80b8728ad637994227a9a_GH0.tar.gz) = 02d7bcb524f365ae0877510f5e9976b75cfe0193cfa68f598c6978957cc08b64
-SIZE (DtxdF-AppJail-vg20230515-f32080a9de86dfe1acd80b8728ad637994227a9a_GH0.tar.gz) = 215866
+TIMESTAMP = 1684429726
+SHA256 (DtxdF-AppJail-vg20230518-357c296ed3d9e1b5e0bca0caec726c14bc79d35b_GH0.tar.gz) = 2d4d35efac3958f233784f5af14489e9d03b748ab40be824df0fd7188a8d1956
+SIZE (DtxdF-AppJail-vg20230518-357c296ed3d9e1b5e0bca0caec726c14bc79d35b_GH0.tar.gz) = 217462
diff --git a/sysutils/appjail-devel/files/pkg-message.in b/sysutils/appjail-devel/files/pkg-message.in
new file mode 100644
index 000000000000..2e6f931bdfd0
--- /dev/null
+++ b/sysutils/appjail-devel/files/pkg-message.in
@@ -0,0 +1,17 @@
+[
+{ type: install
+  message: <<EOM
+AppJail was installed
+
+1) All information about like use and configure appjail can be found at the
+   following url:
+
+   https://github.com/DtxdF/AppJail/blob/main/README.md
+
+2) A configuration file sample was installed to %%ETCDIR%%. Change it accord to
+   your own needs
+
+3) Enjoy it
+EOM
+}
+]
diff --git a/sysutils/appjail-devel/pkg-plist b/sysutils/appjail-devel/pkg-plist
index 1509b85f8231..b6df54381812 100644
--- a/sysutils/appjail-devel/pkg-plist
+++ b/sysutils/appjail-devel/pkg-plist
@@ -1,126 +1,132 @@
 bin/appjail
 bin/appjail-config
+bin/appjail-config-user
 bin/appjail-dns
+bin/appjail-user
+@sample %%ETCDIR%%/appjail.conf.sample
 etc/rc.d/appjail
 etc/rc.d/appjail-natnet
 libexec/appjail/appjail-config/appjail-config
 libexec/appjail/appjail-config/tok
 libexec/appjail/getservbyname/getservbyname
 libexec/appjail/ipcheck/ipcheck
 libexec/appjail/network/network
 %%DATADIR%%/cmd/cmd
 %%DATADIR%%/cmd/config
 %%DATADIR%%/cmd/cpuset
 %%DATADIR%%/cmd/disable
 %%DATADIR%%/cmd/enable
 %%DATADIR%%/cmd/enabled
 %%DATADIR%%/cmd/expose
 %%DATADIR%%/cmd/fetch
 %%DATADIR%%/cmd/fstab
 %%DATADIR%%/cmd/help
 %%DATADIR%%/cmd/jail
 %%DATADIR%%/cmd/limits
 %%DATADIR%%/cmd/login
 %%DATADIR%%/cmd/logs
 %%DATADIR%%/cmd/makejail
 %%DATADIR%%/cmd/nat
 %%DATADIR%%/cmd/network
 %%DATADIR%%/cmd/pkg
 %%DATADIR%%/cmd/quick
 %%DATADIR%%/cmd/restart
 %%DATADIR%%/cmd/rstop
 %%DATADIR%%/cmd/run
 %%DATADIR%%/cmd/service
 %%DATADIR%%/cmd/start
 %%DATADIR%%/cmd/startup
 %%DATADIR%%/cmd/stop
 %%DATADIR%%/cmd/sysrc
 %%DATADIR%%/cmd/update
 %%DATADIR%%/cmd/upgrade
 %%DATADIR%%/cmd/usage
 %%DATADIR%%/cmd/version
 %%DATADIR%%/cmd/zfs
 %%DATADIR%%/files/config.conf
 %%DATADIR%%/files/default.conf
 %%DATADIR%%/files/default_template.conf
 %%DATADIR%%/files/exclude-thinjail.files
 %%DATADIR%%/files/include-thinjail.files
 %%DATADIR%%/files/rctl-actions
 %%DATADIR%%/files/rctl-resources
 %%DATADIR%%/files/rctl-subjects
 %%DATADIR%%/lib/atexit
 %%DATADIR%%/lib/check_func
 %%DATADIR%%/lib/colors
 %%DATADIR%%/lib/copy
 %%DATADIR%%/lib/files
 %%DATADIR%%/lib/jail
 %%DATADIR%%/lib/jail_types
 %%DATADIR%%/lib/kern_modules
 %%DATADIR%%/lib/keys
 %%DATADIR%%/lib/load
 %%DATADIR%%/lib/log
 %%DATADIR%%/lib/mksum
 %%DATADIR%%/lib/mount
 %%DATADIR%%/lib/network
 %%DATADIR%%/lib/random
 %%DATADIR%%/lib/replace
 %%DATADIR%%/lib/strlen
 %%DATADIR%%/lib/sysexits
 %%DATADIR%%/lib/tempfile
 %%DATADIR%%/lib/version
 %%DATADIR%%/lib/whitespaces
 %%DATADIR%%/lib/zfs
 %%DATADIR%%/makejail/cmd/all/ADD
 %%DATADIR%%/makejail/cmd/all/ARG
 %%DATADIR%%/makejail/cmd/all/CLEAR
 %%DATADIR%%/makejail/cmd/all/CMD
 %%DATADIR%%/makejail/cmd/all/COPY
 %%DATADIR%%/makejail/cmd/all/ENTRYPOINT
 %%DATADIR%%/makejail/cmd/all/ENV
 %%DATADIR%%/makejail/cmd/all/MOUNT
 %%DATADIR%%/makejail/cmd/all/PKG
 %%DATADIR%%/makejail/cmd/all/RAW
 %%DATADIR%%/makejail/cmd/all/REPLACE
 %%DATADIR%%/makejail/cmd/all/RUN
 %%DATADIR%%/makejail/cmd/all/SERVICE
 %%DATADIR%%/makejail/cmd/all/SET
 %%DATADIR%%/makejail/cmd/all/SYSRC
 %%DATADIR%%/makejail/cmd/all/UMOUNT
 %%DATADIR%%/makejail/cmd/all/USER
 %%DATADIR%%/makejail/cmd/all/VAR
 %%DATADIR%%/makejail/cmd/all/WORKDIR
 %%DATADIR%%/makejail/cmd/build/LOGIN
 %%DATADIR%%/makejail/cmd/build/OPTION
 %%DATADIR%%/makejail/cmd/build/RESTART
 %%DATADIR%%/makejail/cmd/build/START
 %%DATADIR%%/makejail/cmd/build/STOP
 %%DATADIR%%/makejail/write/all/ADD
 %%DATADIR%%/makejail/write/all/ARG
 %%DATADIR%%/makejail/write/all/CMD
 %%DATADIR%%/makejail/write/all/COPY
 %%DATADIR%%/makejail/write/all/MOUNT
 %%DATADIR%%/makejail/write/all/PKG
 %%DATADIR%%/makejail/write/all/RAW
 %%DATADIR%%/makejail/write/all/REPLACE
 %%DATADIR%%/makejail/write/all/RUN
 %%DATADIR%%/makejail/write/all/SERVICE
 %%DATADIR%%/makejail/write/all/SET
 %%DATADIR%%/makejail/write/all/SYSRC
 %%DATADIR%%/makejail/write/all/UMOUNT
 %%DATADIR%%/makejail/write/all/VAR
 %%DATADIR%%/makejail/write/all/WORKDIR
 %%DATADIR%%/makejail/write/build/LOGIN
 %%DATADIR%%/makejail/write/build/OPTION
 %%DATADIR%%/makejail/write/build/RESTART
 %%DATADIR%%/makejail/write/build/START
 %%DATADIR%%/makejail/write/build/STOP
+%%DATADIR%%/scripts/ajconf-user.sh
 %%DATADIR%%/scripts/ajconf.sh
+%%DATADIR%%/scripts/ajuser.sh
 %%DATADIR%%/scripts/ascii2oct.sh
 %%DATADIR%%/scripts/dns.sh
 %%DATADIR%%/scripts/get_depends.sh
 %%DATADIR%%/scripts/run_init.sh
 %%DATADIR%%/scripts/run_jail.sh
+%%DATADIR%%/scripts/runas.sh
 %%EXAMPLESDIR%%/templates/bridge.conf
 %%EXAMPLESDIR%%/templates/linux.conf
 %%EXAMPLESDIR%%/templates/vnet.conf
 %%EXAMPLESDIR%%/templates/xorg.conf