diff --git a/dev-python/gbinder/Manifest b/dev-python/gbinder/Manifest
index c7dcf5c..76583b9 100644
--- a/dev-python/gbinder/Manifest
+++ b/dev-python/gbinder/Manifest
@@ -1,4 +1,4 @@
-DIST gbinder-1.0.0.tar.gz 22368 BLAKE2B cfe9e8618f594bcff73ea5ed1e1ea3b5cdea86ba4f011fad3187e6cb83993f2153981bcc5d531b2bb91a7be9809ea7880abc9243daed51410f75e551550d49e1 SHA512 3a227b3d79d15fba62eaeeb3dc6c917ad9f9b3238d85a53e93c7f6b1b648849822f187fc6c4f288c4f8b3348ae17fbdb36cde7928d54f72354a7ef35dd8e628f
-EBUILD gbinder-1.0.0.ebuild 742 BLAKE2B 8d3941011814b7aa323caa2ef28f0eea9ee2a2713930a19e4809fc69a70b9d79caf8890a9b3eaf4ee6bf7ed54030626e2cb3a47fe626769cad9c7cd4a27a6cdc SHA512 35b5a7be7028d07944499b1b33bf5066562c4344c07cffbb2fc0b158ca6bcd148a978df37d0537a57755ce1b21f28d8370be5237c8ecfa308c0a05ece04e501d
-EBUILD gbinder-9999.ebuild 566 BLAKE2B 6b01674c0305aeda8f6c95dc4cc0044be6b62900711e14e450b0ed1f015b684baabfe06eab4c5f732e81850937b63a3a99e44170cb64da5e45ae8e4db9b84784 SHA512 5b3a532075d92b2a0e12ebc0fb9e1b3225b4384cd349de27fe61566ba0cf37899a285d761f3cd01eb845a0f25c5302ea9f7955c89beaac1999118176d7604de4
+DIST gbinder-1.0.0.tar.gz 22640 BLAKE2B dbd0b07c693c803c6646fded1ea0b546d7dc40a1a5f1592601d28d63dbe5113b2bcc07314710c7ba1b47f3417b943398e720ece089ff8a68856e7b2cfda55ae1 SHA512 3b52c01c99321108a3d5c0129fb4fcf22d164e5de1e197f0e01a77e3bcbf9c4fd7ee35ce58131f545f65561c622b30f5919f4bdc995005b00a18a15c695fbf51
+EBUILD gbinder-1.0.0.ebuild 795 BLAKE2B 0578a87f2374fcf30b375c2cecb4fb4c0e1e569b5c56993fc2db20f42466e51d0c31f6fbd2c4804f5c45585b68bfffe6e10aeaf576da7aa3581bd13cf318aa8e SHA512 fa5bf5566ab0406ac51deca0d58279c9519d55e1c837a17e6ede983244c8962d3badfe185819b2af1c6eb796cfd419ba1ee93755f2c0ed64e621e73834fa669d
+EBUILD gbinder-9999.ebuild 795 BLAKE2B 0578a87f2374fcf30b375c2cecb4fb4c0e1e569b5c56993fc2db20f42466e51d0c31f6fbd2c4804f5c45585b68bfffe6e10aeaf576da7aa3581bd13cf318aa8e SHA512 fa5bf5566ab0406ac51deca0d58279c9519d55e1c837a17e6ede983244c8962d3badfe185819b2af1c6eb796cfd419ba1ee93755f2c0ed64e621e73834fa669d
 MISC metadata.xml 332 BLAKE2B 70c12872402aad1353ff9120cd0dcb1aa8865fee04cf227f6017ae9789559f9d97f125a2e3681dfd0ddacdc2dcfc64dc10caa908b1b653b272e1d12e013a5689 SHA512 755f31f377f95a03a898a73d29c6097bb07b4ccce9190229b1bf3673a750535390694851c1008bb79177c1025b60ed84548e2075094170f851e22dbb4fbb8309
diff --git a/dev-python/gbinder/gbinder-1.0.0.ebuild b/dev-python/gbinder/gbinder-1.0.0.ebuild
index 164537a..7f0e5f2 100644
--- a/dev-python/gbinder/gbinder-1.0.0.ebuild
+++ b/dev-python/gbinder/gbinder-1.0.0.ebuild
@@ -8,12 +8,16 @@ DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
-EGIT_COMMIT="834198b2e6cbeebdce80e982a81b1bf37bb3adbd"
-MY_PN="${PN}-python"
-MY_P="${MY_PN}-${EGIT_COMMIT}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="https://github.com/erfanoabdi/gbinder-python/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+if [[ ${PV} != *9999* ]]; then
+	MY_PN="${PN}-python"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/erfanoabdi/gbinder-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/erfanoabdi/gbinder-python.git"
+fi
 
 DESCRIPTION="Python bindings for libgbinder"
 HOMEPAGE="https://github.com/erfanoabdi/gbinder-python"
diff --git a/dev-python/gbinder/gbinder-9999.ebuild b/dev-python/gbinder/gbinder-9999.ebuild
index 7965bc4..7f0e5f2 100644
--- a/dev-python/gbinder/gbinder-9999.ebuild
+++ b/dev-python/gbinder/gbinder-9999.ebuild
@@ -6,9 +6,18 @@ EAPI=7
 PYTHON_COMPAT=( python3_9 )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit git-r3 distutils-r1
+inherit distutils-r1
 
-EGIT_REPO_URI="https://github.com/erfanoabdi/gbinder-python.git"
+if [[ ${PV} != *9999* ]]; then
+	MY_PN="${PN}-python"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/erfanoabdi/gbinder-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/erfanoabdi/gbinder-python.git"
+fi
 
 DESCRIPTION="Python bindings for libgbinder"
 HOMEPAGE="https://github.com/erfanoabdi/gbinder-python"