diff --git a/sys-fs/stratisd/Manifest b/sys-fs/stratisd/Manifest
index 9b6a058..1cf3380 100644
--- a/sys-fs/stratisd/Manifest
+++ b/sys-fs/stratisd/Manifest
@@ -1,6 +1,6 @@
 AUX 0001-disable-xfs-uuid-change-after-snapshot-create.patch 1682 BLAKE2B 0d3d57d4e7ae2eace8f1e01468facdccf6dcb4516ade548c68004f064c570e8adb1a8750072be81d59f18210bedf72de97cf4e55387bc79911252426e0963d42 SHA512 a363e777088ef015cc0e5eba46d079a2d795fdaa2e0ebd8fc13fe8528e04d8909758aeaa40bc8476a0d5f6189df819cae446e57a9ee633a655a1e724a4db2d57
 AUX 0002-duplicate_check-disable.patch 1223 BLAKE2B df38e29ee2d2843505620f1229f7d9486da6c0b2b04995092a0170efc25c2d38eefd71db4117217b8bdfe24d4c9db4cdcf7bb64b1c5a43474381ee906d7c8b0b SHA512 d80a468ec3ea6460e916d9ba6f9fbc3509f4c36e15e1650abac7ac956c568c78615f0d94e150dc1f88fbdb6b1ec8d5426dc898428238d5ee3dadee799f9b5f37
-AUX init.d.stratisd-r3 532 BLAKE2B d1f7b18862e22576d3d33932730e4083f671a31a5834d396a71caa2ac870f372d89316deacc6a10202a2b03f7c38f2e6727b1961412c921bc848ceadb2dc3d1f SHA512 0eecfa021d84cff66ea478a448f58d18af00607515d06be93421c27344ee77ab874524e4dae06064106f6fa75c6ca915d21fcde8f002e782696e7a3905b8b851
+AUX init.d.stratisd-r3 509 BLAKE2B b68c69996b6337597957c5aa9d5f68630d60e2eaf3bc1a02f3b41898b1d60a9725e04e56cf5935b700f1cf2f0c1d0770488716408a4a47e765d8ed1d027b0726 SHA512 01689a4053555feb47d11c38feb84dda623292ddde665e7b073301fab8dc18fc0c029c01d8da299d8e65b733b602b24a02298d74985eb79652ef28b0c39b2592
 DIST addr2line-0.15.1.crate 32936 BLAKE2B 5dc101a84434607a2432346440324b35e829fb7843d3a76a918516929867e6186ea004aed8b939d216822d29115a9f8f11b4e86844ca50ffa5598ad6c84a53ba SHA512 beb2c7683e350c98538cd7a83aa4aec86fb95bfd079ccdce27fae84f988a58f9e59ff5a2e3c431436f8ab033d53232732731da52f5d7fbb5d80f24fac2f76041
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
@@ -141,5 +141,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD stratisd-2.4.2.ebuild 4737 BLAKE2B 420411ac3e9c4edf2f14fd9a136a2a269f7b6636529cfffa26c57cbe80b172827ff15e41453f77f3ddf19a464c261a19ea32cc3d623db8c9ccaf53fcdfc9e076 SHA512 604814804df408e0775462b9c87680f4ac800f7a564f60c5d345f5088bec6d5dd0b0055869628781e66b018078ad58e45dc4731a75f6177ec193e4cf88e6418d
+EBUILD stratisd-2.4.2.ebuild 5141 BLAKE2B a4010a3059628772e39dc542a325b5ac1f3723a71d4ebbbb5ec4d1611537356439a05e51d4da86a84889c527680c0705f6e5349b4f6191f84a282c32293e62fb SHA512 dbba956d7336665c1bbb6ff77b23323b5bfec4b7b166a1f7aad65e8acbe9e22705a6ad40d29a01e67310b395cda625506a8d39a990b835b9eb103b31a88ca5af
 MISC metadata.xml 364 BLAKE2B 05556be8a2ea9f74b4592df7eb2038f3baee6c2863129b938540e509c241ede9651e8221dcc9abf13f015af316aafefafcf9e9121034cdaa1d5967b910e67be1 SHA512 ae850f4a01394975342a4e078a1486a179c4155cb262ad89a25073da25823d48989f7cb34673f4c71520f624f8619cb5932bff62b0c912af27ecc71fe8327a52
diff --git a/sys-fs/stratisd/files/init.d.stratisd-r3 b/sys-fs/stratisd/files/init.d.stratisd-r3
index a5d239a..7b6d10e 100644
--- a/sys-fs/stratisd/files/init.d.stratisd-r3
+++ b/sys-fs/stratisd/files/init.d.stratisd-r3
@@ -3,7 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/libexec/stratisd"
-command_args="--debug"
 command_background=true
 output_log=/var/log/stratisd.log
 error_log=/var/log/stratisd.log
diff --git a/sys-fs/stratisd/stratisd-2.4.2.ebuild b/sys-fs/stratisd/stratisd-2.4.2.ebuild
index b0316f0..03fe272 100644
--- a/sys-fs/stratisd/stratisd-2.4.2.ebuild
+++ b/sys-fs/stratisd/stratisd-2.4.2.ebuild
@@ -145,7 +145,7 @@ winapi-util-0.1.5
 winapi-x86_64-pc-windows-gnu-0.4.0
 "
 
-inherit cargo systemd
+inherit cargo systemd udev
 
 DESCRIPTION="Daemon that manages block devices to create filesystems"
 HOMEPAGE="https://stratis-storage.github.io/"
@@ -178,6 +178,8 @@ RDEPEND="
 
 #QA_FLAGS_IGNORED="/usr/libexec/stratisd "
 
+REQUIRED_USE="dracut? ( systemd )"
+
 PATCHES=(
 	# Until feature will be released. https://github.com/stratis-storage/project/issues/161
 	${FILESDIR}/0001-disable-xfs-uuid-change-after-snapshot-create.patch
@@ -199,34 +201,45 @@ src_install() {
 	insinto /etc/dbus-1/system.d
 	doins ${S}/stratisd.conf
 	
-	newinitd "${FILESDIR}/init.d.stratisd-r3" stratisd
+	udev_dorules ${S}/udev/61-stratisd.rules
+	
+	dobin  ${S}/target/release/stratis-min
+
+	exeinto "$(get_udevdir)"
+	newexe ${S}/target/release/stratis-utils stratis-str-cmp
+
+	dosym "$(get_udevdir)"/stratis-str-cmp "$(get_udevdir)"/stratis-base32-decode
+	dosym "$(get_udevdir)"/stratis-str-cmp "${EPREFIX}"/bin/stratis-predict-usage
 
 	exeinto /usr/libexec
-	
-	doexe ${S}/target/release/stratisd ${S}/target/release/stratis-utils ${S}/target/release/stratisd-min ${S}/target/release/stratis-min
+	doexe ${S}/target/release/stratisd ${S}/target/release/stratisd-min
 
 	if use extra; then
-		doexe ${S}/target/release/stratis_dumpmetadata
-	fi
-
-	if use systemd; then
-		systemd_dounit "${S}/systemd/stratisd.service"
-		systemd_dounit "${S}/systemd/stratis-fstab-setup"
-		systemd_dounit "${S}/systemd/stratis-fstab-setup@.service"
+		dobin ${S}/target/release/stratis_dumpmetadata
 	fi
 	
 	if use dracut; then
 		insinto /usr/lib/dracut/modules.d/
 		doins -r ${S}/dracut/90stratis
 		
-		insinto /etc/dracut.conf.d
+		insinto /usr/lib/dracut/dracut.conf.d
 		doins ${S}/dracut/90-stratis.conf
+		
+		dosym "$(get_udevdir)"/stratis-str-cmp "$(systemd_get_systemgeneratordir)"/stratis-clevis-setup-generator
+		dosym "$(get_udevdir)"/stratis-str-cmp "$(systemd_get_systemgeneratordir)"/stratis-setup-generator
 	fi
-
+	
 	if use systemd; then
 		systemd_dounit "${S}/systemd/stratisd.service"
-		systemd_dounit "${S}/systemd/stratis-fstab-setup"
 		systemd_dounit "${S}/systemd/stratis-fstab-setup@.service"
+		
+		exeinto "$(systemd_get_utildir)"
+		doexe "${S}/systemd/stratis-fstab-setup"
+	else
+		newinitd "${FILESDIR}/init.d.stratisd-r3" stratisd
 	fi
-
+}
+
+pkg_postinst() {
+	udev_reload
 }