diff --git a/net-nds/kanidm/kanidm-1.8.5-r1.ebuild b/net-nds/kanidm/kanidm-1.8.5-r2.ebuild
similarity index 92%
rename from net-nds/kanidm/kanidm-1.8.5-r1.ebuild
rename to net-nds/kanidm/kanidm-1.8.5-r2.ebuild
index 358f06a..a88859b 100644
--- a/net-nds/kanidm/kanidm-1.8.5-r1.ebuild
+++ b/net-nds/kanidm/kanidm-1.8.5-r2.ebuild
@@ -806,47 +806,65 @@ src_prepare() {
 	echo "ECARGO_ARGS: ${ECARGO_ARGS}"
 }
 
+src_configure() {
+	local myfeatures=(
+		tpm
+		unix
+	)
+	cargo_src_configure \
+		--package daemon \
+		--package kanidm-ipa-sync \
+		--package kanidm-ldap-sync \
+		--package kanidm_tools \
+		--package kanidm_unix_int \
+		--package nss_kanidm \
+		--package pam_kanidm
+}
+
 src_install() {
-	cd target/release
-	dobin kanidm
-	use server && dosbin kanidmd
-	dosbin kanidm-ipa-sync
-	dosbin kanidm-ldap-sync
-	dobin kanidm_ssh_authorizedkeys
-	dobin kanidm_ssh_authorizedkeys_direct
-	dobin kanidm-unix
-	dosbin kanidm_unixd
-	dosbin kanidm_unixd_tasks
-	dobin orca
+	dobin target/release/kanidm-unix
+	dobin target/release/kanidm_unixd
+	dobin target/release/kanidm_unixd_tasks
 
-	dolib.so libkanidmd_lib_macros.so
-	dolib.so libnss_kanidm.so
-	use pam && dolib.so libpam_kanidm.so
+	dolib.so target/release/libnss_kanidm.so
+
+	insinto /lib64/security
+	use pam && newins target/release/libpam_kanidm.so pam_kanidm.so
 
-	cd ${S}
 	insinto /etc/kanidm
 	newins examples/kanidm config
 	newins examples/radius_full.toml radius.toml
 	newins examples/unixd  unixd
 
+	for d in "kanidm" "kanidm_ssh_authorizedkeys" "kanidm_ssh_authorizedkeys_direct" "kanidm-unix" ; do
+		dobin target/release/${d}
+		dcp="${d/-/_}"
+		newbashcomp target/release/build/completions/${dcp}.bash ${dcp}
+		dofishcomp target/release/build/completions/${dcp}.fish
+		dozshcomp  target/release/build/completions/_${dcp}
+	done
+	systemd_dounit platform/opensuse/kanidm-unixd.service
+	systemd_dounit platform/opensuse/kanidm-unixd-tasks.service
+
 	if use server; then
 		einfo "Installing kanidmd-server"
+		dobin target/release/kanidmd
+		dobin target/release/kanidm-ipa-sync
+		dobin target/release/kanidm-ldap-sync
+
 		newins examples/server.toml server.toml
 
 		dodir /usr/share/kanidm/ui/hpkg
-		cp -R "${S}/server/core/static" "${ED}/usr/share/kanidm/ui/hpkg/" || die "Install failed!"
+		cp -r ${S}/server/core/static/* ${ED}/usr/share/kanidm/ui/hpkg || die "Install failed!"
 
 		systemd_dounit platform/opensuse/kanidm-ipa-sync.service
-		systemd_dounit platform/opensuse/kanidm-unixd-tasks.service
-		systemd_dounit platform/opensuse/kanidm-unixd.service
 		systemd_dounit platform/opensuse/kanidmd.service
 
 		newinitd "${FILESDIR}/kanidm.initd" kanidmd
 
-		newbashcomp ${FILESDIR}/kanidmd.bash kanidmd
-		newfishcomp ${FILESDIR}/kanidmd.fish kanidmd.fish
-		newzshcomp ${FILESDIR}/kanidmd.bash _kandimd
-
+		newbashcomp target/release/build/completions/kanidmd.bash kanidmd
+		dofishcomp target/release/build/completions/kanidmd.fish
+		dozshcomp  target/release/build/completions/_kanidmd
 	fi
 
 	if use acct; then