diff --git a/app-admin/aws-vault/Manifest b/app-admin/aws-vault/Manifest
index c26dd64622..56260d9795 100644
--- a/app-admin/aws-vault/Manifest
+++ b/app-admin/aws-vault/Manifest
@@ -1,2 +1,4 @@
 DIST aws-vault-7.2.0-vendor.tar.xz 1025996 BLAKE2B 30fdc449f2a395e8165f449ac44a9acddc5bffb4a21bed4c970140dab56e5bd17dfd79b36caef746875be37b30267d4d9ad04aa34681f4e8177f645346ee9ded SHA512 059fc14d8169f0dc3316bcf8d9bda4dfd7618aacec1db220083c804eddc2fe71babba7ef38419446ad3d13178f9d598f746db9aba800d14b645bb764ddf752a9
 DIST aws-vault-7.2.0.tar.gz 63697 BLAKE2B 88686d77e5624f5c9d6c62b661ad022088505b19904da664eb397fe42a78b46f92bf859ea311efc50865673d08f632a3a37d42dced9f0a52fad264da9b3f5cbf SHA512 862b7e6e919f4335092f887e71b3423e3e21bd54ac81d79672b673944979b1afdab527a8659be0d363e700877e7dfcb652b6ecc384f8114ddd936e36098df5aa
+DIST aws-vault-7.8.6-vendor.tar.xz 4928648 BLAKE2B bbda316e50f64eef0a917b31a7e8541269c688ff25c2f30637e0c7ca6c8b3b1d9e6afe4871e8fe8eaaa046245bffee145421e0c480bc02db216423535a0eeeef SHA512 0337c58d7b90f845b290391fd5f9f8a22be03bf4c07bae4e7807853def6acc0880bfcc7bccf5ae90ed55a74d3592f994ac603c6277e14e14f62081f02aadafd4
+DIST aws-vault-7.8.6.tar.gz 81625 BLAKE2B 957267338de74c818fac38998963004b1867278cd420fc881330a75ab949fd1e7d42a02f978bc4dfb2a6fd8165385f030591be263467b9deb73996b3d2c08f45 SHA512 a72ad80e0f8b7d5e23554dcae4df7ad858e523ca9f23abfe1bb6ee25e39c7f5b24e4d85b070e610100587914987db02f1f5fb246e8cd5f31c386b53d45250fce
diff --git a/app-admin/aws-vault/aws-vault-7.8.6.ebuild b/app-admin/aws-vault/aws-vault-7.8.6.ebuild
new file mode 100644
index 0000000000..2b9b127a8e
--- /dev/null
+++ b/app-admin/aws-vault/aws-vault-7.8.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Securely store and access AWS credentials in development environments"
+HOMEPAGE="https://github.com/ByteNess/aws-vault"
+SRC_URI="
+	https://github.com/ByteNess/aws-vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ixti/aws-vault/releases/download/v${PV}/${P}-vendor.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	go build -ldflags "-s -w -X \"main.Version=${PV}\"" -o "${PN}" || die "go build failed"
+}
+
+src_install() {
+	dobin "${PN}"
+	dodoc README.md USAGE.md
+}
diff --git a/app-admin/aws-vault/metadata.xml b/app-admin/aws-vault/metadata.xml
index 280afb5f1c..a16defb1cb 100644
--- a/app-admin/aws-vault/metadata.xml
+++ b/app-admin/aws-vault/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Alexey Zapparov</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://github.com/99designs/aws-vault/issues</bugs-to>
-		<remote-id type="github">99designs/aws-vault</remote-id>
+		<bugs-to>https://github.com/ByteNess/aws-vault/issues</bugs-to>
+		<remote-id type="github">ByteNess/aws-vault</remote-id>
 	</upstream>
 </pkgmetadata>