diff --git a/net-analyzer/fierce/Manifest b/net-analyzer/fierce/Manifest
index 946e3603cd..a03dd3ddc0 100644
--- a/net-analyzer/fierce/Manifest
+++ b/net-analyzer/fierce/Manifest
@@ -1,2 +1,2 @@
-DIST fierce-1.4.0.tar.gz 114506 BLAKE2B f62a26e06fb65a0e350ef2db743a390a9fa22ea24c7abe1f436f938263eb414d7beaf54dfd09386235b23bb7d477c98ca4407e41851c9713f7907cfbdcb04b71 SHA512 6781f1b9f569a60b4e4ba157bef8173868d3f9064b358931232dec9c91e976b5561087e0a1eace9a41db4b914b7b88d035abcad81258781cb50308f5e534f93c
 DIST fierce-1.5.0.tar.gz 121142 BLAKE2B 6520530562f4a4aceaacdc3dabffe75dc7d4edfe210a4269c9c2a807671d4493e20043f2b372f2eb33b10344900bc05be2e1e05502079bba28f339c13faf43fe SHA512 c70a75fd121a5177b5cbe7e28354cd9a4efe81b88db3abe7e7fa3c88c3e66ea54d20eee8c6fac4e6a8cc0b48832f7d493818ff4a3033f4efa8dd4990ad8071aa
+DIST fierce-1.6.0.tar.gz 127208 BLAKE2B 0715ea9eb6e1f1d03b6528445b7c4662d2f24d740f2b4cc08f2674cc1edf81fd28085cff96c1365d699bf69585d5478726871774e79307c94935502ccbe1a8c8 SHA512 0894d7f05d0f173ff5bc4ae7d9af738556e416f6fe9ebe78b37adb9250f971d7bddea2e10080d1898b2956cb541473049924f82ece56e2cc95b522b46e9814c3
diff --git a/net-analyzer/fierce/fierce-1.4.0-r1.ebuild b/net-analyzer/fierce/fierce-1.6.0.ebuild
similarity index 100%
rename from net-analyzer/fierce/fierce-1.4.0-r1.ebuild
rename to net-analyzer/fierce/fierce-1.6.0.ebuild
diff --git a/net-analyzer/fierce/fierce-9999.ebuild b/net-analyzer/fierce/fierce-9999.ebuild
index f51b391b3f..71301ec4c0 100644
--- a/net-analyzer/fierce/fierce-9999.ebuild
+++ b/net-analyzer/fierce/fierce-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
@@ -11,21 +12,20 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/mschwager/fierce.git"
 else
 	SRC_URI="https://github.com/mschwager/fierce/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="A DNS reconnaissance tool for locating non-contiguous IP space"
 HOMEPAGE="https://github.com/mschwager/fierce"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
-#/etc/resolv.conf doesn't exist, 
+#/etc/resolv.conf doesn't exist,
 RESTRICT="test"
 
 RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+#	dev-python/setuptools[${PYTHON_USEDEP}]"
 #	test? ( dev-python/pytest
 #		dev-python/pyfakefs )"
 
diff --git a/net-analyzer/fierce/metadata.xml b/net-analyzer/fierce/metadata.xml
new file mode 100644
index 0000000000..16560fb60e
--- /dev/null
+++ b/net-analyzer/fierce/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>unknown@pentoo.ch</email>
+		<name>Author Unknown</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mschwager/fierce</remote-id>
+	</upstream>
+</pkgmetadata>