diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 26c1c9721e3f..59b4a5a26c8e 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -3,9 +3,8 @@
 # pinned to exact versions of everything used to build them.
 
 PORTNAME=	sbcl
-DISTVERSION=	2.1.11
+DISTVERSION=	2.2.0
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
@@ -34,21 +33,23 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
 # All options explained into file: ${WRKSRC}/base-target-features.lisp-expr
-OPTIONS_DEFINE=		DOCS QSHOW SAFEPOINT THREADS UNICODE XREF ZLIB
+OPTIONS_DEFINE=		DOCS LINKABLE_RUNTIME QSHOW SAFEPOINT THREADS UNICODE \
+			XREF ZLIB
 OPTIONS_DEFAULT=	SBCL THREADS UNICODE
 
 OPTIONS_SINGLE=			BOOTSTRAP
 OPTIONS_SINGLE_BOOTSTRAP=	ABCL CCL CMUCL SBCL
 OPTIONS_EXCLUDE=		ABCL CMUCL
 
-ABCL_DESC=	Armed Bear Common Lisp
-BOOTSTRAP_DESC=	Supported languages of the build host
-CCL_DESC=	Clozure Common Lisp
-CMUCL_DESC=	Carnegie Mellon University Common Lisp
-QSHOW_DESC=	C runtime with low-level debugging output
-SAFEPOINT_DESC=	Using safepoints instead of signals
-SBCL_DESC=	Steel Bank Common Lisp
-XREF_DESC=	XREF data for SBCL internals
+ABCL_DESC=		Armed Bear Common Lisp
+BOOTSTRAP_DESC=		Supported languages of the build host
+CCL_DESC=		Clozure Common Lisp
+CMUCL_DESC=		Carnegie Mellon University Common Lisp
+LINKABLE_RUNTIME_DESC=	Enable SB-LINKABLE-RUNTIME feature (experimental)
+QSHOW_DESC=		C runtime with low-level debugging output
+SAFEPOINT_DESC=		Using safepoints instead of signals
+SBCL_DESC=		Steel Bank Common Lisp
+XREF_DESC=		XREF data for SBCL internals
 
 ABCL_BUILD_DEPENDS=	abcl:lang/abcl
 ABCL_VARS=		XC_HOST="abcl"
@@ -61,6 +62,9 @@ CMUCL_VARS=		XC_HOST="lisp -nositeinit -noinit -batch -quiet"
 
 DOCS_VARS=	INFO="asdf sbcl"
 
+LINKABLE_RUNTIME_VARS=		MAKE_SH_ARGS+="--with-sb-linkable-runtime"
+LINKABLE_RUNTIME_VARS_OFF=	MAKE_SH_ARGS+="--without-sb-linkable-runtime"
+
 QSHOW_VARS=	MAKE_SH_ARGS+="--with-sb-qshow"
 QSHOW_VARS_OFF=	MAKE_SH_ARGS+="--without-sb-qshow"
 
@@ -102,10 +106,16 @@ SBCL_BOOT_LIST=	${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \
 ARCHOS_PATTERN=	*-${ARCH:S/amd64/x86-64/:S/i386/x86/}-${OPSYS:tl}*
 BOOT_WRKSRC=	${WRKDIR}/${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}
 
+.if ${PORT_OPTIONS:MLINKABLE_RUNTIME}
+PLIST_SUB+=	LINKABLE_RUNTIME=""
+.else
+PLIST_SUB+=	LINKABLE_RUNTIME="@comment "
+.endif
+
 # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
 .if defined (PLUS_BOOTSTRAPS)
 . for B in ${SBCL_BOOT_LIST}
-.  if ! ${DISTFILES:Msbcl-${B}-*}
+.  if !${DISTFILES:Msbcl-${B}-*}
 DISTFILES:=	${DISTFILES} \
 		${PORTNAME}-${B}-binary${EXTRACT_SUFX}:binaries
 .  endif
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 0e7868c5a8c5..bd74566eb6cc 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1639593548
-SHA256 (sbcl-2.1.11-source.tar.bz2) = bfc1481de7fdbdfaeef2ab0f0e8e84efd343433dea8d21cfbea8b0146cbdfefd
-SIZE (sbcl-2.1.11-source.tar.bz2) = 6687529
-SHA256 (sbcl-2.1.11-documentation-html.tar.bz2) = f5b4868bb2fe0798dec695a863ebdb12c59c324350ae6eaf17de2285c4c4df4c
-SIZE (sbcl-2.1.11-documentation-html.tar.bz2) = 231990
+TIMESTAMP = 1641112381
+SHA256 (sbcl-2.2.0-source.tar.bz2) = 2276957ea86ae9968ca486a9928c67a34cb31c9403ec657d24ecdf8458daa5c6
+SIZE (sbcl-2.2.0-source.tar.bz2) = 6697729
+SHA256 (sbcl-2.2.0-documentation-html.tar.bz2) = f5b4868bb2fe0798dec695a863ebdb12c59c324350ae6eaf17de2285c4c4df4c
+SIZE (sbcl-2.2.0-documentation-html.tar.bz2) = 231990
 SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492
 SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348
 SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index 1eb09094283a..8aac3c9349e2 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -1,4 +1,47 @@
 bin/sbcl
+%%LINKABLE_RUNTIME%%lib/sbcl/alloc.o
+%%LINKABLE_RUNTIME%%lib/sbcl/backtrace.o
+%%LINKABLE_RUNTIME%%lib/sbcl/breakpoint.o
+%%LINKABLE_RUNTIME%%lib/sbcl/bsd-os.o
+%%LINKABLE_RUNTIME%%lib/sbcl/coalesce.o
+%%LINKABLE_RUNTIME%%lib/sbcl/coreparse.o
+%%LINKABLE_RUNTIME%%lib/sbcl/dynbind.o
+%%LINKABLE_RUNTIME%%lib/sbcl/elf.o
+%%LINKABLE_RUNTIME%%lib/sbcl/fullcgc.o
+%%LINKABLE_RUNTIME%%lib/sbcl/funcall.o
+%%LINKABLE_RUNTIME%%lib/sbcl/gc-common.o
+%%LINKABLE_RUNTIME%%lib/sbcl/gencgc.o
+%%LINKABLE_RUNTIME%%lib/sbcl/globals.o
+%%LINKABLE_RUNTIME%%lib/sbcl/hopscotch.o
+%%LINKABLE_RUNTIME%%lib/sbcl/immobile-space.o
+%%LINKABLE_RUNTIME%%lib/sbcl/interr.o
+%%LINKABLE_RUNTIME%%lib/sbcl/interrupt.o
+%%LINKABLE_RUNTIME%%lib/sbcl/largefile.o
+%%LINKABLE_RUNTIME%%lib/sbcl/main.o
+%%LINKABLE_RUNTIME%%lib/sbcl/monitor.o
+%%LINKABLE_RUNTIME%%lib/sbcl/murmur_hash.o
+%%LINKABLE_RUNTIME%%lib/sbcl/os-common.o
+%%LINKABLE_RUNTIME%%lib/sbcl/parse.o
+%%LINKABLE_RUNTIME%%lib/sbcl/print.o
+%%LINKABLE_RUNTIME%%lib/sbcl/purify.o
+%%LINKABLE_RUNTIME%%lib/sbcl/regnames.o
+%%LINKABLE_RUNTIME%%lib/sbcl/run-program.o
+%%LINKABLE_RUNTIME%%lib/sbcl/runtime.o
+%%LINKABLE_RUNTIME%%lib/sbcl/safepoint.o
+%%LINKABLE_RUNTIME%%lib/sbcl/save.o
+%%LINKABLE_RUNTIME%%lib/sbcl/sc-offset.o
+%%LINKABLE_RUNTIME%%lib/sbcl/search.o
+%%LINKABLE_RUNTIME%%lib/sbcl/sprof.o
+%%LINKABLE_RUNTIME%%lib/sbcl/thread.o
+%%LINKABLE_RUNTIME%%lib/sbcl/time.o
+%%LINKABLE_RUNTIME%%lib/sbcl/traceroot.o
+%%LINKABLE_RUNTIME%%lib/sbcl/validate.o
+%%LINKABLE_RUNTIME%%lib/sbcl/var-io.o
+%%LINKABLE_RUNTIME%%lib/sbcl/vars.o
+%%LINKABLE_RUNTIME%%lib/sbcl/wrap.o
+%%LINKABLE_RUNTIME%%lib/sbcl/x86-64-arch.o
+%%LINKABLE_RUNTIME%%lib/sbcl/x86-64-assem.o
+%%LINKABLE_RUNTIME%%lib/sbcl/x86-64-bsd-os.o
 lib/sbcl/asdf/asdf.lisp
 lib/sbcl/asdf/uiop.lisp
 lib/sbcl/contrib/asdf.fasl