diff --git a/dev-util/hut/Manifest b/dev-util/hut/Manifest
index f43fe41b82..11bd500cf5 100644
--- a/dev-util/hut/Manifest
+++ b/dev-util/hut/Manifest
@@ -1,2 +1,2 @@
-DIST hut-0.6.0.tar.gz 137077 BLAKE2B 7d9ba6aebb4439457026efe3e7d798c7ca483e9d02c586677053a7dfe781bb0bbc79ef923f148449348b301c8abd543407cc6e3d802fb3696a7aec104fd832c5 SHA512 288acd443023297104cef963026b0b0d54713515e22870df767e562d4c4f031cad662ad4d341a6b4888661e4550e072300cc166fa1f1504926625121d56ae7a5
-DIST hut-v0.6.0-vendor.tar.xz 638564 BLAKE2B 675e264d03a56663bcd8e6d8e7810ad802a5bd3da4f77abed218fa23b360b78baaa606b7e896d8be16961edba6065ca42859191f90c87fd7caf707c928734522 SHA512 a1ebbfc4fa06b78165d30320dc044c257eb28211ef23c7ceba6cb117fb6c4894e4b39336d226f7996603027cf9d597369a92f1afe13942cd8c135562c5dc7379
+DIST hut-0.7.0-vendor.tar.xz 640500 BLAKE2B 6c9eea7e1a5dc2b0761da12621253fa6238a23d0c3e060371b135408f4d71b2920ca0f0e5890c621dc8a90474a274ab896452425d5b16bd24a3337cc2870cda8 SHA512 ec7be86ae7af194da13b31fa8fb928cd06ba6806f231cc80bca2abbcaee08be5b50a42f7acbd565cb4cfc51e03dd3d60e790c50b9758a539c97723bb2e38a7df
+DIST hut-0.7.0.tar.gz 149392 BLAKE2B f6781e116e5af77b8f22605a162d31025918cf7d71a0aa4f283ea40a4d66c871941ec2b0146ebfca823f6e96cb33c89db086d43ea80ed163568ddb821637648e SHA512 d959b8ed9ef7dc49f30bb053f070f119fdf8b242a79a2ee6f93f4792c32065ee16a0de5cc0cf6f19bd68638ff8092cfcc7db7ffacd3efb550954c30978505bec
diff --git a/dev-util/hut/hut-0.6.0.ebuild b/dev-util/hut/hut-0.7.0.ebuild
similarity index 64%
rename from dev-util/hut/hut-0.6.0.ebuild
rename to dev-util/hut/hut-0.7.0.ebuild
index 52140c49ef..b4764eb4bc 100644
--- a/dev-util/hut/hut-0.6.0.ebuild
+++ b/dev-util/hut/hut-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,12 +9,10 @@ DESCRIPTION="CLI tool for sourcehut"
 
 HOMEPAGE="https://sr.ht/~xenrox/hut/"
 
-SRC_URI="
-	https://git.sr.ht/~xenrox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/cjbayliss/hut-vendor/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.xz
-"
+SRC_URI="https://git.sr.ht/~xenrox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://git.sr.ht/~xenrox/${PN}/refs/download/v${PV}/${PN}-v${PV}-vendor.tar.xz -> ${P}-vendor.tar.xz"
 
-S="${WORKDIR}/${PN}-v${PV}"
+S="${WORKDIR}/hut-v${PV}"
 
 LICENSE="AGPL-3"
 SLOT="0"
@@ -23,6 +21,11 @@ KEYWORDS="~amd64"
 
 BDEPEND="app-text/scdoc"
 
+src_unpack() {
+	default
+	mv hut/vendor "${S}" || die
+}
+
 src_compile() {
 	ego build
 	emake doc/hut.1 completions
diff --git a/dev-util/hut/metadata.xml b/dev-util/hut/metadata.xml
index 41cdef9518..62446bbb1a 100644
--- a/dev-util/hut/metadata.xml
+++ b/dev-util/hut/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>code@nigh.one</email>
+		<name>Thibault</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>alexis.praga@proton.me</email>
 		<name>Alexis Praga</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourcehut">~xenrox/hut</remote-id>
-		<remote-id type="github">cjbayliss/hut-vendor</remote-id>
 	</upstream>
 	<longdescription lang="en">
-		Hut is a command-line tool to interact with sourcehut. It can manage git repositories, builds, publish to pages and pastes.
+        Hut is a command-line tool to interact with sourcehut. It can manage git
+        repositories, builds, publish to pages and pastes.
 	</longdescription>
 </pkgmetadata>