diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 11a5cc40554c1..d4686e6336047 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_server-2.17.0.tar.gz 731949 BLAKE2B e15b8e385f620549ce965a553a49f4606180fc782cd1617b4cc723a5a6443c2a0a7e3c19c9f00577afd125ea9f8e8a68e60eb42d2e73c09b69e0181f6fc8b790 SHA512 9eb386bee25e2fa28ef30a2d00178fcbe3a6ab0b3033c461863cfabb78433701fe7c856af27084e57d312d092610c7d50890637114c90c126e39b9f78bc15355
 DIST jupyter_server-2.18.0.tar.gz 751152 BLAKE2B 7f34be2b9466fdccea015036ba2f91a408f57c728d17e83589ea6a41f7f41b46a834d7acaf2ce210017c7570c30bd804f62e0ab107ccb40f070693865c2af39a SHA512 d959a59bb121c10dd453f8398ababcd1a4bb49976fcd35b3012bc62e95db10bf63a4539db5d1e19d214dbcfddd45494be7bd3bfaf72bd5c86c8475cf3e924037
+DIST jupyter_server-2.18.1.tar.gz 752024 BLAKE2B 56e6731c158f5a171021bf6a053ef58f398362921982222f877aa5c598b2d04455d123ed9711db6047dd4a12bd0b95d321d3dc712afe77ed900c8a83e4cc8ae5 SHA512 fe1fc53216c3ab4c5a8d4c7182a369bb3212c1098885be58be6befe93b4298c082a68308c6deeb849bbbddcafd4d35d91bdfe081a58e78b469b91bd6c02732f9
diff --git a/dev-python/jupyter-server/jupyter-server-2.18.1.ebuild b/dev-python/jupyter-server/jupyter-server-2.18.1.ebuild
new file mode 100644
index 0000000000000..347125e7a374a
--- /dev/null
+++ b/dev-python/jupyter-server/jupyter-server-2.18.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{12..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter-server/jupyter_server/
+	https://pypi.org/project/jupyter-server/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/argon2-cffi-21.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-terminals-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-events-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/overrides-5.0[${PYTHON_USEDEP}]
+	' 3.11)
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/prometheus-client-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-{console-scripts,jupyter,timeout,tornasync} )
+EPYTEST_RERUNS=5
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# This fails if your terminal is zsh (and maybe other non-bash as well?)
+		tests/test_terminal.py
+		# Fails because above is ignored
+		tests/auth/test_authorizer.py
+		# Fails with additional extensions installed
+		tests/extension/test_app.py::test_stop_extension
+	)
+
+	# FIXME: tests seem to be affected by previously installed version
+	epytest -o tmp_path_retention_policy=all
+}