diff --git a/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch
new file mode 100644
index 0000000000..607c69b78a
--- /dev/null
+++ b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch
@@ -0,0 +1,49 @@
+From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Wed, 8 Jul 2020 11:57:35 +0200
+Subject: [PATCH] Use correct versions when binding globals
+
+Changes to protocols aren't forward-compatible. It's not possible to use
+version n+1 when a client has been designed to work with version n. For
+instance in wlr-screencopy v5 a new event has been added. Binding to
+version 5 without upgrading the client leads to libwayland errors
+because libwayland doesn't know how to handle the event.
+
+The client needs to maintain its own version requirements.
+
+Closes: https://github.com/cyclopsian/wdisplays/issues/18
+---
+ src/outputs.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/outputs.c b/src/outputs.c
+index 9ebf7e5..40410ec 100644
+--- a/src/outputs.c
++++ b/src/outputs.c
+@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
+ 
+   if (strcmp(interface, zwlr_output_manager_v1_interface.name) == 0) {
+     state->output_manager = wl_registry_bind(registry, name,
+-        &zwlr_output_manager_v1_interface, version);
++        &zwlr_output_manager_v1_interface, 1);
+     zwlr_output_manager_v1_add_listener(state->output_manager,
+         &output_manager_listener, state);
+   } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
+     state->xdg_output_manager = wl_registry_bind(registry, name,
+-        &zxdg_output_manager_v1_interface, version);
++        &zxdg_output_manager_v1_interface, 3);
+   } else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) {
+     state->copy_manager = wl_registry_bind(registry, name,
+-        &zwlr_screencopy_manager_v1_interface, version);
++        &zwlr_screencopy_manager_v1_interface, 1);
+   } else if(strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
+     state->layer_shell = wl_registry_bind(registry, name,
+-        &zwlr_layer_shell_v1_interface, version);
++        &zwlr_layer_shell_v1_interface, 1);
+   } else if(strcmp(interface, wl_shm_interface.name) == 0) {
+-    state->shm = wl_registry_bind(registry, name, &wl_shm_interface, version);
++    state->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
+   }
+ }
+ 
+
diff --git a/gui-apps/wdisplays/wdisplays-1.0.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild
similarity index 92%
rename from gui-apps/wdisplays/wdisplays-1.0.ebuild
rename to gui-apps/wdisplays/wdisplays-1.0-r1.ebuild
index 39f2b9d380..88076f1e75 100644
--- a/gui-apps/wdisplays/wdisplays-1.0.ebuild
+++ b/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild
@@ -25,3 +25,5 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 KEYWORDS="~amd64"
+
+PATCHES=("${FILESDIR}/${P}-pull20.patch")
diff --git a/net-misc/FORT-validator/FORT-validator-1.3.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.3.0.ebuild
new file mode 100644
index 0000000000..ce424e3a5c
--- /dev/null
+++ b/net-misc/FORT-validator/FORT-validator-1.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fcaps systemd
+
+DESCRIPTION="FORT validator is an open source RPKI validator"
+HOMEPAGE="https://fortproject.net/validator?2"
+SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+MY_PN="fort"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps libressl"
+
+DEPEND="
+	acct-group/fort
+	acct-user/fort
+	caps? ( sys-libs/libcap )
+	dev-libs/jansson
+	libressl?	( dev-libs/libressl:0= )
+	!libressl?	( dev-libs/openssl:0= )
+"
+RDEPEND="
+	${DEPEND}
+	net-misc/rsync
+"
+BDEPEND="
+	sys-devel/autoconf
+	sys-devel/automake
+"
+
+PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN}
+	newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN}
+
+	emake DESTDIR="${D}" 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
+
+	exeinto "/usr/libexec/${MY_PN}"
+	doexe fort_setup.sh
+
+	systemd_dounit "${FILESDIR}/${MY_PN}.service"
+}
+
+pkg_postinst() {
+	fcaps cap_net_bind_service usr/bin/fort
+
+	einfo ""
+	einfo "ARIN TAL is disabled by default because the ARIN Relying Party"
+	einfo "Agreement must be accepted beforehead. Start fort, run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT}/usr/libexec/${MY_PN}/fort_setup.sh /usr/share/${MY_PN}/tal/' fort"
+	einfo ""
+	einfo "as root and restart fort to enable it."
+	einfo "The configuration file generation will provide a config file, but a"
+	einfo "simpler one is shiped with the ebuid. Use the one you prefer."
+}
diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest
index abb872407d..2ed1991db5 100644
--- a/net-misc/FORT-validator/Manifest
+++ b/net-misc/FORT-validator/Manifest
@@ -1,2 +1,3 @@
 DIST FORT-validator-1.2.0.tar.gz 427483 BLAKE2B 05fbec44fb17fa188b6196a2b166f2e112224dcf4071cc875ed1f3a147b28acff94c89b0c0a658aaee197e1820d9f53803e73add81e355f7df07713fcdb0df00 SHA512 e89b1aa7c0cd4036d04a017898e1a6017450f5dab96e57c35b0aa532b212b23f7fab17ca117a9461c9bdacca511ea70341e692a4d5e8f277ae8e277c1d48706e
 DIST FORT-validator-1.2.1.tar.gz 431832 BLAKE2B 25459e591a531dcf3326baec06c9e462611f1fd727bd79623d0f5eae0f02b2398e698ea6f0cf7608061f5e125afb056c7dff9b1dcc6fbe01332e573e8c4b1f15 SHA512 87d256a02ca6d3c00bb2245476c126b076f6c57e9eeaefb2dcb0dfed5763b5769731de08e4168c9ce701a2820eeda69c3bf054c8445b910948504fdb7b0b6b50
+DIST FORT-validator-1.3.0.tar.gz 444918 BLAKE2B 3a8fb8cce5c71d22ab402d6b6a1478f173641a3876bad04e9fde4373d2a6b49395ff692aa048579886a82a799ed7849fc51d86c798b0b0ea9c594b4eb532b367 SHA512 0aed86979e6b9c3142cc9a53d13a619dbe22a3e05bcc26f30fda5048ac3e9d31b83307fbd4a68543eaf948954dbaba54edbce9b90ab0189d15c3629b220d094c
diff --git a/net-p2p/trezord-go/Manifest b/net-p2p/trezord-go/Manifest
index 3f32a88dc6..2763dabc84 100644
--- a/net-p2p/trezord-go/Manifest
+++ b/net-p2p/trezord-go/Manifest
@@ -1 +1 @@
-DIST trezord-go-2.0.29.tar.gz 5578837 BLAKE2B e13d30cb2174453e77425df556fa01a74928f1b0a779dcd99d198b70c49ff61a59cdc9853b18387653128f4f318c58885d79c7bd5c1d1ecd40b0a812ccfdc147 SHA512 cb2fd99631f8e5e1d095ee3afdbb8d755795d59c96658d4b843d1c255c25260d160346b17f974931f8b6ae27a3f4a28e72c86aaf63b51bb4e5610e8344e948dd
+DIST trezord-go-2.0.29.tar.gz 5579397 BLAKE2B f3b47d8016cbbb652555440ed1a510d8968d8eeafce177526418d3027688470c7f626b73ebb7de4fe56eff167534731efc8b895a9c0d0b50112f0b41f79c9224 SHA512 358aff3087ab9b1c57ce323f1827efe4e084503ab7bd88942bba0b7581f1c01474e31df17391d182a4fff749c05c691bfad6001752d6a28d6270d872b81f734d
diff --git a/www-client/badwolf/Manifest b/www-client/badwolf/Manifest
index 14726a327d..a6277d5e2d 100644
--- a/www-client/badwolf/Manifest
+++ b/www-client/badwolf/Manifest
@@ -1 +1 @@
-DIST badwolf-1.0.0.tar.gz 69676 BLAKE2B 44b463b0096f1971ae01d48556f70636c58c96324c2fcfb4a1b2507f78f6cdcb5c4b51e68f64b20c5fbafdf529bbc8e2f4ec60d383405019fa556a9697948cae SHA512 72437709a32937c33dc0509f94efbb5f3551b039017d3067b02f5d2b275eb4f3883dba8dc1c1b4b82bfa31a7b174f5fa393ceeefaf627d9b6c27be0fea5a0652
+DIST badwolf-1.0.2.tar.gz 70008 BLAKE2B 22d8738e00dc27cd7c06e945d9e2f83601b7955e8f45b9551613ae0bc6a5321562d2608466abc5c61a502ec753ff8a3a492ea193528bf1803fb7e759a8e98ac6 SHA512 6c4e33adb62e13a5d6e878fc649d1e2764e0995db5b34a946a9b7aed2d85bb990248168b322801b7366a0d22ff8ae886092ca68f436f815ba2667ee13b13e4ea
diff --git a/www-client/badwolf/badwolf-1.0.0.ebuild b/www-client/badwolf/badwolf-1.0.2.ebuild
similarity index 100%
rename from www-client/badwolf/badwolf-1.0.0.ebuild
rename to www-client/badwolf/badwolf-1.0.2.ebuild