diff --git a/app-emacs/mastodon/Manifest b/app-emacs/mastodon/Manifest
index 3fbd1f9729b3..788b714f74dc 100644
--- a/app-emacs/mastodon/Manifest
+++ b/app-emacs/mastodon/Manifest
@@ -1,2 +1,3 @@
 DIST mastodon-2.0.2.tar.gz 713944 BLAKE2B 7a94b3b4854b98de2b21a3a41077ecdf03dd76ad2f3f8762fddb8f78b523963b639024eb59b07bb104f265b426a236c132beb1f0b9a1b8eee2840936bd42e5af SHA512 8627d9d94d9b47996924f30dbda83a0a0a0d8a6c413f20f3ccb0c62220105e3b92723f420611dc85cc25c78fef314400428bcfb392339fc808389911d69a8401
 DIST mastodon-2.0.5.tar.gz 714359 BLAKE2B 46fa26149b31e7c15ffcf176e6f80f5ce38633d87e6aa20c0cb8425fd173f52c9fbcb5fef97472a5c3785000f53aabfa01c535eadbf9ea4b7a907ea60d1fd75e SHA512 a034ef8d9c7d649982474557627d40f37abf6f7a64ab850c81b4f013112ef5852c1f4fe76e55cdc74dd2081495a4d2b51265ea7d02c2b06f43944dd5f67897bd
+DIST mastodon-2.0.7.tar.gz 715402 BLAKE2B ec9ecac83631db369701d8c14224058474f9d989b54cf9d45f24a35313da92f464248d72eeab87bf081f24e2d793f07fc2ca85433f8fedc64f03f0f854f6ae3a SHA512 ca3632b216c2504e926a9fef43e3318a2c1b5ec7878b8bf0b476eda2f95f26faf858d7877cd0d830235a79d39efe00108f2d8183f169be0aa9ac2f3cdf2a91ea
diff --git a/app-emacs/mastodon/mastodon-2.0.7.ebuild b/app-emacs/mastodon/mastodon-2.0.7.ebuild
new file mode 100644
index 000000000000..cf2754028de0
--- /dev/null
+++ b/app-emacs/mastodon/mastodon-2.0.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="28.1"
+
+inherit elisp
+
+DESCRIPTION="Emacs client for Mastodon, federated microblogging social network"
+HOMEPAGE="https://codeberg.org/martianh/mastodon.el/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://codeberg.org/martianh/${PN}.el"
+	S="${WORKDIR}/${P}/lisp"
+else
+	SRC_URI="https://codeberg.org/martianh/${PN}.el/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}.el/lisp"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/persist
+	app-emacs/request
+	app-emacs/tp
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( ../README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo "../${PN}.info"
+}