diff --git a/acct-group/kanidmd/kanidmd-0.ebuild b/acct-group/kanidm/kanidm-0.ebuild
similarity index 80%
rename from acct-group/kanidmd/kanidmd-0.ebuild
rename to acct-group/kanidm/kanidm-0.ebuild
index c38e28a..b3c014f 100644
--- a/acct-group/kanidmd/kanidmd-0.ebuild
+++ b/acct-group/kanidm/kanidm-0.ebuild
@@ -5,6 +5,6 @@ EAPI=8
 
 inherit acct-group
 
-DESCRIPTION="gid for net-nds/kanidmd"
+DESCRIPTION="gid for net-nds/kanidm"
 
 ACCT_GROUP_ID=987
diff --git a/acct-user/kanidmd/kanidmd-0.ebuild b/acct-user/kanidm/kanidm-0.ebuild
similarity index 61%
rename from acct-user/kanidmd/kanidmd-0.ebuild
rename to acct-user/kanidm/kanidm-0.ebuild
index 85420b3..782c69f 100644
--- a/acct-user/kanidmd/kanidmd-0.ebuild
+++ b/acct-user/kanidm/kanidm-0.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 inherit acct-user
 
-DESCRIPTION="uid for net-nds/kanidmd"
+DESCRIPTION="uid for net-nds/kanidm"
 ACCT_USER_ID=987
-ACCT_USER_HOME=/var/lib/private/kanidmd
-ACCT_USER_GROUPS=( kanidmd )
+ACCT_USER_HOME=/var/lib/private/kanidm
+ACCT_USER_GROUPS=( kanidm )
 
 acct-user_add_deps
diff --git a/net-nds/kanidmd/Manifest b/net-nds/kanidm/Manifest
similarity index 99%
rename from net-nds/kanidmd/Manifest
rename to net-nds/kanidm/Manifest
index aaa66ec..6ff1a69 100644
--- a/net-nds/kanidmd/Manifest
+++ b/net-nds/kanidm/Manifest
@@ -318,8 +318,8 @@ DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e
 DIST jobserver-0.1.34.crate 29013 BLAKE2B 4d89234147386d61e8402872e577c52c60fba41b21831acbc6934ec7668b22dd9b876cf78180f5a06b2b26b642a0d7e02c9a67dc36ae7d3aa3b95125dec3d7de SHA512 42fe03eaa4caac030c40b167c742aa104151a126505de9ff4c52ab97ac13cdd2b7219268bff414f1d09061f3f9e36be01bdd6255597b957e18589f9ef4a65549
 DIST js-sys-0.3.83.crate 56425 BLAKE2B 9a239a030ecb12b76f17dca54b562e43aaa8019a4f9768562dc5e7647998fa5f42edbb17206da387ebaf20bd3e5c67e16987d428d071b1be9fe635f8c7362f55 SHA512 003e06308d62ce8ca694471fd9b15b3c98ba130c0a388ce88e9ad08b2e16bf1f9b3a68f8bc45d15442c16b2ecc6187cc8bda4cc78db83dc8ced9407d1e641c0e
 DIST jsonschema-0.33.0.crate 127429 BLAKE2B f0ecfd4748360b920c4525bb3a42f3c427c7ddd6a2b4639a51021770af13d4ec17f160e91307095d22ffd09a38c732540bef7f590e7043fd81894dc35fe7e3c3 SHA512 a24458fdc03561822a15d76a2ae71bf6c60d77927bb81a4ef1c887f2f69f6d7319b9c0c1c962e77449ef0690d5f39c04aba48f9480ff5748a26a4c643f15efc4
+DIST kanidm-1.8.5.tar.gz 8915443 BLAKE2B 03024fe65716b9c7682dc32650f013dcc2ed2bb6fa55da173025541c45f4f973ae4f7b7d234353872a26ddbfef222c3cdf3198271af17b80330fd913e1ebcfd2 SHA512 6ff277fa6462d389d1f456432c06cdba7e41b14a594a7ab1f75262b0d93cb1dac26efc1d2c4c07075b23a3eef32ac4910e97394d2ed06c69a942eea2ccd76f2e
 DIST kanidm-hsm-crypto-0.3.5.crate 47504 BLAKE2B a8c735067308114654d241f3e193c35d1f3ad649463640d461d8b9e8037761fdb717fa6ecbd9c04a5d4a1286acc753ab253c83b61f8b87929a033f2183cdcdcb SHA512 1755d8af2f17d0f50b189f56351307153dcff754432d53291c71860dd5935ed14944ab95c7ae3d3190ef14635c264805b5f89eab6c4e0f723922fdf48008af54
-DIST kanidmd-1.8.5.tar.gz 8915443 BLAKE2B 03024fe65716b9c7682dc32650f013dcc2ed2bb6fa55da173025541c45f4f973ae4f7b7d234353872a26ddbfef222c3cdf3198271af17b80330fd913e1ebcfd2 SHA512 6ff277fa6462d389d1f456432c06cdba7e41b14a594a7ab1f75262b0d93cb1dac26efc1d2c4c07075b23a3eef32ac4910e97394d2ed06c69a942eea2ccd76f2e
 DIST kbkdf-0.0.1.crate 8444 BLAKE2B 15776f76e74328ab0a9ebd71bcb92d39ec8a52db48f3e69c7f405e3641c6849a8441618963754b57cc760a090b08e958f9bbdd800237ae85fc90196d8d6822fb SHA512 23fac0b01dc7c4bc46c8cf423b40afbe46a3629ebc8f97d0f7f360e6d8cb3805658764f279087b9af9a81ad2a018cbaf81b6bebc24c136ca61542fa51c6107e7
 DIST kqueue-1.1.1.crate 21504 BLAKE2B 3397a355b56d979371f3a790ca6de4880ee1cb78c6fd9ec85766e1bb5ccc25f811f7065a31dc14b0b4686de4bb1902c2e2c3026719ecb923e3bda553998d187d SHA512 08ca26fd83c4aca32d53d85155580fac95b50709662975632aa542cb1e8a2ea5f8cc0f628194777093168a9950d485fb395bb55e7302dd25d03bd311e8ac84aa
 DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5
diff --git a/net-nds/kanidmd/files/kanidm.initd b/net-nds/kanidm/files/kanidm.initd
similarity index 80%
rename from net-nds/kanidmd/files/kanidm.initd
rename to net-nds/kanidm/files/kanidm.initd
index cb0b36c..e48c224 100644
--- a/net-nds/kanidmd/files/kanidm.initd
+++ b/net-nds/kanidm/files/kanidm.initd
@@ -4,12 +4,17 @@
 
 description="Kanidm: simple, secure, and fast identity management platform"
 
+depend() {
+	before radius
+}
+
 : ${KANIDM_CONF:=/etc/kanidm/server.toml}
 : ${KANIDM_USER:=kanidm}
 : ${KANIDM_GROUP:=kanidm}
 : ${KANIDM_WORK_DIR:=/var/lib/kanidm}
 : ${KANIDM_CUSTOM:=${KANIDM_WORK_DIR}/custom}
 
+capabilities=CAP_NET_BIND_SERVICE
 command="/usr/sbin/kanidmd"
 command_args="--config-path ${KANIDM_CONF} server"
 command_background="true"
@@ -17,3 +22,7 @@ command_user="${KANIDM_USER}:${KANIDM_GROUP}"
 error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err"
 pidfile="/run/${RC_SVCNAME}.pid"
 required_files="${KANIDM_CONF}"
+
+start_pre() {
+	checkpath -m0750 -o "${KANIDM_USER:-root}:${KANIDM_GROUP:-root}" -d /run/kanidmd
+}
diff --git a/net-nds/kanidmd/files/kanidmd.bash b/net-nds/kanidm/files/kanidmd.bash
similarity index 100%
rename from net-nds/kanidmd/files/kanidmd.bash
rename to net-nds/kanidm/files/kanidmd.bash
diff --git a/net-nds/kanidmd/files/kanidmd.fish b/net-nds/kanidm/files/kanidmd.fish
similarity index 100%
rename from net-nds/kanidmd/files/kanidmd.fish
rename to net-nds/kanidm/files/kanidmd.fish
diff --git a/net-nds/kanidmd/files/kanidmd.zsh b/net-nds/kanidm/files/kanidmd.zsh
similarity index 100%
rename from net-nds/kanidmd/files/kanidmd.zsh
rename to net-nds/kanidm/files/kanidmd.zsh
diff --git a/net-nds/kanidmd/kanidmd-1.8.5-r1.ebuild b/net-nds/kanidm/kanidm-1.8.5-r1.ebuild
similarity index 96%
rename from net-nds/kanidmd/kanidmd-1.8.5-r1.ebuild
rename to net-nds/kanidm/kanidm-1.8.5-r1.ebuild
index 19bb0fb..358f06a 100644
--- a/net-nds/kanidmd/kanidmd-1.8.5-r1.ebuild
+++ b/net-nds/kanidm/kanidm-1.8.5-r1.ebuild
@@ -765,7 +765,7 @@ CRATES="
 
 inherit cargo shell-completion systemd
 
-DESCRIPTION="Kanidm Server Daemon"
+DESCRIPTION="Kanidm - a modern and simple identity management platform"
 HOMEPAGE="https://github.com/kanidm/kanidm/"
 SRC_URI="
 	${CARGO_CRATE_URIS}
@@ -782,12 +782,12 @@ LICENSE+="
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+acct pam server"
-RUST_MIN_VER="1.87"
+RUST_MIN_VER="1.90"
 
 DEPEND="
 acct? (
-		acct-group/kanidmd
-		acct-user/kanidmd )
+		acct-group/kanidm
+		acct-user/kanidm )
 pam? ( sys-libs/pam )
 "
 BDEPEND="
@@ -796,9 +796,6 @@ BDEPEND="
 	>=dev-lang/rust-bin-1.90.0
 "
 
-
-S="${WORKDIR}/kanidm-${PV}"
-
 pkg_setup() {
 	export KANIDM_BUILD_PROFILE=release_linux
 	rust_pkg_setup
@@ -807,8 +804,6 @@ pkg_setup() {
 src_prepare() {
 	eapply_user
 	echo "ECARGO_ARGS: ${ECARGO_ARGS}"
-
-#sed -i -e 's!sshkeys = { git.*$!!' -e 's!sshkeys = .*$!sshkeys = "0.3.4"!'  "${WORKDIR}/kanidm-${PV}/Cargo.toml" || die "Sed failed!"
 }
 
 src_install() {
@@ -826,7 +821,6 @@ src_install() {
 
 	dolib.so libkanidmd_lib_macros.so
 	dolib.so libnss_kanidm.so
-#	dolib.so libtestkit_macros.so
 	use pam && dolib.so libpam_kanidm.so
 
 	cd ${S}
@@ -835,10 +829,6 @@ src_install() {
 	newins examples/radius_full.toml radius.toml
 	newins examples/unixd  unixd
 
-	newbashcomp ${FILESDIR}/${PN}.bash ${PN}
-	newfishcomp ${FILESDIR}/${PN}.fish ${PN}.fish
-	newzshcomp ${FILESDIR}/${PN}.bash _${PN}
-
 	if use server; then
 		einfo "Installing kanidmd-server"
 		newins examples/server.toml server.toml
@@ -853,18 +843,19 @@ src_install() {
 
 		newinitd "${FILESDIR}/kanidm.initd" kanidmd
 
-		setcap 'CAP_NET_BIND_SERVICE+ep' /usr/sbin/kanidmd
-		dodir /run/kanidmd
-		chown kanidm /var/run/kanidmd
+		newbashcomp ${FILESDIR}/kanidmd.bash kanidmd
+		newfishcomp ${FILESDIR}/kanidmd.fish kanidmd.fish
+		newzshcomp ${FILESDIR}/kanidmd.bash _kandimd
+
 	fi
 
 	if use acct; then
 		fowners root:kanidm /etc/kanidm/{,config,radius.toml,unixd}
-		fperms g+w,o-rwx /etc/kanidm/{,config,radius.toml,unixd}
+		fperms 0644 /etc/kanidm/{,config,radius.toml,unixd}
 		if use server; then
 			fowners root:kanidm /etc/kanidm/server.toml
-			fperms g+w,o-rwx /etc/kanidm/server.toml
-			diropts -m0750 -o kanidm -g kanidm
+			fperms 0640 /etc/kanidm/server.toml
+			diropts -m0740 -o kanidm -g kanidm
 			keepdir /var/lib/private/kanidm
 			keepdir /var/log/kanidmd
 		fi