diff --git a/dev-dotnet/pe-format/metadata.xml b/dev-dotnet/pe-format/metadata.xml
index 2af76e28dbce2..363b956d61860 100644
--- a/dev-dotnet/pe-format/metadata.xml
+++ b/dev-dotnet/pe-format/metadata.xml
@@ -14,7 +14,7 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://bitbucket.org/mgorny/pe-format2/issues/</bugs-to>
+    <bugs-to>https://github.com/mgorny/pe-format2/issues/</bugs-to>
     <remote-id type="bitbucket">mgorny/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 d75726d5aa385..d924a2d19d817 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
@@ -6,8 +6,8 @@ EAPI=6
 inherit systemd xdg-utils
 
 DESCRIPTION="Intelligent PE executable wrapper for binfmt_misc"
-HOMEPAGE="https://bitbucket.org/mgorny/pe-format2/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}2/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/pe-format2/"
+SRC_URI="https://github.com/mgorny/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 94eec319e8e8a..ab9516eea6de0 100644
--- a/dev-dotnet/pe-format/pe-format-9999.ebuild
+++ b/dev-dotnet/pe-format/pe-format-9999.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools git-r3 systemd xdg-utils
 
 DESCRIPTION="Intelligent PE executable wrapper for binfmt_misc"
-HOMEPAGE="https://bitbucket.org/mgorny/pe-format2/"
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}2.git"
+HOMEPAGE="https://github.com/mgorny/pe-format2/"
+EGIT_REPO_URI="https://github.com/mgorny/pe-format2.git"
 
 LICENSE="GPL-2"
 SLOT="0"