diff --git a/dev-dotnet/pe-format/metadata.xml b/dev-dotnet/pe-format/metadata.xml
index 58dfce57a08dd..fcd26b6c1ada7 100644
--- a/dev-dotnet/pe-format/metadata.xml
+++ b/dev-dotnet/pe-format/metadata.xml
@@ -10,7 +10,7 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://github.com/mgorny/pe-format2/issues/</bugs-to>
-    <remote-id type="bitbucket">mgorny/pe-format2</remote-id>
+    <bugs-to>https://github.com/projg2/pe-format2/issues/</bugs-to>
+    <remote-id type="bitbucket">projg2/pe-format2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-dotnet/pe-format/pe-format-2.1.2-r1.ebuild b/dev-dotnet/pe-format/pe-format-2.1.2-r1.ebuild
index 74927e1227906..691940bb7e045 100644
--- a/dev-dotnet/pe-format/pe-format-2.1.2-r1.ebuild
+++ b/dev-dotnet/pe-format/pe-format-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit systemd xdg-utils
 
 DESCRIPTION="Intelligent PE executable wrapper for binfmt_misc"
-HOMEPAGE="https://github.com/mgorny/pe-format2/"
-SRC_URI="https://github.com/mgorny/pe-format2/releases/download/v${PV}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/pe-format2/"
+SRC_URI="https://github.com/projg2/pe-format2/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-dotnet/pe-format/pe-format-9999.ebuild b/dev-dotnet/pe-format/pe-format-9999.ebuild
index d23157c8801d1..a1e24651cad2e 100644
--- a/dev-dotnet/pe-format/pe-format-9999.ebuild
+++ b/dev-dotnet/pe-format/pe-format-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools git-r3 systemd xdg-utils
 
 DESCRIPTION="Intelligent PE executable wrapper for binfmt_misc"
-HOMEPAGE="https://github.com/mgorny/pe-format2/"
-EGIT_REPO_URI="https://github.com/mgorny/pe-format2.git"
+HOMEPAGE="https://github.com/projg2/pe-format2/"
+EGIT_REPO_URI="https://github.com/projg2/pe-format2.git"
 
 LICENSE="GPL-2"
 SLOT="0"