diff --git a/app-emacs/cider/Manifest b/app-emacs/cider/Manifest
index e3294ee14ad5..f9db25a6d525 100644
--- a/app-emacs/cider/Manifest
+++ b/app-emacs/cider/Manifest
@@ -1 +1,2 @@
 DIST cider-1.19.0.tar.gz 8836060 BLAKE2B 50af94aa97e58583d9b0ca0388aa47907727ea4b3afb878ea2c4025d4ea991992a234d4b44df6330521686e1a74d3f46780c20b7952cc937dc8ea66c3aeb8128 SHA512 60d8e9788e56499ae9c3a82ea690aa832741f8501f86df5c4c9a051786c9ee953d1af482c3702af10699270c8cd9f0a2116bc2af4daa774555e5972758db4913
+DIST cider-1.20.0.tar.gz 8837651 BLAKE2B c0c6ea33162b7630cd0c1d3e4867f603ddac97de3906b071a7cbb440f1b40af4754516a910498fcb3807d877f7b493fb38161192281d97139221a5958457f3a4 SHA512 3ac208f5507ad8c117ab584d123e2badda5455a887a52fea78614390ab9aef1bbdaeefb74d7b1355c34f6185be7abba85a1f23ed95570297903476dc573d07ae
diff --git a/app-emacs/cider/cider-1.20.0.ebuild b/app-emacs/cider/cider-1.20.0.ebuild
new file mode 100644
index 000000000000..2ae15cc922d7
--- /dev/null
+++ b/app-emacs/cider/cider-1.20.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp optfeature
+
+DESCRIPTION="Clojure Interactive Development Environment for GNU Emacs"
+HOMEPAGE="https://cider.mx/
+	https://github.com/clojure-emacs/cider/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/clojure-emacs/${PN}"
+else
+	SRC_URI="https://github.com/clojure-emacs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/clojure-mode
+	app-emacs/parseedn
+	app-emacs/queue
+	app-emacs/sesman
+	app-emacs/spinner
+	app-emacs/transient
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+# The "clojure-ts-mode" is currently unpackaged, so remove related tests.
+ELISP_REMOVE="
+	test/${PN}-find-tests.el
+	test/${PN}-jar-tests.el
+	test/${PN}-repl-tests.el
+	test/${PN}-tests.el
+	test/clojure-ts-mode/${PN}-connection-ts-tests.el
+	test/clojure-ts-mode/${PN}-find-ts-tests.el
+	test/clojure-ts-mode/${PN}-selector-ts-tests.el
+	test/clojure-ts-mode/${PN}-util-ts-tests.el
+	test/integration/integration-tests.el
+	test/nrepl-bencode-tests.el
+	test/nrepl-client-tests.el
+"
+
+DOCS=( CHANGELOG.md README.md ROADMAP.md refcard )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests buttercup ./test
+
+src_install() {
+	elisp_src_install
+
+	optfeature "Connecting to leiningen REPL" dev-java/leiningen dev-java/leiningen-bin
+}