diff --git a/net-misc/t50/Manifest b/net-misc/t50/Manifest
new file mode 100644
index 000000000..577b536ce
--- /dev/null
+++ b/net-misc/t50/Manifest
@@ -0,0 +1 @@
+DIST t50-5.8.5.tar.gz 91881 BLAKE2B 91c439751a3e491b4f9e6c62626dc238189137b6e03317c5133ce4d557ca45893d3b38e507a4044352e412c638f14d4e255b1fc02f4fede43a6178a5eb2a1eb6 SHA512 381cd89c135bcaf6a0c9b96c0533cd03db76102abe234a7d17687672c485cbaaee36936110bfedade58b5449b788bd95a5b239a840dc99f4233416380120d112
diff --git a/net-misc/t50/t50-20130423.ebuild b/net-misc/t50/t50-5.8.5.ebuild
similarity index 57%
rename from net-misc/t50/t50-20130423.ebuild
rename to net-misc/t50/t50-5.8.5.ebuild
index ba3312a8e..ff921364a 100644
--- a/net-misc/t50/t50-20130423.ebuild
+++ b/net-misc/t50/t50-5.8.5.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=4
-
-inherit git-2
+EAPI=7
 
 DESCRIPTION="Mixed Packet Injector & Network Stress Testing Tool"
 HOMEPAGE="https://github.com/merces/t50"
-EGIT_REPO_URI="https://github.com/merces/t50.git"
-EGIT_COMMIT="e3853e359e55a7edc83afa991669ecf147ff7467"
+
+HASH_COMMIT="b7f40164618fffcde749086f1a2025433deccf1c"
+SRC_URI="https://gitlab.com/fredericopissarra/t50/-/archive/v${PV}/${P}.tar.gz"
+#SRC_URI="https://gitlab.com/merces/t50/repository/${HASH_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,16 +17,18 @@ KEYWORDS="~amd64 ~x86"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+S=${WORKDIR}/${PN}-v${PV}-${HASH_COMMIT}
+
 src_prepare() {
 	#Fix broken Makefile
 	sed -i "s|STRIP=-s|STRIP=|" Makefile || die
 	sed -i "s|\$(CFLAGS)|\$(CFLAGS) \$(LDFLAGS)|" Makefile || die
+	eapply_user
 }
 
 src_install() {
 	#It's easy to re-write the install script
 #	emake DESTDIR="${D}" install
-	dosbin ${PN}
-	dodoc readme
-	doman doc/t50.1
+	dosbin bin/${PN}
+	doman doc/t50.8
 }