diff --git a/srcpkgs/sbcl/patches/ppc-musl.patch b/srcpkgs/sbcl/patches/ppc-musl.patch
index 91a347f21f3..ad0e0bc0846 100644
--- a/srcpkgs/sbcl/patches/ppc-musl.patch
+++ b/srcpkgs/sbcl/patches/ppc-musl.patch
@@ -1,5 +1,5 @@
---- a/src/runtime/ppc-linux-os.c
-+++ b/src/runtime/ppc-linux-os.c
+--- a/sbcl/src/runtime/ppc-linux-os.c
++++ b/sbcl/src/runtime/ppc-linux-os.c
 @@ -33,6 +33,7 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -8,8 +8,8 @@
  
  #include "validate.h"
  #include "ppc-linux-mcontext.h"
---- a/src/runtime/os-common.c
-+++ b/src/runtime/os-common.c
+--- a/sbcl/src/runtime/os-common.c
++++ b/sbcl/src/runtime/os-common.c
 @@ -31,6 +31,9 @@
  #if defined(LISP_FEATURE_OS_PROVIDES_DLOPEN) && !defined(LISP_FEATURE_WIN32)
  # include <dlfcn.h>
@@ -20,8 +20,8 @@
  
  /*
   * historically, this used sysconf to select the runtime page size
---- a/src/runtime/ppc-arch.c
-+++ b/src/runtime/ppc-arch.c
+--- a/sbcl/src/runtime/ppc-arch.c
++++ b/sbcl/src/runtime/ppc-arch.c
 @@ -10,6 +10,7 @@
   */
  
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 7d401b5e166..fafab7d36d2 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -2,6 +2,8 @@
 pkgname=sbcl
 version=2.2.9
 revision=1
+create_wrksrc="required"
+build_wrksrc=sbcl
 # make sure the sbcl option in maxima is enabled for the same archs
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc texinfo"
@@ -39,6 +41,10 @@ i686*|ppc*|*-musl)
 	;;
 esac
 
+post_extract() {
+	mv sbcl-${version} sbcl
+}
+
 do_build() {
 	printf '"%s.void.%s"\n' "$version" "$revision" >version.lisp-expr
 	export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl"
@@ -59,7 +65,6 @@ sbcl-source_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- source files"
 	pkg_install() {
-		cd $wrksrc
 		./clean.sh
 		vmkdir usr/lib/sbcl
 		vcopy src usr/lib/sbcl