diff --git a/app-emacs/ement/Manifest b/app-emacs/ement/Manifest
new file mode 100644
index 0000000..56e78ea
--- /dev/null
+++ b/app-emacs/ement/Manifest
@@ -0,0 +1 @@
+DIST ement-0.13.tar 1730560 BLAKE2B a3d216931407affc90374f2685d3393e4c2cf67c2b8ddc525b340ed2f6b0bb9cff7ecf6a41843422e76ed580bf51e098ef912786747bbdf88a0487a0ce8f5e2f SHA512 79caa9d3655919854c9c31f45f60212c3c26a9cee121c55adbe99cad9c9a1a2ebdec690be9fba37b5511855b160b0749903dd0a4559a0b59f7d9610fc6b5e01d
diff --git a/app-emacs/ement/ement-0.13.ebuild b/app-emacs/ement/ement-0.13.ebuild
new file mode 100644
index 0000000..893b352
--- /dev/null
+++ b/app-emacs/ement/ement-0.13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Matrix client for GNU Emacs"
+HOMEPAGE="https://github.com/alphapapa/ement.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="e2e"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/transient-0.3.7
+	>=app-emacs/persist-0.5
+	>=app-emacs/plz-0.6
+	>=app-emacs/taxy-0.10
+	>=app-emacs/taxy-magit-section-0.12.1
+	>=app-emacs/svg-lib-0.2.5
+	>=app-emacs/transient-0.3.7
+"
+
+DOCS="README.org"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ement/ement-9999.ebuild b/app-emacs/ement/ement-9999.ebuild
index 7b1563e..893b352 100644
--- a/app-emacs/ement/ement-9999.ebuild
+++ b/app-emacs/ement/ement-9999.ebuild
@@ -1,63 +1,39 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-NEED_EMACS="26.3"
 
-inherit elisp git-r3
+NEED_EMACS="27.1"
+
+inherit elisp
 
 DESCRIPTION="Matrix client for GNU Emacs"
 HOMEPAGE="https://github.com/alphapapa/ement.el"
 
-EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
-EGIT_BRANCH="master"
-EGIT_CLONE_TYPE="single"
-
-KEYWORDS="~amd64"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="e2e extras"
+IUSE="e2e"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/transient-0.3.7
+	>=app-emacs/persist-0.5
+	>=app-emacs/plz-0.6
+	>=app-emacs/taxy-0.10
+	>=app-emacs/taxy-magit-section-0.12.1
+	>=app-emacs/svg-lib-0.2.5
+	>=app-emacs/transient-0.3.7
+"
 
 DOCS="README.org"
 
-BDEPEND="
-	>=app-emacs/plz-0.1_pre
-	>=app-emacs/ts-0.2
-	e2e? ( net-im/pantalaimon )
-"
-# Pantalaimon's docs are needed at build time to annotate config
-
-RDEPEND="
-	>=app-emacs/plz-0.1_pre
-	>=app-emacs/ts-0.2
-	e2e? ( net-im/pantalaimon )
-	extras? ( app-emacs/ement-extras )
-"
 SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-	if use e2e ; then
-		einfo "Annotating suggested pantalaimon config..."
-		cp "${FILESDIR}"/pantalaimon.conf "${S}"
-		"${EMACS}" -Q -batch -l "${FILESDIR}/${PN}"-annotate-conf.el
-	fi
-}
-
-src_install() {
-	if use e2e ; then
-		einfo "Installing suggested pantalaimon config to /etc/${PN}"
-		insinto /etc/"${PN}"
-		doins pantalaimon.conf
-		DOCS+=" ${FILESDIR}/${PN}-gentoo-pantalaimon.org"
-	fi
-	elisp_src_install
-}
-
-pkg_postinst() {
-	if [ ! [ use e2e && use extras ] ] ; then
-		einfo "To start using Matrix from Emacs with E2EE without any manual configuration,"
-		einfo "USE=\"e2e extras\" emerge app-emacs/ement"
-	fi
-}
diff --git a/app-emacs/ement/metadata.xml b/app-emacs/ement/metadata.xml
index 0705386..c561bd6 100644
--- a/app-emacs/ement/metadata.xml
+++ b/app-emacs/ement/metadata.xml
@@ -12,6 +12,5 @@
   </upstream>
   <use>
     <flag name="e2e">Enable end to end encryption support via pantalaimon</flag>
-    <flag name="extras">Install extra features (auth-source and proxy support)</flag>
   </use>
 </pkgmetadata>