diff --git a/app-metrics/beszel-agent/Manifest b/app-metrics/beszel-agent/Manifest
index faff85e..7559d8c 100644
--- a/app-metrics/beszel-agent/Manifest
+++ b/app-metrics/beszel-agent/Manifest
@@ -2,5 +2,8 @@ AUX beszel-agent.env 971 BLAKE2B d790affa194b71425af286b586b3fd1c8139a386a609982
 AUX beszel-agent.service 550 BLAKE2B 71381383813fc851ffe810772065cfe7aa0e160a63461017b78c3cb85e106ed4a562bf8d79a8a4659becbb6098703f13725c62f2805d224ec6289a62fd1fe4d8 SHA512 df913496480c0fc794ac6d1d937dba213c329a876b1e891551849376d7e138e5bb41145b5a5a6a528d186791804719809c22111f3ba1a3008d7ec131f856014d
 DIST beszel-0.18.3-vendor.tar.xz 29845172 BLAKE2B 7c1e7e40c60614553dfa312d1891a677a987be5191447670d14f07b0a95933d2b9884b11b6914e74d20166a9be20bf6e3a86f1d6f296cd953d049ed17bc4631a SHA512 b959211fcd7e3a8c5abb3d46dedca883fbd85493f502d716538d0c76bfa08796e40dd8000306f8f9dcfb20e3886847d272a695553e669910168a059ecd31b461
 DIST beszel-0.18.3.tar.gz 1153782 BLAKE2B 13458446ed3d80c9409161bc17b54fbde6dc5da6cbf9d65c42a65c5ec236e34dcc7fe131173cb08cc9b5df30b435952bd36c643a87a29fd8a65d5b844de62aa5 SHA512 c4abbe9b28b79ec3206b401b29fcc6c49531c9b2e946909df11d3ac8430099d455d391e49d67503f8fa831b6c514d5efb7f67845f1ab4788e81ff80a9a4521cf
+DIST beszel-0.18.4-vendor.tar.xz 29727852 BLAKE2B ae15e83a711e3db3a8f81e8c03fd301d9ae10500661016c55fd002d69d6b1cc7aaddc85f456e9a4df7333a34f69bebfac01da669be0b9179dfd0931775f3bc68 SHA512 91c78563e0e79596aa1157b0df1e2e6a68e50b83a08263a789e2143bce5cf5793bb5941451ed480d9e0e6181a7a6f98efa2f2124c89e66f7aad1ce33dd53502a
+DIST beszel-0.18.4.tar.gz 1212786 BLAKE2B b56260d3c3be86ae40dac3c69fbc3b838773b8e821600bc67c8c913931dee774211b729a7b374129d3b5d570c9ec0fcae39c5b8898d545ea258e4272019f9bf2 SHA512 342ebedf59c08bd924c75cd3eabb623030b50a3991b47b361a88e660881dc3c5b3e8446eea5b476cdfa14ebc132396584f3da601261cc1da555a0797ad003d14
 EBUILD beszel-agent-0.18.3.ebuild 1124 BLAKE2B 7d0c7f553e46c5b718b1f6c22b8d5b9bf881e2441b2f2bb3b0bd5d5cbb13ab12f171d792e7b8cc897a2d3a5288319d30c407056cb69392ed52660bb0d7563295 SHA512 a928dbed9f16671da8f5bdb350d48bad109ec283ce08d3599f1553edd86c647fa2858f94442b4cc90c806fce37c0b6ba1e6166268cd527654ad48475d38449b5
+EBUILD beszel-agent-0.18.4.ebuild 1156 BLAKE2B 4e5915bcdbbbae6ef89f48581a09555ca55bb9875f71f643886ecf6106804272c281a1b0e8f4061b327fad654620ed80e06d93fced82db1c722a1130aba854e9 SHA512 9de0a55adb32e90efc69136719762305bbe6f35307bf605fc2fee3902e044c24bcb3dd9e2ad399be9192e68c6d2e3c6576bc0ac776c1d342d089bdc26cbf839f
 MISC metadata.xml 327 BLAKE2B b22344ccf0ca03ad86f9ea95440de7498ca4bc7da459b2395d7b0eb0dbe0cab566a8a79f30fd8679eff6f89ddb0d28ebcbfd714d6d324992df52a69f20cef69d SHA512 3fd2a4502bb7a6eee7f12e9fc0c4cbfc1fd2b00074c2a21ceb63bc81d2b853b3e569b5370b36814614fcedefab2e27be33d81096f75d356a64e6e31aaf4ce34b
diff --git a/app-metrics/beszel-agent/beszel-agent-0.18.4.ebuild b/app-metrics/beszel-agent/beszel-agent-0.18.4.ebuild
new file mode 100644
index 0000000..b3bbf30
--- /dev/null
+++ b/app-metrics/beszel-agent/beszel-agent-0.18.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+MY_P="beszel-${PV}"
+DESCRIPTION="Beszel Agent - Simple, lightweight server monitoring"
+HOMEPAGE="https://www.beszel.dev/"
+SRC_URI="https://github.com/henrygd/beszel/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
+	https://gentoo-overlay.friedli.info/${MY_P}-vendor.tar.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="AGPL-3+"
+# Go dependency licenses
+LICENSE+=" AGPL-3 Apache-2.0 BSD GPL-3+ ISC MIT MPL-2.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-user/beszel-agent
+	acct-group/beszel"
+
+BDEPEND=">=dev-lang/go-1.26.0"
+
+src_compile() {
+	cd internal/cmd/agent
+	ego build -ldflags "-w -s"
+}
+
+src_install() {
+	newbin "${S}"/internal/cmd/agent/agent beszel-agent
+
+	dodir /etc/beszel-agent
+	keepdir /var/lib/beszel-agent
+
+	insinto /etc/beszel-agent
+	doins "${FILESDIR}"/beszel-agent.env
+
+	fowners -R beszel-agent:beszel /etc/beszel-agent /var/lib/beszel-agent
+	fperms 0750 /etc/beszel-agent /var/lib/beszel-agent
+	fperms 0600 /etc/beszel-agent/beszel-agent.env
+
+	systemd_dounit "${FILESDIR}"/beszel-agent.service
+}
diff --git a/metadata/md5-cache/app-metrics/beszel-agent-0.18.4 b/metadata/md5-cache/app-metrics/beszel-agent-0.18.4
new file mode 100644
index 0000000..33fdbd6
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/beszel-agent-0.18.4
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.26.0 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-user/beszel-agent acct-group/beszel
+DESCRIPTION=Beszel Agent - Simple, lightweight server monitoring
+EAPI=8
+HOMEPAGE=https://www.beszel.dev/
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=AGPL-3+ AGPL-3 Apache-2.0 BSD GPL-3+ ISC MIT MPL-2.0 public-domain
+SLOT=0
+SRC_URI=https://github.com/henrygd/beszel/archive/refs/tags/v0.18.4.tar.gz -> beszel-0.18.4.tar.gz https://gentoo-overlay.friedli.info/beszel-0.18.4-vendor.tar.xz
+_eclasses_=multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	7e440a20ac11dece04e3334622e6e5da	flag-o-matic	ed1eda86c8f746a2a75f7f9f7478f5f4	go-env	0e2babf96e7d0b045fc07ad199eb2399	go-module	d96f2a2fd6d8fbad6d94516bf238f885	systemd	a964c0cbe818b5729da1dbfcee5be861
+_md5_=f672edade50211cf3f99409a787f11a3