diff --git a/dev-util/pmbootstrap/Manifest b/dev-util/pmbootstrap/Manifest
index 2340b1625c..c073823540 100644
--- a/dev-util/pmbootstrap/Manifest
+++ b/dev-util/pmbootstrap/Manifest
@@ -1 +1 @@
-DIST pmbootstrap-1.51.0.tar.gz 230563 BLAKE2B d1832a699c7e5a86eaa2c145df1e48c92b3f370be92a82b6841d302a85ba5450ca7c6a4cae040cb0191fcc7cea909e63e5d7915bf1cd16891577d654ea86ecdb SHA512 288a2ad12f93f4ff7d11ec37448b739611acb684f41b68327ca83997e6d9bbf8110dc42f93e00d356728b16193092142055378c18d23c49c2b11324cee6121b3
+DIST pmbootstrap-2.3.1.tar.bz2 22491945 BLAKE2B b74816ae98068d87979f235e42e71cfc2f2345bb962ecf4338b2ecb24304e60f2aa3cd0e01b2f39019d9f966fbea3ea10b69fb79fb21c850b46e345a69d65d7a SHA512 d2c184ca3bb2f3a671a3a17a73f2f3e38ed1971ba11ab9bdec0151c06988c99b97e2558acfe176956a5348f661f863449174e60313422e10a1ebcd9ae72e581a
diff --git a/dev-util/pmbootstrap/metadata.xml b/dev-util/pmbootstrap/metadata.xml
index 2c8371a6e6..fe462bb0db 100644
--- a/dev-util/pmbootstrap/metadata.xml
+++ b/dev-util/pmbootstrap/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<name>Jason Blackwell</name>
+		<email>blackwell@disroot.org</email>
+	</maintainer>
 	<upstream>
-		<remote-id type="pypi">pmbootstrap</remote-id>
+		<bugs-to>https://gitlab.com/postmarketOS/pmbootstrap/-/issues</bugs-to>
+		<remote-id type="gitlab">postmarketOS/pmbootstrap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild b/dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild
similarity index 93%
rename from dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild
rename to dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild
index ca2650562a..0600f45f11 100644
--- a/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild
+++ b/dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild
@@ -10,6 +10,7 @@ inherit distutils-r1 linux-info pypi
 
 DESCRIPTION="Helper tool for developing and building postmarketOS"
 HOMEPAGE="https://postmarketos.org/"
+SRC_URI="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"