diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-17.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-17.ebuild
index 1ff83cf0b1b81..fb7bcccc2f942 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-17.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-17.ebuild
@@ -4,9 +4,9 @@
EAPI=8
DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/projg2/cpuid2cpuflags/"
+HOMEPAGE="https://github.com/gentoo/cpuid2cpuflags/"
SRC_URI="
- https://github.com/projg2/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
+ https://github.com/gentoo/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
"
LICENSE="BSD-2"
diff --git a/app-portage/cpuid2cpuflags/metadata.xml b/app-portage/cpuid2cpuflags/metadata.xml
index 2d8cc330ba900..44f647c27c284 100644
--- a/app-portage/cpuid2cpuflags/metadata.xml
+++ b/app-portage/cpuid2cpuflags/metadata.xml
@@ -6,6 +6,6 @@
Michał Górny
- projg2/cpuid2cpuflags
+ gentoo/cpuid2cpuflags