diff --git a/app-shells/vboxmanage-bashcomp/Manifest b/app-shells/vboxmanage-bashcomp/Manifest
index 1c72c1b..25ec2c2 100644
--- a/app-shells/vboxmanage-bashcomp/Manifest
+++ b/app-shells/vboxmanage-bashcomp/Manifest
@@ -1 +1,3 @@
-EBUILD vboxmanage-bashcomp-9999.ebuild 570 BLAKE2B 91fe38b331d82ca8b091b3c60a8fa721ce09216ea33b738a8086b52e95c56024821edca98b8ed1d0885f05e25f0931f831765a78f522a324977f642a5051a17b SHA512 8ecca5545e2839f436bcea79e649fcbdea82082e8b410ea81ddc168ba981a24dca24e87f141ca5e2957e715d093988db63473f247ae9ee2c9739328e7357f00a
+DIST 6.1.38.tar.gz 1623906 BLAKE2B b84f3c2ad84b68369e336b5f695e2bb7069ec7f43ec438bf74236ecc02de6e5c607c1996e23583728f57912da52ba94ec673340c56095183017b58c5c5f988ff SHA512 a23a1d4b705d7c26798bce855ca2508ef35badda571270a317563591784ff57065b44b833841a035e5f3105cb4d9a9456082a3196d8f904e68b2b38e8a16c99a
+EBUILD vboxmanage-bashcomp-6.1.38.ebuild 784 BLAKE2B cdb903802532cfcfa52f885fcd110f5f953b5136fab231f32aafadae0ddbbfb599f7bc3251d8352fa333410322317b4b56a64c5a878509b8e1299bc91fb68eb6 SHA512 3ae1cc254093616b262ed3b805d298925b4dbcc55c9e359ebb4627f239799e92393e1eecd935f2ea50c21021973df69431cd67caf5c9cdb69f5da074c54a5ca2
+EBUILD vboxmanage-bashcomp-9999.ebuild 784 BLAKE2B cdb903802532cfcfa52f885fcd110f5f953b5136fab231f32aafadae0ddbbfb599f7bc3251d8352fa333410322317b4b56a64c5a878509b8e1299bc91fb68eb6 SHA512 3ae1cc254093616b262ed3b805d298925b4dbcc55c9e359ebb4627f239799e92393e1eecd935f2ea50c21021973df69431cd67caf5c9cdb69f5da074c54a5ca2
diff --git a/app-shells/vboxmanage-bashcomp/vboxmanage-bashcomp-6.1.38.ebuild b/app-shells/vboxmanage-bashcomp/vboxmanage-bashcomp-6.1.38.ebuild
new file mode 100644
index 0000000..b56c60c
--- /dev/null
+++ b/app-shells/vboxmanage-bashcomp/vboxmanage-bashcomp-6.1.38.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="VBoxManage bash completion"
+HOMEPAGE="https://github.com/gryf/vboxmanage-bash-completion"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gryf/vboxmanage-bash-completion"
+	KEYWORDS="~amd64"
+else
+	SRC_URI="https://github.com/gryf/vboxmanage-bash-completion/archive/refs/tags/${PV}.tar.gz"
+	KEYWORDS="amd64 x86"
+	S="${WORKDIR}/vboxmanage-bash-completion-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="app-emulation/virtualbox"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	cd ${S}
+	mv VBoxManage VBoxManage_completion
+	newbashcomp VBoxManage_completion VBoxManage
+	bashcomp_alias VBoxManage vboxmanage
+}
diff --git a/app-shells/vboxmanage-bashcomp/vboxmanage-bashcomp-9999.ebuild b/app-shells/vboxmanage-bashcomp/vboxmanage-bashcomp-9999.ebuild
index 4efbf2e..b56c60c 100644
--- a/app-shells/vboxmanage-bashcomp/vboxmanage-bashcomp-9999.ebuild
+++ b/app-shells/vboxmanage-bashcomp/vboxmanage-bashcomp-9999.ebuild
@@ -3,15 +3,23 @@
 
 EAPI=8
 
-inherit git-r3 bash-completion-r1
+inherit bash-completion-r1
 
 DESCRIPTION="VBoxManage bash completion"
 HOMEPAGE="https://github.com/gryf/vboxmanage-bash-completion"
-EGIT_REPO_URI="https://github.com/gryf/vboxmanage-bash-completion"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gryf/vboxmanage-bash-completion"
+	KEYWORDS="~amd64"
+else
+	SRC_URI="https://github.com/gryf/vboxmanage-bash-completion/archive/refs/tags/${PV}.tar.gz"
+	KEYWORDS="amd64 x86"
+	S="${WORKDIR}/vboxmanage-bash-completion-${PV}"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
 
 DEPEND="app-emulation/virtualbox"
 RDEPEND="${DEPEND}"