diff --git a/sys-fs/stratisd/Manifest b/sys-fs/stratisd/Manifest
index 1d01795..62ff2fe 100644
--- a/sys-fs/stratisd/Manifest
+++ b/sys-fs/stratisd/Manifest
@@ -1,3 +1,4 @@
+AUX 0001-Fix-issue-of-devicemapper-rs-compatibility-with-musl.patch 1141 BLAKE2B 59601118eed85dcfc5c5edd550cd0156b5ae60f34217858a4201631792a600f2b69bea23c4be6dc04ebc470c63ecc7d60b4f74c48c77f8180bf55a560f433adc SHA512 72a6f3d826a690210bc07c54e581be11fdf2f4522c684aa1b5f89051ba0e024b1e60a11502fbc787fefca666f5e6059916ff7afd614a46c44e4b96697605f0a7
 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-r2 530 BLAKE2B 9a7fd3cd312d4d714076786a5e2790cd59583dbbdb7d34d9cfa7cbc0cb18260a3a1280d6d1633c6d54afb5c7ac3e1982216494089852b900c84ceaab86238079 SHA512 c3d35de4acb7ca239791b2e9e205bd747f0e703595c02060d0ec553167ebdc176af184ba0bcb6cf48dd0b4ee1d0f49636aa7fc4f55cecdb0bc9d1d161952d9bf
@@ -154,5 +155,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.3.2.crate 3165198 BLAKE2B 3e1787d5eef457d1f6
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
 EBUILD stratisd-1.0.6-r1.ebuild 2841 BLAKE2B baec1c4246fe28d31af4af533fb1b6ea199be97165ac1454e3fd95e580da5baaa5089ae064798e5411563477dcc160e09be73d039ffbfc61d18040ed02165367 SHA512 405aa9a8c182481e34bd97ecb45349bfc0ddddd2700505632d346b8314b48afe5fcbe08e885d66ad562c23ecfa613a3d3519734ade84e84e350fa2da41e6224e
 EBUILD stratisd-2.0.1-r2.ebuild 3244 BLAKE2B e94f0ecd2b244f9f6af9f66100f0c3a3247f3c55e06db8e88dfadbf96b3c716e201869379e089893dfc9e53715adc867b4303980b83a745975e1cd2b443eb2bd SHA512 0ef8acda0a6cb7ad419d7501a9cf9f98ddf9134ba584090364a92c0bc106e05f6497e9b5979b8df8f155332a40bd806706b1bfc84fe066429206f9e874685409
-EBUILD stratisd-2.1.0.ebuild 3647 BLAKE2B 6b5b16a85781228acee5c4c6c6cae53a0c046bdbcc10412e14af618c005f373e58c572b44a59710c5da3576700d5ea86a90fbcf2c0f416ddda2b3de707c39004 SHA512 7714b512ff8a88f7f6a92ca20ef999af049abd69c9656eda27be4d2b4138034711db4f340ab284bcdcfe8aa51c3ba91657c7f154197945a3704e6069da59f1e4
+EBUILD stratisd-2.1.0-r1.ebuild 3829 BLAKE2B a50922c7d3c97045155cdc1417a1311503405c3ba9c96f6f19554dc246fd77411944fa9e914e845ec565fa1f9fbc0487b4351ae3f08b75fa6dd207eb980a091b SHA512 19119064f0502cd51080942049f36e8d4ec28fcc7da4260b6cbad6d4ff706648583e2d202990d2407dcd0d010dcb30e687f757d43683a87be51dde50f6b3bf0e
 MISC metadata.xml 364 BLAKE2B 05556be8a2ea9f74b4592df7eb2038f3baee6c2863129b938540e509c241ede9651e8221dcc9abf13f015af316aafefafcf9e9121034cdaa1d5967b910e67be1 SHA512 ae850f4a01394975342a4e078a1486a179c4155cb262ad89a25073da25823d48989f7cb34673f4c71520f624f8619cb5932bff62b0c912af27ecc71fe8327a52
diff --git a/sys-fs/stratisd/stratisd-2.1.0.ebuild b/sys-fs/stratisd/stratisd-2.1.0-r1.ebuild
similarity index 94%
rename from sys-fs/stratisd/stratisd-2.1.0.ebuild
rename to sys-fs/stratisd/stratisd-2.1.0-r1.ebuild
index a2d6498..70d6910 100644
--- a/sys-fs/stratisd/stratisd-2.1.0.ebuild
+++ b/sys-fs/stratisd/stratisd-2.1.0-r1.ebuild
@@ -138,10 +138,11 @@ IUSE="elibc_musl"
 
 BDEPEND="
 	>=virtual/rust-1.43.0
+	sys-devel/clang
 "
 DEPEND="
 	sys-apps/dbus
-	|| ( sys-fs/eudev sys-fs/udev )
+	virtual/udev
 	dev-libs/libpcre
 	>=sys-fs/cryptsetup-2.3
 	>=sys-apps/util-linux-2.32
@@ -161,6 +162,14 @@ PATCHES=(
 	${FILESDIR}/0002-duplicate_check-disable.patch
 )
 
+src_prepare() {
+	default
+
+	# Fix musl build
+	cd ${WORKDIR}/cargo_home/gentoo/devicemapper-0.28.0
+	eapply ${FILESDIR}/0001-Fix-issue-of-devicemapper-rs-compatibility-with-musl.patch
+}
+
 src_compile(){
 	RUSTFLAGS="-C target-feature=-crt-static" cargo_src_compile --no-default-features
 	mv "${S}"/target/release/stratisd "${S}"/target/release/stratisd-init