diff --git a/dev-libs/libfmapi/Manifest b/dev-libs/libfmapi/Manifest
index 99a5dc7dc..38eb7bb86 100644
--- a/dev-libs/libfmapi/Manifest
+++ b/dev-libs/libfmapi/Manifest
@@ -1,2 +1,2 @@
-DIST libfmapi-experimental-20170112.tar.gz 1183679 BLAKE2B d3cfc7ef1eb74bfce62ae9fa26d6b9d44a1bb629b52820c11fe556bf86d2f9b6ce24587a0d27276da73389350188227e3a698af10877a078c96185d3b789ae6a SHA512 8df29d87ff9e4beb29bbeee11f369c621cd7e38a5bb5db3fb51d36f9580a671a762b2cb74a387c1acf62d95ab5f4e5aec122ba342d7a22be0cd4a7c76b5d3622
 DIST libfmapi-experimental-20180714.tar.gz 1185317 BLAKE2B c8a5421c3aa1c2427c85176d70d68584a061f804bdd25c655f174397871fb718c1f0c675e995936fabbc7409ada4d15e8d5f9178a6f23a6ab5f89ca65a11c501 SHA512 15bf42b92536f6892fdf8cf2c9f8e4db8646d8ae2c3ba1d900b9da19ea65cc95fd61b270b6db93f50e02312b0b84b53e55ef9b9806d1c08089365f244fd8c5fb
+DIST libfmapi-experimental-20220114.tar.gz 1254563 BLAKE2B b3992595202cf86f13de4c53362b87e74449457728b03a4b43011e34047e1e02043f7fe5db006a922b17dd4cf31bf094ee3bf07e8923ea8d4435b28282e9323f SHA512 f3284b286362561aba5db310f30e4ddc7bec20bf8d19d43e8c5027bb18399b491ec40e11ae8b4c6c4a390ccd5b03481908704acced8005075a821d25f47a0398
diff --git a/dev-libs/libfmapi/libfmapi-20170112.ebuild b/dev-libs/libfmapi/libfmapi-20170112.ebuild
deleted file mode 100644
index 4484fae10..000000000
--- a/dev-libs/libfmapi/libfmapi-20170112.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV="$(ver_cut 1)"
-MY_PV2="experimental"
-#$(get_after_major_version)"
-
-DESCRIPTION="Library for MAPI data types"
-HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="nls"
-
-DEPEND="dev-libs/libcdata
-	dev-libs/libcerror
-	dev-libs/libcnotify
-	dev-libs/libcthreads
-	dev-libs/libfdatetime
-	dev-libs/libfguid
-	dev-libs/libfwnt
-	dev-libs/libuna"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() {
-	econf $(use_enable nls) \
-		$(use_with nls libiconv-prefix) \
-		$(use_with nls libintl-prefix) \
-		--with-libcdata --with-libcerror \
-		--with-libcnotify --with-libcthreads \
-		--with-libfdatetime --with-libfguid \
-		--with-libfwnt --with-libuna
-}
diff --git a/dev-libs/libfmapi/libfmapi-20180714.ebuild b/dev-libs/libfmapi/libfmapi-20180714.ebuild
index 887143293..e3bae2545 100644
--- a/dev-libs/libfmapi/libfmapi-20180714.ebuild
+++ b/dev-libs/libfmapi/libfmapi-20180714.ebuild
@@ -1,42 +1,57 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
-MY_PV="$(ver_cut 1)"
-MY_PV2="experimental"
-#$(get_after_major_version)"
-
 DESCRIPTION="Library for MAPI data types"
-HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV2}-${MY_PV}.tar.gz"
+HOMEPAGE="https://github.com/libyal/libfmapi"
+SRC_URI="https://github.com/libyal/libfmapi/releases/download/${PV}/${PN}-experimental-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls"
-
-DEPEND="dev-libs/libcdata
-	dev-libs/libcerror
-	dev-libs/libcnotify
-	dev-libs/libcthreads
-	dev-libs/libfdatetime
-	dev-libs/libfguid
-	dev-libs/libfwnt
-	dev-libs/libuna"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="nls debug +threads"
 
+DEPEND="
+	dev-libs/libcdata[nls=]
+	dev-libs/libcerror[nls=]
+	dev-libs/libcnotify[nls=]
+	dev-libs/libcthreads[nls=]
+	dev-libs/libfdatetime[nls=]
+	dev-libs/libfguid[nls=]
+	dev-libs/libfwnt[nls=]
+	dev-libs/libuna[nls=]
+	nls? (
+		virtual/libiconv
+		virtual/libintl
+	)
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+src_prepare() {
+	#makefile was created with 1.16, let's regenerate it
+	eautoreconf
+	eapply_user
+}
 
 src_configure() {
-	econf $(use_enable nls) \
+	econf \
+		$(use_enable nls) \
 		$(use_with nls libiconv-prefix) \
 		$(use_with nls libintl-prefix) \
-		--with-libcdata --with-libcerror \
-		--with-libcnotify --with-libcthreads \
-		--with-libfdatetime --with-libfguid \
-		--with-libfwnt --with-libuna
+		$(use_enable debug debug-output) \
+		$(use_enable debug verbose-output) \
+		$(use_enable threads multi-threading-support)
+
+#  --enable-winapi         enable WINAPI support for cross-compilation
+#                          [default=auto-detect]
+# not supported in the ebuild at the moment - requires windows.h, does not make much sense for us
+}
+
+src_install() {
+	default
+	# see https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libfmapi/libfmapi-20220114.ebuild b/dev-libs/libfmapi/libfmapi-20220114.ebuild
new file mode 100644
index 000000000..e3bae2545
--- /dev/null
+++ b/dev-libs/libfmapi/libfmapi-20220114.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library for MAPI data types"
+HOMEPAGE="https://github.com/libyal/libfmapi"
+SRC_URI="https://github.com/libyal/libfmapi/releases/download/${PV}/${PN}-experimental-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="nls debug +threads"
+
+DEPEND="
+	dev-libs/libcdata[nls=]
+	dev-libs/libcerror[nls=]
+	dev-libs/libcnotify[nls=]
+	dev-libs/libcthreads[nls=]
+	dev-libs/libfdatetime[nls=]
+	dev-libs/libfguid[nls=]
+	dev-libs/libfwnt[nls=]
+	dev-libs/libuna[nls=]
+	nls? (
+		virtual/libiconv
+		virtual/libintl
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#makefile was created with 1.16, let's regenerate it
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with nls libiconv-prefix) \
+		$(use_with nls libintl-prefix) \
+		$(use_enable debug debug-output) \
+		$(use_enable debug verbose-output) \
+		$(use_enable threads multi-threading-support)
+
+#  --enable-winapi         enable WINAPI support for cross-compilation
+#                          [default=auto-detect]
+# not supported in the ebuild at the moment - requires windows.h, does not make much sense for us
+}
+
+src_install() {
+	default
+	# see https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
+	find "${ED}" -name '*.la' -delete || die
+}