diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 2b08d0d21e1c0..8de3900cc2b48 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1,3 @@
 DIST ergo-2.15.0.tar.gz 3751363 BLAKE2B 1b093f0db07056c179e30c5f3cef3d5ea924aed5d01ce49a47991e294c3591a438eb273c0f332b29861b9f0ae2c19c7f32e86b533e3125778d95e7b3b5d5701e SHA512 9e74fa149426c8d42ccb02ce8220110f5465ff6a49a58b70f0ccefdfabebbfd5a7db01dbfe10da1cb0cd751c6c01fd13af0102b99450c9fcc08bb64be732b964
 DIST ergo-2.16.0.tar.gz 3741556 BLAKE2B ab92d4726bd9042cd59e36d617c352c0eb617c8861fd561c430f79f841141a09ed572dbec21f8f696f24fb4bd29a990fb5c0219e220cd036f15bff9fc01d3c01 SHA512 db23c5accc50c3b9541ee903e0c9acab3ef72a549aa0e00bb543a197218f1736bb33948d873c8fcd9de26734c504a62c12abc683d958d4f79a7874f44ba7b212
+DIST ergo-2.17.0.tar.gz 3754831 BLAKE2B aac34e9d2e66a36a258836c875307277ed927db336cfb306af211399b5918934d49bf401d3deee9ef2901ad7f2590076239514894169231b2108c2e862e9b76f SHA512 85a5d50221a0a4494d97fc06b5f1f3c55daf75f0e2283c1c90e5d408301b1afec49e911902c93f7598dc4bcd15c55a41e227fa9ac4cb44cba51d05cd3019f25c
diff --git a/net-irc/ergo/ergo-2.17.0.ebuild b/net-irc/ergo/ergo-2.17.0.ebuild
new file mode 100644
index 0000000000000..6be40c226456b
--- /dev/null
+++ b/net-irc/ergo/ergo-2.17.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit go-module python-any-r1 systemd
+
+DESCRIPTION="A modern IRC server written in Go"
+HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
+SRC_URI="https://github.com/ergochat/ergo/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# We may even want to package irctest in future?
+RDEPEND="
+	acct-user/oragono
+	acct-group/oragono
+"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die
+
+	# Minor fiddling with paths
+	sed -i \
+		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
+		-e 's:/home/ergo:/var/lib/ergo:' \
+		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
+		-e 's:User=ergo:User=oragono:' \
+		distrib/systemd/ergo.service || die
+}
+
+src_compile() {
+	ego build .
+}
+
+src_install() {
+	einstalldocs
+
+	dobin ergo
+
+	insinto /etc/ergo
+	doins default.yaml
+
+	newinitd distrib/openrc/ergo.initd ergo
+	newconfd distrib/openrc/ergo.confd ergo
+
+	keepdir /var/lib/ergo
+	fowners oragono:oragono /var/lib/ergo
+
+	insinto /var/lib/ergo
+	doins -r languages/
+
+	systemd_dounit distrib/systemd/ergo.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "Please copy the example config in ${EROOT}/etc/ergo:"
+		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
+	fi
+}