diff --git a/srcpkgs/spl/template b/srcpkgs/spl/template
index 6f3a88df2b..cc98044648 100644
--- a/srcpkgs/spl/template
+++ b/srcpkgs/spl/template
@@ -1,6 +1,6 @@
 # Template file for 'spl'
 pkgname=spl
-version=0.6.3_1.3
+version=0.6.3r1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --sbindir=/usr/bin"
@@ -8,7 +8,7 @@ short_desc="Solaris Porting Layer -- userland and kernel modules (using DKMS)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-2"
 homepage="http://zfsonlinux.org/"
-distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/_/-}.tar.gz"
+distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz"
 checksum=ae4ddabd68518821485be60e62dbf640168598abeb9edcdb29d46ba7c2923241
 
 triggers="dkms"
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 2275f82166..ded2229d07 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=0.6.3_1.3
+version=0.6.3r1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --sbindir=/usr/bin
@@ -13,7 +13,7 @@ short_desc="Z File System -- userland and kernel modules (using DKMS)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="CDDL"
 homepage="http://zfsonlinux.org/"
-distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/_/-}.tar.gz"
+distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz"
 checksum=125f8815ee78c5391eb8e909d29edf563965cff1bdde06178e0bfe383af63572
 
 triggers="dkms"