diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index e24ed2c8fd6f7..ecbeea66b2be5 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1 +1,2 @@
 DIST chrpath-0.16.tar.gz 134506 BLAKE2B 7003cc1cb2332ffbe6fe0873c6d30cbc3ea696e041be33b39c3d36ae34a2497b8dd40bb373773c546b8d63cfd8534e796fd7d7cbc99d37fb8751fc960907070f SHA512 aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa
+DIST chrpath-0.18.tar.gz 52228 BLAKE2B b43bb8b84cd5ed3d87e573a0acd5457641ea76912a63f35149de1fda0add9267b3c201391f048a928f3f295dd80bdc3daa426e83ba77a87c628dacd1e26b7288 SHA512 49f6d9a1db817b4739659868375c8af90ee3c874aab8d442dd0a0acbae9bc9638bff5ad096c2e70c37ec05bb8a37bc82dc84f0e5d8f0c59d6ef07f6f8385afe3
diff --git a/app-admin/chrpath/chrpath-0.18.ebuild b/app-admin/chrpath/chrpath-0.18.ebuild
new file mode 100644
index 0000000000000..bc3e69b07716e
--- /dev/null
+++ b/app-admin/chrpath/chrpath-0.18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Chrpath can modify the rpath and runpath of ELF executables"
+HOMEPAGE="https://directory.fsf.org/wiki/Chrpath"
+SRC_URI="https://codeberg.org/pere/${PN}/archive/release_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16-multilib.patch
+	"${FILESDIR}"/${PN}-0.16-testsuite-1.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${P}" install || die
+}
diff --git a/app-admin/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml
index f38edee4ac89a..1394dd7469ad8 100644
--- a/app-admin/chrpath/metadata.xml
+++ b/app-admin/chrpath/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>grobian@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>prefix@gentoo.org</email>
-		<name>Gentoo Prefix</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>grobian@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>prefix@gentoo.org</email>
+    <name>Gentoo Prefix</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="codeberg">pere/chrpath</remote-id>
+  </upstream>
 </pkgmetadata>