diff --git a/.SRCINFO b/.SRCINFO
index f469c1b4b733..40338431746c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = radius2-git
 	pkgdesc = fast binary emulation and symbolic execution framework using radare2
-	pkgver = v1.0.16.r30.gbf92f44
+	pkgver = r170.15e1b79
 	pkgrel = 1
-	url = https://github.com/aemmitt-ns/radius
+	url = https://github.com/radareorg/radius2
 	arch = x86_64
 	license = MIT
 	makedepends = cargo
@@ -13,7 +13,7 @@ pkgbase = radius2-git
 	depends = glibc
 	provides = radius2
 	conflicts = radius2
-	source = git+https://github.com/aemmitt-ns/radius
+	source = git+https://github.com/radareorg/radius2
 	source = Cargo.toml.patch
 	sha256sums = SKIP
 	sha256sums = 5d10a10a3a75927e0d728eaa0120aceab9c4f7258d46268ecb07acc5b111fc16
diff --git a/PKGBUILD b/PKGBUILD
index 44473792a5d6..a39b362c758c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Lennard Hofmann <lennard dot hofmann at web dot de>
 pkgname=radius2-git
-_reponame=radius
-pkgver=v1.0.16.r30.gbf92f44
+_reponame=radius2
+pkgver=r170.15e1b79
 pkgrel=1
 pkgdesc='fast binary emulation and symbolic execution framework using radare2'
 arch=('x86_64')
-url="https://github.com/aemmitt-ns/$_reponame"
+url="https://github.com/radareorg/$_reponame"
 license=('MIT')
 depends=('boolector' 'radare2' 'gcc-libs' 'glibc')
 makedepends=('cargo' 'git')
@@ -17,7 +17,7 @@ sha256sums=('SKIP'
 
 pkgver() {
 	cd "$srcdir/$_reponame"
-	git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {