diff --git a/metadata/md5-cache/net-misc/FORT-validator-1.5.4 b/metadata/md5-cache/net-misc/FORT-validator-1.5.4
index ddf5d43..d61b3c3 100644
--- a/metadata/md5-cache/net-misc/FORT-validator-1.5.4
+++ b/metadata/md5-cache/net-misc/FORT-validator-1.5.4
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/libxml2 dev-libs/openssl net-misc/curl net-misc/rsync filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/NICMx/FORT-validator/releases/download/1.5.4/fort-1.5.4.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	edeef89edaf21d30225d31702ab117ac	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=002db88485f03f4fbb12459dfb060cac
diff --git a/metadata/md5-cache/net-misc/FORT-validator-1.6.0 b/metadata/md5-cache/net-misc/FORT-validator-1.6.0
index 91e310f..66dc05b 100644
--- a/metadata/md5-cache/net-misc/FORT-validator-1.6.0
+++ b/metadata/md5-cache/net-misc/FORT-validator-1.6.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/libxml2 dev-libs/openssl net-misc/curl net-misc/rsync filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/NICMx/FORT-validator/releases/download/1.6.0/fort-1.6.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	edeef89edaf21d30225d31702ab117ac	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=002db88485f03f4fbb12459dfb060cac
diff --git a/metadata/md5-cache/net-misc/FORT-validator-1.5.3_p20220607 b/metadata/md5-cache/net-misc/FORT-validator-1.6.1
similarity index 70%
rename from metadata/md5-cache/net-misc/FORT-validator-1.5.3_p20220607
rename to metadata/md5-cache/net-misc/FORT-validator-1.6.1
index b6594e3..04daa05 100644
--- a/metadata/md5-cache/net-misc/FORT-validator-1.5.3_p20220607
+++ b/metadata/md5-cache/net-misc/FORT-validator-1.6.1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
 DEFINED_PHASES=install postinst prepare
-DEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/openssl
+DEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/libxml2 dev-libs/openssl net-misc/curl
 DESCRIPTION=FORT validator is an open source RPKI validator
 EAPI=7
 HOMEPAGE=https://fortproject.net/validator?2
@@ -8,8 +8,8 @@ INHERIT=autotools fcaps systemd
 IUSE=caps +filecaps
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/openssl net-misc/rsync filecaps? ( sys-libs/libcap )
+RDEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/libxml2 dev-libs/openssl net-misc/curl net-misc/rsync filecaps? ( sys-libs/libcap )
 SLOT=0
-SRC_URI=https://github.com/NICMx/FORT-validator/archive/refs/heads/issue83.zip -> fort-1.5.3_p20220607.zip
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	edeef89edaf21d30225d31702ab117ac	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
-_md5_=b9776f001de4c37803e0b5252dcab6aa
+SRC_URI=https://github.com/NICMx/FORT-validator/releases/download/1.6.1/fort-1.6.1.tar.gz
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	6ae9a4347149b19a112caa1182d03bde	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
+_md5_=002db88485f03f4fbb12459dfb060cac
diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild
new file mode 100644
index 0000000..f4cc23c
--- /dev/null
+++ b/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fcaps systemd
+
+MY_PN="fort"
+
+DESCRIPTION="FORT validator is an open source RPKI validator"
+HOMEPAGE="https://fortproject.net/validator?2"
+SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+DEPEND="
+	acct-group/fort
+	acct-user/fort
+	caps? ( sys-libs/libcap )
+	dev-libs/jansson
+	dev-libs/libxml2
+	dev-libs/openssl
+	net-misc/curl
+"
+RDEPEND="
+	${DEPEND}
+	net-misc/rsync
+"
+BDEPEND="
+	sys-devel/autoconf
+	sys-devel/automake
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+	# Don't strip CFLAGS
+	sed -i 's/fort_CFLAGS  =/fort_CFLAGS  = ${CFLAGS} /' src/Makefile.am || die
+	# Don't test network
+	sed -i '/http/d' test/Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN}
+	newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN}
+
+	emake DESTDIR="${ED}" install
+	insinto /usr/share/${MY_PN}/
+	insopts -m0644 -o "${MY_PN}"
+	diropts -m0755 -o "${MY_PN}"
+	doins -r examples/tal/
+
+	dodoc -r examples/
+
+	insinto /etc/fort
+	newins "${FILESDIR}/fort-config.json" config.json
+
+	systemd_dounit "${FILESDIR}/${MY_PN}-1.5.service"
+}
+
+pkg_postinst() {
+	fcaps cap_net_bind_service usr/bin/fort
+
+	einfo ""
+	einfo "You have to init the TALs before the first run. To do so, run "
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT}/usr/bin/${MY_PN} --init-tals --tal /usr/share/${MY_PN}/tal/' fort"
+	einfo ""
+	einfo "as root."
+}
diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest
index 4a99542..3a83b63 100644
--- a/net-misc/FORT-validator/Manifest
+++ b/net-misc/FORT-validator/Manifest
@@ -1,2 +1,3 @@
 DIST fort-1.5.4.tar.gz 563138 BLAKE2B bd2a680a41b678bbf49d762fdd1f0f20e2c8bbf3fa80cb57c996d39ad39118ead3ebed7737bdef7478effbb6fa6e7fb39cd3c945a495f613a010dd79bea4f5d6 SHA512 44ec8dd28ab087f1d78f999c53b5dee8f13a6fc9bdf590d3261d640488b118e14970d88c5c5851e602a8119704378088230b8137978ef3caf6bab909af36408e
 DIST fort-1.6.0.tar.gz 547314 BLAKE2B d69c0e489ec5dae379bd4e6897c8c0f825c30995e655c150ca43931d2735daa115b5bdd7213f5ad9bb4e3cc23d04e759a0d8df2af9c9a5016d16b3ef4ef990ac SHA512 58f26fca0f2438b168f15b46eae935f8ea56920f2459513c8b2bbc8df156f6ca93f61a86a564f4e89e63ce5299869daaf955d50beed5901cf761f7d5bd77ce1f
+DIST fort-1.6.1.tar.gz 547724 BLAKE2B 362299bf0a190b9d8cf6f658f2830435ceb78c4bc181e6735e2291f2d766018e9402cc596c20ef4b98aca43ac1c8edfee8369f237f0b9c1e657cf31ae2d023b0 SHA512 84ad18e730fca7ac67c028dc5b05a5b5d175eaa4eb2edade238ae16064c2f83865e263e767d37938c975578236edd8cba0b8604099a9e3ccef13250d2feb46dd