diff --git a/app-misc/neofetch/neofetch-4.0.2.ebuild b/app-misc/neofetch/neofetch-4.0.2.ebuild
index a25cba92a4861..4757864917aba 100644
--- a/app-misc/neofetch/neofetch-4.0.2.ebuild
+++ b/app-misc/neofetch/neofetch-4.0.2.ebuild
@@ -3,12 +3,18 @@
 
 EAPI=7
 
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
 DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
 IUSE="X"
 
 RDEPEND="sys-apps/pciutils
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 82642075d6116..4757864917aba 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -3,10 +3,16 @@
 
 EAPI=7
 
-inherit git-r3
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
 DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
-EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
 LICENSE="MIT-with-advertising"
 SLOT="0"
 IUSE="X"