diff --git a/srcpkgs/sbcl/patches/ucontext.patch b/srcpkgs/sbcl/patches/ucontext.patch
new file mode 100644
index 00000000000..797b17c233d
--- /dev/null
+++ b/srcpkgs/sbcl/patches/ucontext.patch
@@ -0,0 +1,22 @@
+--- src/runtime/x86-linux-os.h.orig
++++ src/runtime/x86-linux-os.h
+@@ -1,7 +1,7 @@
+ #ifndef _X86_LINUX_OS_H
+ #define _X86_LINUX_OS_H
+ 
+-typedef struct ucontext os_context_t;
++typedef ucontext_t os_context_t;
+ typedef greg_t os_context_register_t;
+ 
+ static inline os_context_t *arch_os_get_context(void **void_context)
+--- src/runtime/x86-64-linux-os.h.orig
++++ src/runtime/x86-64-linux-os.h
+@@ -1,7 +1,7 @@
+ #ifndef _X86_64_LINUX_OS_H
+ #define _X86_64_LINUX_OS_H
+ 
+-typedef struct ucontext os_context_t;
++typedef ucontext_t os_context_t;
+ typedef long os_context_register_t;
+ 
+ static inline os_context_t *arch_os_get_context(void **void_context)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index b46769c8bc6..41b0eb46ad4 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,8 +1,8 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=1.3.20
+version=1.3.21
 revision=1
-only_for_archs="x86_64 x86_64-musl armv7l aarch64"
+only_for_archs="i686 x86_64 x86_64-musl armv7l aarch64"
 hostmakedepends="iana-etc"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="custom"
 homepage="http://www.sbcl.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=5282318053b62ff041c14956dd5a2e2e66697482141713c6c5df375d05cd1f62
+checksum=684c51c0f041d78055053fbf350c10cc54f9aea4d32895901617eb5edd56158e
 nocross=yes
 nopie=yes
 
@@ -19,7 +19,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" cda8d3f36eaaa52e0bda8042cf2e49a2ca1b71e5076eb78104de012cff91c95d"
+	checksum+=" c1c3e17e1857fb1c22af575941be5cd1d5444b462397b1b3c9f3877aee2e814b"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.7-x86-linux-binary.tar.bz2"