diff --git a/.SRCINFO b/.SRCINFO
index ca3739c8b57a0..95194b2f62c38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = typhoon-git
 	pkgdesc = A stylish weather app based on Stormcloud
-	pkgver = r103.gdf1fe35
+	pkgver = v0.9.5.r2.g5ea0092
 	pkgrel = 1
 	url = https://github.com/archisman-panigrahi/typhoon
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 526a7b141ccb2..e0c7c62d567b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Archisman Panigrahi <apandada1@gmail.com>
 pkgname=typhoon-git
 _pkgname=typhoon
-pkgver=r103.gdf1fe35
+pkgver=v0.9.5.r2.g5ea0092
 pkgrel=1
 pkgdesc="A stylish weather app based on Stormcloud"
 arch=('any')
@@ -15,9 +15,8 @@ source=("git+$url#branch=master")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
-  # Generate a valid version string by replacing invalid characters
-  git describe --tags --long 2>/dev/null | sed 's/-/./g' || echo "r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+  cd "${pkgname%-git}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {