diff --git a/app-emacs/plz/Manifest b/app-emacs/plz/Manifest
new file mode 100644
index 0000000..7763817
--- /dev/null
+++ b/app-emacs/plz/Manifest
@@ -0,0 +1 @@
+DIST plz-0.7.tar.gz 105630 BLAKE2B 882e5141d6e069da3c7b32706e459e5bcc71abb1277be39162310cde413784202d21bae4bbf8b61f2b72c0edf71ef7b4615685246be17905bbabc9626a2035d6 SHA512 f3300843d30e4b219e4c3f9e898f99f1f3987c73195fdd40a9022c0ac7e09ac25f217adf619b61fb36e2a4d0ea494f5546226e2d1dd85514d1b111f769b7f5ef
diff --git a/app-emacs/plz/plz-0.7.ebuild b/app-emacs/plz/plz-0.7.ebuild
new file mode 100644
index 0000000..cdae911
--- /dev/null
+++ b/app-emacs/plz/plz-0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="An HTTP library for Emacs"
+HOMEPAGE="https://github.com/alphapapa/plz.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/plz.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+
+	# Tests find files git and patching them to work without is too burdensome
+	RESTRICT="test"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="net-misc/curl"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo plz.info
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-emacs/plz/plz-9999.ebuild b/app-emacs/plz/plz-9999.ebuild
index ea56f11..cdae911 100644
--- a/app-emacs/plz/plz-9999.ebuild
+++ b/app-emacs/plz/plz-9999.ebuild
@@ -1,26 +1,40 @@
-# 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
+inherit elisp
 
-DESCRIPTION="An HTTP library that uses curl as a backend"
+DESCRIPTION="An HTTP library for Emacs"
 HOMEPAGE="https://github.com/alphapapa/plz.el"
 
-EGIT_REPO_URI="https://github.com/alphapapa/plz.el.git"
-EGIT_BRANCH="master"
-EGIT_CLONE_TYPE="single"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/plz.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 
-KEYWORDS="~amd64"
+	KEYWORDS="~amd64"
+
+	# Tests find files git and patching them to work without is too burdensome
+	RESTRICT="test"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
+RDEPEND="net-misc/curl"
+
 SITEFILE="50${PN}-gentoo.el"
 
-RDEPEND="net-misc/curl"
+src_install() {
+	elisp_src_install
+	doinfo plz.info
+}
 
 src_test() {
 	emake test