diff --git a/srcpkgs/spl/template b/srcpkgs/spl/template
index cc98044648..10bc23d648 100644
--- a/srcpkgs/spl/template
+++ b/srcpkgs/spl/template
@@ -2,8 +2,10 @@
 pkgname=spl
 version=0.6.3r1.3
 revision=1
+wrksrc="${pkgname}-${pkgname}-${version/r/-}"
 build_style=gnu-configure
 configure_args="--with-config=user --sbindir=/usr/bin"
+hostmakedepends="automake libtool"
 short_desc="Solaris Porting Layer -- userland and kernel modules (using DKMS)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-2"
@@ -12,18 +14,24 @@ distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version
 checksum=ae4ddabd68518821485be60e62dbf640168598abeb9edcdb29d46ba7c2923241
 
 triggers="dkms"
-dkms_modules="spl ${version}"
-depends="dkms ${pkgname}-devel>=${version}_${revision} glibc-devel"
+dkms_modules="spl ${version/r/-}"
+depends="dkms>=2.2.0.3_9 ${pkgname}-devel>=${version}_${revision} glibc-devel"
 
-post_install() {
-	vmkdir usr/src
-	tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${DESTDIR}/usr/src
-	scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${sourcepkg}-${version}/dkms.conf -n spl
+pre_configure() {
+	autoreconf -fi
+	tar czf ../clean.tar.gz .
+}
+post_install() {
+	vmkdir usr/src/${pkgname}-${version/r/-}
+	tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version/r/-}
+	scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${sourcepkg}-${version/r/-}/dkms.conf -n spl
 }
-
 spl-devel_package() {
 	short_desc="Solaris Porting Layer -- development headers"
 	pkg_install() {
-		vmove usr/src/${sourcepkg}-${version}/include
+		vmove usr/src/${sourcepkg}-${version/r/-}/include
 	}
 }
+do_clean() {
+	rm -f ../clean.tar.gz
+}
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index ded2229d07..5fcbf9e598 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -2,11 +2,12 @@
 pkgname=zfs
 version=0.6.3r1.3
 revision=1
+wrksrc="${pkgname}-${pkgname}-${version/r/-}"
 build_style=gnu-configure
 configure_args="--with-config=user --sbindir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
  --with-dracutdir=/usr/lib/dracut"
-hostmakedepends="dracut"
+hostmakedepends="dracut automake libtool"
 makedepends="spl-devel>=${version} zlib-devel libuuid-devel libblkid-devel"
 conf_files="/etc/zfs/zed.d/zed.rc"
 short_desc="Z File System -- userland and kernel modules (using DKMS)"
@@ -17,9 +18,13 @@ distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version
 checksum=125f8815ee78c5391eb8e909d29edf563965cff1bdde06178e0bfe383af63572
 
 triggers="dkms"
-dkms_modules="zfs ${version}"
-depends="dkms spl>=${version} glibc-devel"
+dkms_modules="zfs ${version/r/-}"
+depends="dkms>=2.2.0.3_9 spl>=${version} glibc-devel"
 
+pre_configure() {
+	autoreconf -fi
+	tar czf ../clean.tar.gz .
+}
 post_install() {
 	# mount.zfs needs to be in /usr/sbin.
 	mv ${DESTDIR}/sbin ${DESTDIR}/usr
@@ -28,11 +33,10 @@ post_install() {
 	vlicense COPYRIGHT
 	vlicense OPENSOLARIS.LICENSE
 
-	vmkdir usr/src
-	tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${DESTDIR}/usr/src
-	scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs
+	vmkdir usr/src/${pkgname}-${version/r/-}
+	tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version/r/-}
+	scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${pkgname}-${version/r/-}/dkms.conf -n zfs
 }
-
 zfs-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc="Z File System -- development files"
@@ -42,3 +46,6 @@ zfs-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+do_clean() {
+	rm -f ../clean.tar.gz
+}