2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c8c801d5fdd..4067befcd20e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = gajim-git
 	pkgdesc = Jabber/XMPP instant messenger client written in Python with GTK+
-	pkgver = 1.0.0.beta1.r1944.g9497dce25
+	pkgver = r17041.9497dce25
 	pkgrel = 1
+	epoch = 1
 	url = https://gajim.org/
 	arch = any
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index b650c97591ef..5664daeca7b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,8 @@
 
 _name=gajim
 pkgname="$_name-git"
-pkgver=1.0.0.beta1.r1944.g9497dce25
+epoch=1
+pkgver=r17041.9497dce25
 pkgrel=1
 pkgdesc="Jabber/XMPP instant messenger client written in Python with GTK+"
 arch=('any')
@@ -43,7 +44,7 @@ md5sums=('SKIP')
 
 pkgver() {
   cd $_name
-  git describe --long --tags | sed 's/^gajim-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {