diff --git a/dev-util/git-bug/git-bug-9999.ebuild b/dev-util/git-bug/git-bug-9999.ebuild
index bf4f95dee4..6036833e3e 100644
--- a/dev-util/git-bug/git-bug-9999.ebuild
+++ b/dev-util/git-bug/git-bug-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,10 +6,10 @@ EAPI=8
 inherit go-module
 
 DESCRIPTION="distributed, offline-first bug tracker"
-HOMEPAGE="https://github.com/MichaelMure/git-bug"
+HOMEPAGE="https://github.com/git-bug/git-bug"
 
 inherit git-r3
-EGIT_REPO_URI="https://github.com/MichaelMure/${PN}"
+EGIT_REPO_URI="https://github.com/git-bug/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -23,7 +23,7 @@ src_unpack() {
 src_compile() {
 	ego generate
 	ego build \
-		-ldflags "-s -w -X github.com/MichealMure/git-bug/commands.GitLastTag=${PV} -X github.com/MichealMure/git-bug/commands.GitExactTag=${PV}" \
+		-ldflags "-s -w -X github.com/git-bug/git-bug/commands.GitLastTag=${PV} -X github.com/git-bug/git-bug/commands.GitExactTag=${PV}" \
 		-o ${PN}
 }
 
diff --git a/dev-util/git-bug/metadata.xml b/dev-util/git-bug/metadata.xml
index a77981afeb..caa3a4b491 100644
--- a/dev-util/git-bug/metadata.xml
+++ b/dev-util/git-bug/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">MichaelMure/git-bug</remote-id>
+		<remote-id type="github">git-bug/git-bug</remote-id>
 	</upstream>
 </pkgmetadata>