diff --git a/sci-electronics/vzlogger/Manifest b/sci-electronics/vzlogger/Manifest
index 46c646e..05b940e 100644
--- a/sci-electronics/vzlogger/Manifest
+++ b/sci-electronics/vzlogger/Manifest
@@ -1,2 +1,2 @@
 AUX vzlogger.logrotate 71 BLAKE2B ac41e0c56cd3ddc1432635ce2ef9c6e383dab49422215b6610ebbff8890916308caf22cc6d10c86e126190dfb8d18f2c6b13f2078c7febcab7a48ca52878f6e5 SHA512 cbb813856a949bd4e11a552def0ce18e55f7127e8a03c7e5d42302f49e79bba004a9f80789f554899c7f5304b555bcc2d85ad837b00e8201550c1a642b64c17a
-EBUILD vzlogger-9999.ebuild 1508 BLAKE2B 9ec428e28b64da419961d7c86ea01d55cfe6cee914b60bbf09245927316f4d3c24128f5fcc2324b4493e28b168715a6986412845efc12ba7cda637ed8a659604 SHA512 70f677052c8f0f38e442ac641d250bd9faef0d692cf6690b646a42701359a2dc8b479c503b851211e8dc09380ad3dd797f65acbfcd731e0003502d54c9e6bc47
+EBUILD vzlogger-9999.ebuild 1650 BLAKE2B 17dbd79609f3924c19c9eaa5085d9fa0ffedb92ece66884aee271642561fbf4f8113002e012590cfe581af4b8261d686000ef52f0b86f8e9c2a9c724f9e0ef07 SHA512 3e39a14c70b58ae00c7ab8cea99e98627cd0a85b6593b6ab811dc7b9a9826d4e34162fcec254600c837430662418a11f2c5dfbc6d02637fa91b78502a2c21d0b
diff --git a/sci-electronics/vzlogger/vzlogger-9999.ebuild b/sci-electronics/vzlogger/vzlogger-9999.ebuild
index 8075bcf..efdfa88 100644
--- a/sci-electronics/vzlogger/vzlogger-9999.ebuild
+++ b/sci-electronics/vzlogger/vzlogger-9999.ebuild
@@ -36,6 +36,10 @@ src_prepare() {
 
 	cmake-utils_src_prepare
 
+	sed -e "s:Wno-system-headers:Wno-system-headers -Wno-error=deprecated-copy:" \
+		-i ${S}/modules/CompilerFlags.cmake \
+	|| die "sed failed"
+
 	sed -e "s@ExecStart=/usr/local/bin/vzlogger@ExecStart=/usr/bin/vzlogger@" \
 		-i ${S}/etc/vzlogger.service \
 	|| die "sed failed"
diff --git a/sci-libs/libsml/Manifest b/sci-libs/libsml/Manifest
index eb1bcbd..d3a421f 100644
--- a/sci-libs/libsml/Manifest
+++ b/sci-libs/libsml/Manifest
@@ -1,2 +1,2 @@
-EBUILD libsml-9999.ebuild 1203 BLAKE2B 86f8cf253e57ae5c2c3addd70c5dbfe68c9a430e14bd77b2badefe04c368d88bb041384bee7bfd19b2dfb6523851a03ef0c02f7f4203ffe05c1490bfdccefe5f SHA512 dd8c20b30abd4b759034f574953f6af2e9e3d52ba4d0dc250145b1e377efe23487ef1dc3bc81e8e94cab444b384d165e26f0d6212c30ebe991f5399cbe000a0b
+EBUILD libsml-9999.ebuild 1433 BLAKE2B 7d71fe080bbb00f5c0e88dc1ef062ab3d95cd384ad5ba2fe15571a7ca31d96e9d3a3d03a2620c28054bc57e384b5c2e174c3d61fd7eec22c026594e9e01af394 SHA512 87d232e5e5135116775eb7bc48830607464d1b401e30591fda741db4d8cda34dbc1ede0858c30b05360d1f29a478d4c7c0468203ed909c2055899ea984884299
 MISC metadata.xml 256 BLAKE2B 4c059fb5081287336047af5a449bebc0838049c83b5c7a078c308df426e16a2fe9d9b7f97e9e6cb4f4b2e2ee482391a7b0569b0d8a82d1668edee19711357ad6 SHA512 6cce7981d034a259ea4a4e010da189961cb8e64067cfb93b2497c02198b858161e70f4c0ac9db84e6dcd857c54e3e30de71b63d248167fd2b18185b337fc7d60
diff --git a/sci-libs/libsml/libsml-9999.ebuild b/sci-libs/libsml/libsml-9999.ebuild
index 493b595..11fa275 100644
--- a/sci-libs/libsml/libsml-9999.ebuild
+++ b/sci-libs/libsml/libsml-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit eutils
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit multilib-build eutils
 
 if [[ ${PV} == "9999" ]]; then
         EGIT_REPO_URI="https://github.com/volkszaehler/${PN}"
@@ -11,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/volkszaehler/${PN}/archive/${PV} -> ${P}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="A library which implements the Smart Message Language (SML)"
@@ -27,8 +29,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+EMULTILIB_PKG="true"
+
 src_prepare() {
-	sed -e "s@prefix = /usr/local@prefix = /usr@" \
+	local lib64="$(get_libdir)"
+	sed -e "s:prefix = /usr/local:prefix = /usr:" \
+		-i ${S}/sml/Makefile \
+	|| die "sed failed"
+
+	sed -e "s:libdir = \${exec_prefix}/lib:libdir = \$\{exec_prefix\}/${lib64}:" \
 		-i ${S}/sml/Makefile \
 	|| die "sed failed"
 
@@ -53,7 +62,7 @@ src_compile() {
 src_install() {
 	DESTDIR="${D}" emake -C sml install
 	use examples && DESTDIR="${D}" emake -C examples install
-	insinto /usr/lib/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${S}/sml.pc
 }