diff --git a/app-forensics/pcileech/Manifest b/app-forensics/pcileech/Manifest
index 251bed200..f99157939 100644
--- a/app-forensics/pcileech/Manifest
+++ b/app-forensics/pcileech/Manifest
@@ -1 +1,2 @@
 DIST pcileech-4.17.tar.gz 393124 BLAKE2B fd6d044e1475ff364f49c1d0ed65bebb5bb412f97e29432d50ed548be2c6d16fd2ecb81629261b6b17b274d1797b4a1bc7c3ea94bbeb672f21a4faed0a5a1504 SHA512 1c4370f6b9dbe3d6aee42d60f682645517ea818d14f8e4e8d515fdfb70eead2668fe9640de0caf1403a665310528a319fd77e7db7754bc68f570dbf64e174f76
+DIST pcileech-4.18.tar.gz 493745 BLAKE2B d69cfe8c89184ca5ba3704052f16cbcbfdb18da0b8b53a7b9dc748784504523d68429cb91a77dc5d58aa44f4884ac2fb7e77bc3bab1830515ed530cc045c6829 SHA512 444fdb5fb91188a762e5ac9e7f87c58d8e29c6c545341a32fd7c1d64a99f3c07a3afcc210576fde0b0ca252b5f5b941d9c18cfa99d2a00db8a2c1686f196e142
diff --git a/app-forensics/pcileech/pcileech-4.18.ebuild b/app-forensics/pcileech/pcileech-4.18.ebuild
new file mode 100644
index 000000000..c43e29395
--- /dev/null
+++ b/app-forensics/pcileech/pcileech-4.18.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Direct Memory Access (DMA) Attack Software"
+HOMEPAGE="https://github.com/ufrisk/pcileech"
+SRC_URI="https://github.com/ufrisk/pcileech/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND="virtual/libusb:1
+	>=dev-libs/LeechCore-2.7
+	>=dev-libs/memprocfs-4.7"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed '/mv leechcore.so/d' -i pcileech/Makefile || die
+	sed '/mv vmm.so/d' -i pcileech/Makefile || die
+	eapply_user
+}
+
+src_compile() {
+	emake -C pcileech
+}
+
+src_install(){
+	dobin files/pcileech
+}
diff --git a/dev-libs/LeechCore/LeechCore-2.14.ebuild b/dev-libs/LeechCore/LeechCore-2.18.ebuild
similarity index 100%
rename from dev-libs/LeechCore/LeechCore-2.14.ebuild
rename to dev-libs/LeechCore/LeechCore-2.18.ebuild
diff --git a/dev-libs/LeechCore/Manifest b/dev-libs/LeechCore/Manifest
index b43cbc5c9..c36998d3f 100644
--- a/dev-libs/LeechCore/Manifest
+++ b/dev-libs/LeechCore/Manifest
@@ -1,2 +1,2 @@
-DIST LeechCore-2.14.tar.gz 155367 BLAKE2B 1c37d4eef60017761a962fc59c59de7a08e98974d8af9566a288909219426778a974d772a9ac626041fca0a8b24917423f492ce1bef6a916caa537a8153a9d21 SHA512 542e634a6182aca45aafdf0e03acbccc333494229d56a6e0936076b6cdcab039b0211272edcc05b8325fc7476c9464e49c56a0bb87a502f2ab60d27247f353b1
 DIST LeechCore-2.16.tar.gz 217790 BLAKE2B 9c41af3d6c27ea5a536916e4780f2b5adbafbb9ead30bad6977864d71f64ae8a2db289f9004ce6a674732cb0db8e7072a37472eb082e6d152fcf7c474ff28f78 SHA512 63cc7e22c09f4f5dd9ab280f7db642f22e3745289739cb0b4445a4ac0e1557e13a65d0b78761dabc520ee8ec728c96247eea2479637cbd5e272fa72e83e69999
+DIST LeechCore-2.18.tar.gz 226653 BLAKE2B 3bc804f155abc650d57dd27ebbad6c0b11f10b246561b8924cdf4e0b8deaaf7b5e66fb0e756eff9e29ee73d56b5baa3f0531b46226da7ad16627ed9795a4fc64 SHA512 feb2fc7c70ed0d9cc18cacc5764e9db39cf5dbe5dedb21ef34caaa00aaa87871d1a707a8d76204f89ac993fdde208aaa3fe17cc2d3079d130941d97358caa4bf
diff --git a/dev-libs/LeechCore/metadata.xml b/dev-libs/LeechCore/metadata.xml
index ace7c2d3a..c03ced3d5 100644
--- a/dev-libs/LeechCore/metadata.xml
+++ b/dev-libs/LeechCore/metadata.xml
@@ -5,4 +5,7 @@
 		<email>unknown@pentoo.ch</email>
 		<name>Author Unknown</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ufrisk/LeechCore</remote-id>
+	</upstream>
 </pkgmetadata>