diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index 021b96761f..92d37de49e 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1 +1 @@
-DIST v0.2.0.tar.gz 233703 BLAKE2B 8131986f481031257a59a4d2902364cec042d3d773cee0dee3b1ef8628ea1e2dbb32619c6f9054b43c88a1da51a53d1877896f0082ad482387876000b47d40ab SHA512 c5e07199c950963ac6f398d36f2da760a6fa734e247ba1defc3b98f9aa53d1626cf519988a96c5c7e16f32b79d7f5ad6bec02d6eab84cc132f2f634176fdd2f5
+DIST tuba-0.2.0.tar.gz 233703 BLAKE2B 8131986f481031257a59a4d2902364cec042d3d773cee0dee3b1ef8628ea1e2dbb32619c6f9054b43c88a1da51a53d1877896f0082ad482387876000b47d40ab SHA512 c5e07199c950963ac6f398d36f2da760a6fa734e247ba1defc3b98f9aa53d1626cf519988a96c5c7e16f32b79d7f5ad6bec02d6eab84cc132f2f634176fdd2f5
diff --git a/net-misc/tuba/metadata.xml b/net-misc/tuba/metadata.xml
new file mode 100644
index 0000000000..8e05ae1b39
--- /dev/null
+++ b/net-misc/tuba/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>laurent@morretton.fr</email>
+    <name>Laurent Morretton</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">GeopJr/Tuba</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/tuba/tuba-0.2.0.ebuild b/net-misc/tuba/tuba-0.2.0.ebuild
index 67322e9c13..1c374c1a5b 100644
--- a/net-misc/tuba/tuba-0.2.0.ebuild
+++ b/net-misc/tuba/tuba-0.2.0.ebuild
@@ -7,13 +7,14 @@ inherit gnome2-utils meson vala xdg
 
 DESCRIPTION="Mastodon client, previously known as Tooth"
 HOMEPAGE="https://github.com/GeopJr/Tuba"
-SRC_URI="https://github.com/GeopJr/${PN}/archive/refs/tags/v${PV}.tar.gz"
+MY_PN="Tuba"
+SRC_URI="https://github.com/GeopJr/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC-BY-3.0 GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/Tuba-${PV}"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.20