diff --git a/.SRCINFO b/.SRCINFO
index ad70211..872d0de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = munin-template-munstrap-git
 	pkgdesc = Bootstrap based template for munin-html
-	pkgver = r3632.c9157be3
+	pkgver = r25.c3431051
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/munin-monitoring/contrib/tree/master/templates/munstrap
 	arch = any
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 17df0de..0d49b1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,9 @@
 # Maintainer: Bert Peters <bert@bertptrs.nl>
 pkgname=munin-template-munstrap-git
-pkgver=r3632.c9157be3
+pkgver=r25.c3431051
+# Changed versioning scheme to prevent rebuilds
+# Thanks to eschwarz for recommending
+epoch=1
 pkgrel=1
 pkgdesc="Bootstrap based template for munin-html"
 arch=('any')
@@ -11,9 +14,10 @@ source=("${pkgname%-git}::git+https://github.com/munin-monitoring/contrib.git")
 md5sums=('SKIP')
 
 pkgver() {
+	local subdir="templates/munstrap"
 	cd "$srcdir/${pkgname%-git}"
 	# Git, no tags available
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	printf "r%s.%s" "$(git rev-list --count HEAD "$subdir")" "$(git log -n 1 --pretty=format:%h -- "$subdir")"
 }
 
 package() {