diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 2825933c9c75..5c936f790aeb 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -6,3 +6,5 @@ DIST gitlab-runner-18.3.1-deps.tar.xz 118959964 BLAKE2B c3b1243dbf26179e802fae56
 DIST gitlab-runner-18.3.1.tar.bz2 2018838 BLAKE2B f357afe8186d1fd56f25efd2334c873d224a75a79b552f37bfc2920541369d64f22bdb31a51c226abe24d5a4a2ee92289aaa5ebfff8d27a6137c75c5bff30d5d SHA512 e8dde34479d1c7320dae1990d37b08ce9f3757166fa104024693803085e18781f63b204923db6608277489c4f69fdc1dd38faddf43c336de084687d85f05f989
 DIST gitlab-runner-18.4.0-deps.tar.xz 118808448 BLAKE2B f46f45e4fdc3cdb85f915fa502f0d965fd3ed9d1061bc8f49909873f8674afa083b59a942ca90f2ab0c25cd748cf291b2f12856aa0e698e66cc0429bdc943fe7 SHA512 033f8755ecdc0a8a530e0f6d935c6ceccef0fbe278b68a771501430cedbd0f16977970667d423c3b04b605ea441655182a08e1a8e83bfcd7a4d2c4286c3e2bbd
 DIST gitlab-runner-18.4.0.tar.bz2 2045075 BLAKE2B c7ca6e5af039fef0be31be55fa72eaf64fc8a28cb0df4c8096efa149641bb4dd7297feb03ca45d8575b67ee0e36864c89648ccd09010078311642623aa2209f9 SHA512 267086dfed735a1bc1ce87511fbcc7e94d387e9b69ab70b8beb7228b2e91dd726a82a5d69b46cfb2f8afed61dfdd7234cf666a66dd29a4c97602e6508d14953a
+DIST gitlab-runner-18.5.0-deps.tar.xz 118576360 BLAKE2B 3df417685e1ac77073a6135c06d1a743f35a8bb1a6a939d8fed179e2d324512ef0705c3f6250c080c35db866d06e500d6815a0e3ca96d60dd6dfd959f444e78d SHA512 5edf9dbde6f39b6ae0e005fa9eef3481070714295243b5ee6c636e1d77c0763732e6ae70b5a36cf514cf8950fb87416dac1ad67ea4edec3e12aac47b0a983023
+DIST gitlab-runner-18.5.0.tar.bz2 2050460 BLAKE2B f98f62cc66406e80df6b89767ab1aea125390daec340570f112bc6655d4587ae1ac74535c8c47c97382747ce8e813a8d776d0ead8535c391f0838098a7f66538 SHA512 08eff75ca70e9f7c868eef28c3b30948a29b63e6ef84644e7c2359050c404d41ae55ca85023edb68aa6d2d64960fe0c9742f50dba2440adeffbf2d422ab70e5a
diff --git a/dev-util/gitlab-runner/gitlab-runner-18.5.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-18.5.0.ebuild
new file mode 100644
index 000000000000..929693cb47f9
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-18.5.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit eapi9-ver go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=bda84871
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~riscv"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-and-helper-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	newbin out/binaries/gitlab-runner-linux-* gitlab-runner
+	newbin out/binaries/gitlab-runner-helper/gitlab-runner-helper.linux-* gitlab-runner-helper
+	DOCS=( docs CHANGELOG.md README.md )
+	einstalldocs
+	insinto /usr/share/${PN}
+	doins config.toml.example
+
+	newconfd "${FILESDIR}/${PN}-18.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}-18.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /etc/${PN}
+	fperms 0700 /etc/${PN}
+	fowners gitlab-runner:gitlab-runner /etc/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	if ver_replacing -lt 18.0.0; then
+		ewarn "The logs are now redirected to syslog instead of being stored in /var/log/gitlab-runner"
+		ewarn
+	fi
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}