diff --git a/dev-util/forgejo-runner/Manifest b/dev-util/forgejo-runner/Manifest
index 9e792b39ec..fadaa49f40 100644
--- a/dev-util/forgejo-runner/Manifest
+++ b/dev-util/forgejo-runner/Manifest
@@ -1,2 +1,4 @@
 DIST forgejo-runner-12.10.0-deps.tar.xz 96811256 BLAKE2B 1dee826ec32c1bc77f9fcb7871b4ee5542ff19e9989724827311538ef2385f7e0593214d6ea0c915ce0a81657ff44c6c1ee044961c21b82df20ff467a32493c7 SHA512 6454bc5bf8e54e2ad7dd1e3bc8c60248eacddd08a42416242db36b967c968e6d7c5f1be46e4e8af0a95e2670f3b27658672809b319984dd1515cf40b63f0b6d9
 DIST forgejo-runner-12.10.0.tar.gz 3526091 BLAKE2B e6eabd4379bfb07b875d406eb7798cac8863ac0f85f33a5faf882307ff22581d68e6802c5b3c8cb10fdd0823cf5f2e516a9f728f810e29909441ba71ed308b79 SHA512 a4385aff462d5753f799bf69b5ec27a899e5786eef2113e63ea83dc42139f3a92f6cda3867ca1c2fe743e06a2b830850673d759284bd2426f807842609538237
+DIST forgejo-runner-12.10.1-deps.tar.xz 41920120 BLAKE2B e4e9fce749a097a5883e67c2ee3d01c808674ae3d18a2d8ab56bde61cab52cfe50198fb843f19ad55cdf34f502ce3bf35740a71a087ef363373225d8d1e4333b SHA512 534498defbc3fe3a64bc2c0a6584408bdfc17c4681849258e4e717ed18cb345d2ab02ea6abd425dad993aaf2ad68ba00e7635369bbe463506604ecd66481ee72
+DIST forgejo-runner-12.10.1.tar.gz 3527716 BLAKE2B 544143af36de909ce1ab60d2f7b52641baef509d51c4575b66c45a074063c940fe74ff4763a2dc11a3a535079a3bffa3a057f0d1e38d340e011bba926a57ee27 SHA512 76b63ea474fa99d196ad1eba24bc269e041dc6676e71aa29587870f0ea6efdf375d1309630abc903084c7454014b1f4f2862dbe2e69eab92b5df3434288ec328
diff --git a/dev-util/forgejo-runner/forgejo-runner-12.10.1.ebuild b/dev-util/forgejo-runner/forgejo-runner-12.10.1.ebuild
new file mode 100644
index 0000000000..5d402e6221
--- /dev/null
+++ b/dev-util/forgejo-runner/forgejo-runner-12.10.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2024-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A daemon that connects to a Forgejo instance and runs jobs for CI"
+HOMEPAGE="https://code.forgejo.org/forgejo/runner https://forgejo.org/docs/next/admin/actions/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.forgejo.org/forgejo/runner.git"
+else
+	SRC_URI="
+		https://code.forgejo.org/forgejo/runner/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-deps.tar.xz
+	"
+	S="${WORKDIR}/runner"
+
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples +docker podman lxc"
+RESTRICT="mirror test"
+REQUIRED_USE="|| ( docker podman lxc )"
+
+DEPEND="
+	>=dev-lang/go-1.25.9
+"
+
+RDEPEND="
+	acct-user/${PN}[docker=,podman=,lxc=]
+"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/ExecStart=/s#=.*#=${EPREFIX}/usr/bin/forgejo-runner daemon -c %h/runner-config.yml#g" \
+		-e "/ExecReload=/s#=#=${EPREFIX}#g" \
+		-e "/User=/s#=.*#=${PN}#g" \
+		-e '/WorkingDirectory=/s#=.*#=~#g' \
+		-i contrib/forgejo-runner.service || die
+}
+
+src_compile() {
+	# export version information
+	# https://github.com/gentoo/guru/pull/205
+	# https://forums.gentoo.org/viewtopic-p-8831646.html
+	local VERSION
+	if [[ "${PV}" == *9999* ]]; then
+		VERSION="$(
+			git describe --tags --first-parent --abbrev=7 --long --dirty --always \
+			| sed -e "s/^v//g"
+		)"
+	else
+		VERSION="${PVR}"
+	fi
+
+	local EXTRA_GOFLAGS_LD=(
+		# "-w" # disable DWARF generation
+		# "-s" # disable symbol table
+		"-X=code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=v${VERSION}"
+	)
+
+	GOFLAGS+=" '-ldflags=${EXTRA_GOFLAGS_LD[*]}'"
+
+	ego build -tags 'netgo osusergo' -o forgejo-runner
+
+	# Makefile does this
+	# emake forgejo-runner
+}
+
+src_install() {
+	dobin forgejo-runner
+
+	systemd_dounit "contrib/forgejo-runner.service"
+
+	dodoc "README.md"
+	if use examples; then
+		dodoc -r "examples"
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}