diff --git a/net-wireless/bluetuith/Manifest b/net-wireless/bluetuith/Manifest
index 2c1d9b3721..8e94fe0a08 100644
--- a/net-wireless/bluetuith/Manifest
+++ b/net-wireless/bluetuith/Manifest
@@ -4,4 +4,7 @@ DIST bluetuith-0.2.2-deps.tar.zst 3487605 BLAKE2B 02fac84e97a27471b8feadf1d48fbc
 DIST bluetuith-0.2.2.tar.gz 1485216 BLAKE2B e347fbea07564866144de266156ba98d4e722c8d8c216a3696c4bb938f8cbcccdb424b28c5461b94ad67cb4b20b9dd6440a614adb24a6e9acaf8862fb6087aa0 SHA512 5b943ab1a4f5cac1b3da0ac64bea18013f4ba7fe2246c6e33011d18e7a0f384363c9e06558b25131b6ccc4ea3910961178821d24fb21f38c551b18a6500830d4
 DIST bluetuith-0.2.3-deps.tar.xz 2749068 BLAKE2B 8073174fbc5208441503a6ab043b6932a16fef006c52bfc526db4c862aad7503ba6172774d35b7f4ba326e059279b2b7ae0402222a3c72dcb335b571d0addd6a SHA512 0d0cbcb4e4ad4f4429224ea2f390b041943282a2694584f9ff99c858f7207bfe25a1175992925a7f013792200edfb08e7aeab4f63af601f6ae10baf6ef5d8770
 DIST bluetuith-0.2.3.tar.gz 1486491 BLAKE2B 2263fb27cef0342c85ad69c162e5d002c8d6b3d810144ace7230912276402902d96b46f86025bc46dbaf3785bba03b5a2d8ade11e9ba9a81e6be6af5c4c24b61 SHA512 be8c0aa7ba330d60f3a7988ec755ce557f9053c2a9fe8b3a647054cb8b3bbbb99b263e22da9ec35f083f24efb86df8cefa2de1ee0a7426672dab7f3380c7237d
+DIST bluetuith-0.2.6-deps.tar.xz 2973108 BLAKE2B c8144303ea5980ce95f061fbe743ffd313311878191527587e3499a544e625c7323e5a7b34808ac62d32bcb6ba442abc31c38f8441ca5019ed2c7d6abdd86dec SHA512 7964e9a0142782df577152f151ecb014188893ea47158d0ebe19f26f8e80e0a6fc0542d485523cb71859e4c4c6f5b27191da290ffe869bf59be0f36a0db648d4
+DIST bluetuith-0.2.6.tar.gz 1471306 BLAKE2B 0c767867ac2913a9e08daf098389d653c008f6620817476f01d1b93db78558752d55072169671e19bab1a6acf23a90d750df1415b63e91841df99d9593a0e2a0 SHA512 495f5a2066fedf8f069ea5854c9c8d70ff9f8e66fb7c2c537b9c44f1320e91566ad148b1dfb9c551d6d45067ddaf4267f3198f5b92b53a0fd18aa03bf1e143b3
+DIST bluetuith-docs-1b0523eeb344b70b0511bb65a442f21b8a33b65f.tar.gz 2259035 BLAKE2B 00f36776569747ccfb902cd37ddc1a1e365e823ba3f118e582888179e684461bb7ff1882943f94acf5cfdd199b5a2dde71e96eb1cf983cbea88a6aa177de29c5 SHA512 e9f8345ec89456bd2e64c1dbbcba1e1f7ba980011e5194b45a9bdd97b04e2ed1d8af695c9fd3b80ce028179e7be44f801c5bed5369fd3d78feda771160b94eeb
 DIST bluetuith-docs-3b2ebf5a6bc8a9ed2dc48e1fa7f0df5851ddb84b.tar.gz 2382735 BLAKE2B a1cf408cda2b115efdac1a1ab650d2564df5ac4b1f9e037a1c43bbe898b2e6b452b06c4dc634d3c1b124bd5c8e543d6a128a8e35eae89d7f87fb5cac929128f2 SHA512 a8b25e68936dbab717232d159669933d8055182193c4427d1a28fb0ed31a22cd1a80df8ea04824d2d9c95359f859cbd4c5bc8fac65ecac21c7ee9b5e6972d51e
diff --git a/net-wireless/bluetuith/bluetuith-0.2.6.ebuild b/net-wireless/bluetuith/bluetuith-0.2.6.ebuild
new file mode 100644
index 0000000000..c6424c973f
--- /dev/null
+++ b/net-wireless/bluetuith/bluetuith-0.2.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A TUI bluetooth manager for Linux written in Go"
+HOMEPAGE="https://bluetuith-org.github.io/bluetuith/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bluetuith-org/bluetuith.git"
+else
+	GIT_COMMIT="5aea8bf"
+	GIT_DOCUMENTATION_COMMIT="1b0523eeb344b70b0511bb65a442f21b8a33b65f"
+	SRC_URI="https://github.com/bluetuith-org/bluetuith/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
+	SRC_URI+=" https://github.com/bluetuith-org/bluetuith/archive/${GIT_DOCUMENTATION_COMMIT}.tar.gz -> ${PN}-docs-${GIT_DOCUMENTATION_COMMIT}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD-2 BSD MIT"
+SLOT="0"
+
+IUSE="doc"
+RESTRICT="test"
+RDEPEND="
+	net-wireless/bluez
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# unpack code
+		git-r3_src_unpack
+
+		# unpack docs
+		EGIT_BRANCH="documentation"
+		git-r3_fetch
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${GIT_DOCUMENTATION_COMMIT}"
+		git-r3_checkout
+
+		go-module_live_vendor
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	[[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; }
+	default
+}
+src_compile() {
+	# mimicking behavior from https://github.com/darkhz/bluetuith/blob/master/.goreleaser.yml
+	[[ ${PV} == 9999* ]] && GIT_COMMIT=$(git rev-parse --short HEAD)
+	ego build -ldflags "-X github.com/darkhz/bluetuith/cmd.Version=${PV}@${GIT_COMMIT}"
+}
+
+src_test() {
+	ego test ./...
+}
+
+src_install() {
+	default
+	dobin "${PN}"
+	dodoc -r ../"${PN}-${GIT_DOCUMENTATION_COMMIT}"/documentation/*.md
+	use doc && docinto html && dodoc -r ../"${PN}-${GIT_DOCUMENTATION_COMMIT}"/docs/*
+}
diff --git a/net-wireless/bluetuith/bluetuith-9999.ebuild b/net-wireless/bluetuith/bluetuith-9999.ebuild
index df5e55390e..c6424c973f 100644
--- a/net-wireless/bluetuith/bluetuith-9999.ebuild
+++ b/net-wireless/bluetuith/bluetuith-9999.ebuild
@@ -3,23 +3,20 @@
 
 EAPI=8
 
-inherit go-module unpacker
+inherit go-module
 
 DESCRIPTION="A TUI bluetooth manager for Linux written in Go"
-HOMEPAGE="https://darkhz.github.io/bluetuith"
-
-# MAKE SURE to change these on every update
-[[ ${PV} != 9999* ]] && \
-GIT_COMMIT="5780d74"
-GIT_DOCUMENTATION_COMMIT="3b2ebf5a6bc8a9ed2dc48e1fa7f0df5851ddb84b"
+HOMEPAGE="https://bluetuith-org.github.io/bluetuith/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/darkhz/bluetuith.git"
+	EGIT_REPO_URI="https://github.com/bluetuith-org/bluetuith.git"
 else
-	SRC_URI="https://github.com/darkhz/bluetuith/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	GIT_COMMIT="5aea8bf"
+	GIT_DOCUMENTATION_COMMIT="1b0523eeb344b70b0511bb65a442f21b8a33b65f"
+	SRC_URI="https://github.com/bluetuith-org/bluetuith/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
-	SRC_URI+=" https://github.com/darkhz/bluetuith/archive/${GIT_DOCUMENTATION_COMMIT}.tar.gz -> ${PN}-docs-${GIT_DOCUMENTATION_COMMIT}.tar.gz"
+	SRC_URI+=" https://github.com/bluetuith-org/bluetuith/archive/${GIT_DOCUMENTATION_COMMIT}.tar.gz -> ${PN}-docs-${GIT_DOCUMENTATION_COMMIT}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
 fi
 
@@ -34,9 +31,6 @@ RESTRICT="test"
 RDEPEND="
 	net-wireless/bluez
 "
-BDEPEND="
-	$(unpacker_src_uri_depends)
-"
 
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
@@ -51,7 +45,7 @@ src_unpack() {
 
 		go-module_live_vendor
 	else
-		unpacker_src_unpack
+		default
 	fi
 }
 
diff --git a/net-wireless/bluetuith/metadata.xml b/net-wireless/bluetuith/metadata.xml
index 96cd903975..d6605d82d3 100644
--- a/net-wireless/bluetuith/metadata.xml
+++ b/net-wireless/bluetuith/metadata.xml
@@ -6,9 +6,9 @@
     <name>Rahil Bhimjiani</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">darkhz/bluetuith</remote-id>
-    <bugs-to>https://github.com/darkhz/bluetuith/issues</bugs-to>
-    <doc>https://darkhz.github.io/bluetuith</doc>
+    <remote-id type="github">bluetuith-org/bluetuith</remote-id>
+    <bugs-to>https://github.com/bluetuith-org/bluetuith/issues</bugs-to>
+    <doc>https://bluetuith-org.github.io/bluetuith</doc>
   </upstream>
   <use>
     <flag name="doc">Install html docs</flag>