diff --git a/srcpkgs/yaboot/template b/srcpkgs/yaboot/template
index 86246894406..c879ed74f1e 100644
--- a/srcpkgs/yaboot/template
+++ b/srcpkgs/yaboot/template
@@ -3,6 +3,7 @@ pkgname=yaboot
 version=1.3.17
 revision=1
 archs="ppc64 ppc64-musl ppc ppc-musl"
+create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="autoconf automake"
 depends="powerpc-utils hfsutils"
@@ -12,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.debian.org/YaBoot"
 _e2fsprogs_ver="1.41.14"
 distfiles="https://cdimage.debian.org/cdimage/cd-sources/yaboot_${version}.orig.tar.gz
- http://ftp.be.debian.org/pub/linux/kernel/people/tytso/e2fsprogs/e2fsprogs-${_e2fsprogs_ver}.tar.gz"
+ $KERNEL_SITE/kernel/people/tytso/e2fsprogs/e2fsprogs-${_e2fsprogs_ver}.tar.gz"
 checksum="2fb738d8fd48b94ab2534a4fdf63738ad02c1a30f4b2add91f837baff8fa2aa1
  3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176"
 # Don't want stripped yaboot bits to leak into -dbg
@@ -34,12 +35,13 @@ do_check() {
 	:
 }
 
+post_extract() {
+	mv yaboot-${version}/* .
+}
+
 post_patch() {
 	# Add support for DESTDIR in order to not leak files
 	sed -i 's/^ROOT =/ROOT = $(DESTDIR)/' Makefile
-
-	# Ensure safe cleanup
-	mv ${XBPS_BUILDDIR}/e2fsprogs-${_e2fsprogs_ver} .
 }
 
 # This builds e2fsprogs libraries, needed by yaboot for ext* support