diff --git a/dev-libs/libfvalue/Manifest b/dev-libs/libfvalue/Manifest
index bd1ce2e9e..ae9e9826f 100644
--- a/dev-libs/libfvalue/Manifest
+++ b/dev-libs/libfvalue/Manifest
@@ -1,3 +1,2 @@
-DIST libfvalue-experimental-20200711.tar.gz 1269938 BLAKE2B 943e16a7bc68c0ebe3a73fa874409134d6f8f792e48c7e3624dcfc7a21b7c56dbb464eef057658a315a9dfc245e7dadf8085eb387f27d4c8901d7c5e01fd42a3 SHA512 e609841275bb28fd9ffb037faf7e2e390ca964245658f9e287e333279f169b137e62603ad0e77cff834ffda6cdb64a93dbee9a12d7f821c44b6cf0df000698f6
-DIST libfvalue-experimental-20200902.tar.gz 1270330 BLAKE2B ab13beecd067e067d8744ebb8750e3524702feebb727068a7d71417ee443c3136070b0eec65a15c820ac74e1b625435057c484fa713b24f277f7e0b6a1d491fb SHA512 169d8f31ca101c37670ea55e364ece270ab85f2c4899c31f3bd53cd3acf3f17346ebf200565e9a210c34527fc4264ff69649f453f8c50d1d8c609e5de7ba965e
+DIST libfvalue-experimental-20201124.tar.gz 1270349 BLAKE2B 39adefec3602ac459a35536bf229a1f255f962dfce987d80294c6ed630d948a1bd34e0c6fa02656c3bba8cd7cb3c33d84fd29fafe0e58396e1fcbcc7ccaa5b60 SHA512 8772020e6ea9b10a31ed4fe800297138a54e3a9dbb2e8a0dbe1b21fa8307f5df30db21570f89cdcb83fe3b8ae320fa1aeaa9e66848da2adde6f2d2f8886c2f1d
 DIST libfvalue-experimental-20220120.tar.gz 1294430 BLAKE2B 8fd0ef033bf182cf4803ed1189ba53150a9a2200e3c49196d169178ef502889d34da38e2b771bdce722a36a2acde05cd21abcfb5ffef5ca084a81ca75427f721 SHA512 6b363be7a4ce4ccfbff5e7fbb7bcd9c0433f81dcd53571fe17975404c40ef55147fd610aff8ee89633f09a672a60d132b46994ec365ed01af2293105602fc0ca
diff --git a/dev-libs/libfvalue/libfvalue-20200711.ebuild b/dev-libs/libfvalue/libfvalue-20200711.ebuild
deleted file mode 100644
index 25e9e2b82..000000000
--- a/dev-libs/libfvalue/libfvalue-20200711.ebuild
+++ /dev/null
@@ -1,43 +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"
-
-DESCRIPTION="Library for generic file value functions"
-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 ~arm64 ~x86"
-IUSE="debug 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) \
-		$(use_enable debug debug-output) \
-		$(use_enable debug verbose-output)
-#		--with-libcdata --with-libcerror \
-#		--with-libcnotify --with-libcthreads \
-#		--with-libfdatetime --with-libfguid \
-#		--with-libfwnt --with-libuna
-}
diff --git a/dev-libs/libfvalue/libfvalue-20200902.ebuild b/dev-libs/libfvalue/libfvalue-20200902.ebuild
deleted file mode 100644
index 6d86df970..000000000
--- a/dev-libs/libfvalue/libfvalue-20200902.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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"
-
-DESCRIPTION="Library for generic file value functions"
-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 ~arm64 ~x86"
-IUSE="debug 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) \
-		$(use_enable debug debug-output) \
-		$(use_enable debug verbose-output)
-#		--with-libcdata --with-libcerror \
-#		--with-libcnotify --with-libcthreads \
-#		--with-libfdatetime --with-libfguid \
-#		--with-libfwnt --with-libuna
-}
diff --git a/dev-libs/libfvalue/libfvalue-20201124.ebuild b/dev-libs/libfvalue/libfvalue-20201124.ebuild
new file mode 100644
index 000000000..df76d0e76
--- /dev/null
+++ b/dev-libs/libfvalue/libfvalue-20201124.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library for generic file value functions"
+HOMEPAGE="https://github.com/libyal/libfvalue"
+SRC_URI="https://github.com/libyal/libfvalue/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
+	dev-libs/libcerror
+	dev-libs/libcnotify
+	dev-libs/libcthreads
+	dev-libs/libfdatetime
+	dev-libs/libfguid
+	dev-libs/libfwnt
+	dev-libs/libuna
+	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)
+
+#  --disable-shared-libs   disable shared library support
+# not supported in the ebuild at the moment - kind of defeats the entire process
+
+#  --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
+}
diff --git a/dev-libs/libfvalue/libfvalue-20220120.ebuild b/dev-libs/libfvalue/libfvalue-20220120.ebuild
index 6d86df970..df76d0e76 100644
--- a/dev-libs/libfvalue/libfvalue-20220120.ebuild
+++ b/dev-libs/libfvalue/libfvalue-20220120.ebuild
@@ -1,43 +1,54 @@
 # Copyright 1999-2021 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"
-
 DESCRIPTION="Library for generic file value functions"
-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/libfvalue"
+SRC_URI="https://github.com/libyal/libfvalue/releases/download/${PV}/${PN}-experimental-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug nls"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="nls debug +threads"
 
-DEPEND="dev-libs/libcdata
+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"
-
+	dev-libs/libuna
+	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) \
 		$(use_enable debug debug-output) \
-		$(use_enable debug verbose-output)
-#		--with-libcdata --with-libcerror \
-#		--with-libcnotify --with-libcthreads \
-#		--with-libfdatetime --with-libfguid \
-#		--with-libfwnt --with-libuna
+		$(use_enable debug verbose-output) \
+		$(use_enable threads multi-threading-support)
+
+#  --disable-shared-libs   disable shared library support
+# not supported in the ebuild at the moment - kind of defeats the entire process
+
+#  --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
 }