diff --git a/sys-apps/ethq/ethq-0.7.0.ebuild b/sys-apps/ethq/ethq-0.7.0.ebuild
index d88e01f7d8f39..ede0aa57e007a 100644
--- a/sys-apps/ethq/ethq-0.7.0.ebuild
+++ b/sys-apps/ethq/ethq-0.7.0.ebuild
@@ -10,12 +10,19 @@ MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Ethernet NIC Queue stats viewer"
 HOMEPAGE="https://github.com/isc-projects/ethq"
-SRC_URI="https://github.com/isc-projects/ethq/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/isc-projects/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/isc-projects/ethq/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index 5e434f2c65bcf..ede0aa57e007a 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -3,13 +3,24 @@
 
 EAPI=8
 
-EGIT_REPO_URI="https://github.com/isc-projects/${PN}.git"
+inherit edo
 
-inherit edo git-r3
+MY_PV=${PV//./_}
+MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Ethernet NIC Queue stats viewer"
 HOMEPAGE="https://github.com/isc-projects/ethq"
 
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/isc-projects/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/isc-projects/ethq/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
 LICENSE="MPL-2.0"
 SLOT="0"
 IUSE="test"