diff --git a/srcpkgs/spl/template b/srcpkgs/spl/template
index c7dde08f96e..6f3a88df2bf 100644
--- a/srcpkgs/spl/template
+++ b/srcpkgs/spl/template
@@ -1,15 +1,15 @@
 # Template file for 'spl'
 pkgname=spl
-version=0.6.3
-revision=2
+version=0.6.3_1.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --sbindir=/usr/bin"
 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="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-${version}.tar.gz"
-checksum=898aa3912c73420a0082375679e28267a26d348a84561e25898a171785f41fe3
+distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/_/-}.tar.gz"
+checksum=ae4ddabd68518821485be60e62dbf640168598abeb9edcdb29d46ba7c2923241
 
 triggers="dkms"
 dkms_modules="spl ${version}"
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fb2ad541baf..2275f821660 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=0.6.3
-revision=3
+version=0.6.3_1.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --sbindir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -13,8 +13,8 @@ short_desc="Z File System -- userland and kernel modules (using DKMS)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="CDDL"
 homepage="http://zfsonlinux.org/"
-distfiles="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-${version}.tar.gz"
-checksum=29bcfdd4161521692d2ca2515ad27a9edd9491c9cb5c6fb1e923d8eed28d391b
+distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/_/-}.tar.gz"
+checksum=125f8815ee78c5391eb8e909d29edf563965cff1bdde06178e0bfe383af63572
 
 triggers="dkms"
 dkms_modules="zfs ${version}"