diff --git a/sys-apps/zsnapper/Manifest b/sys-apps/zsnapper/Manifest
index 933b18a..fa69f52 100644
--- a/sys-apps/zsnapper/Manifest
+++ b/sys-apps/zsnapper/Manifest
@@ -1,3 +1,3 @@
 DIST zsnapper-0.3.6.tar.gz 11757 BLAKE2B 3bda24c71f7176732ed0d2a29f49378833c2111561aeca43333a3ee46aa097f3805633c7d598125d5933128aadce770136a9bb4e64efd0b594f1ad8b1934ac2a SHA512 d0e801ceece9f8833acd07af367c387fb4fd4a1fe91a1768dcf6f0fa4602c44864bc63e8a893e61c2b85c333b56220bdc9ed08ba4be02fd5347586b1db9d798d
-EBUILD zsnapper-0.3.6.ebuild 597 BLAKE2B eb747d939c2323f04fba9d7cd7b8a201695cedefdb890cd88e38a1840c7cf84ad0ca9692016e7a1658e254bd68a2ae9bf1569d56bdc73d511b55fbfacde442cf SHA512 d145556859eae4e30e125415a21449317c857f610394485e6facfaf4f2b27fc3fd45dcec6ad26be8f4fc8db69e430c546317a4f244af3d7761a1e8e75e3ec068
-EBUILD zsnapper-9999.ebuild 584 BLAKE2B 7ad3a6509bd30fbef4161097bad6b39f33901dc2eb9fdbb18b3ecbb8e1f9d850ed94fe7cb5a64af60c82fb0f43475b7e47f50926d026b97a6fa226470caa5407 SHA512 60f5d05c05920ca733e92361806e738154ef5e9dadef8541af934d7693a311d1bc68080b54613f45ba9429d5b6fc35ca574b9a2d41e1411f399a7e3aeefa9c63
+EBUILD zsnapper-0.3.6-r1.ebuild 645 BLAKE2B 394d15e44496b78d95e75a1b1d157d64e3ba8fdf667a2ec3e976f41f2114e9320d74929ddbbb0234590bd6def9e24daf6f46bf9074587686e0cbf3d90d043d39 SHA512 ea89712b805787f436145be391266112d3ba7788c0cc89b21a27780e8807df75dec74919c7872b33b1f2bc408afeb325bde6cd8005a29ae605184def21d14972
+EBUILD zsnapper-9999.ebuild 645 BLAKE2B 394d15e44496b78d95e75a1b1d157d64e3ba8fdf667a2ec3e976f41f2114e9320d74929ddbbb0234590bd6def9e24daf6f46bf9074587686e0cbf3d90d043d39 SHA512 ea89712b805787f436145be391266112d3ba7788c0cc89b21a27780e8807df75dec74919c7872b33b1f2bc408afeb325bde6cd8005a29ae605184def21d14972
diff --git a/sys-apps/zsnapper/zsnapper-0.3.6.ebuild b/sys-apps/zsnapper/zsnapper-0.3.6-r1.ebuild
similarity index 85%
rename from sys-apps/zsnapper/zsnapper-0.3.6.ebuild
rename to sys-apps/zsnapper/zsnapper-0.3.6-r1.ebuild
index fda25a7..66ecb2e 100644
--- a/sys-apps/zsnapper/zsnapper-0.3.6.ebuild
+++ b/sys-apps/zsnapper/zsnapper-0.3.6-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{11,12,13} )
+DISTUTILS_USE_PEP517=setuptools
+
+PYTHON_COMPAT=( python3_{12,13} )
 
 inherit distutils-r1
 
@@ -20,6 +22,7 @@ else
 fi
 
 
+RESTRICT="mirror"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/sys-apps/zsnapper/zsnapper-9999.ebuild b/sys-apps/zsnapper/zsnapper-9999.ebuild
index 7f9a630..66ecb2e 100644
--- a/sys-apps/zsnapper/zsnapper-9999.ebuild
+++ b/sys-apps/zsnapper/zsnapper-9999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{11,12,13} )
+DISTUTILS_USE_PEP517=setuptools
+
+PYTHON_COMPAT=( python3_{12,13} )
 
 inherit distutils-r1
 
@@ -12,14 +14,15 @@ HOMEPAGE="https://gitea.fulh.ax/feffe/zsnapper"
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://gitea.fulh.ax/feffe/zsnapper.git"
 	inherit git-r3
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 else
 	SRC_URI="https://gitea.fulh.ax/feffe/zsnapper/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/zsnapper"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
 
+RESTRICT="mirror"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""