diff --git a/lang/lfortran/Makefile b/lang/lfortran/Makefile
index 3ceaceb7d0b0..3b3327607dd2 100644
--- a/lang/lfortran/Makefile
+++ b/lang/lfortran/Makefile
@@ -1,57 +1,62 @@
 PORTNAME=	lfortran
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.3
+DISTVERSION=	0.21.1
 CATEGORIES=	lang
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Modern interactive Fortran compiler built on top of LLVM
 WWW=		https://lfortran.org/
 
 LICENSE=	BSD3CLAUSE
 
 BROKEN_FreeBSD_12=	use of undeclared identifier '_Unwind_Backtrace'
 BROKEN_i386=	sizeof(YYSTYPE) != sizeof(Vec<AST::ast_t*>)
 
 BUILD_DEPENDS=	bash:shells/bash		\
 		re2c>0:devel/re2c		\
 		dwarfdump:devel/dwarfdump	\
 		rapidjson>0:devel/rapidjson
 LIB_DEPENDS=	libfmt.so:devel/libfmt	\
 		libzstd.so:archivers/zstd	\
 		libunwind.so:devel/libunwind	\
 		libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS=	dwarfdump:devel/dwarfdump
 
 USE_GITHUB=	yes
 
 USES=		bison cmake:testing compiler:c++17-lang pkgconfig	\
 		python:build ssl shebangfix
 SHEBANG_FILES=	*.sh
 BINARY_ALIAS=	python=${PYTHON_CMD}
 CMAKE_ON=	LFORTRAN_BUILD_ALL WITH_DWARFDUMP WITH_FMT WITH_JSON	\
 		WITH_LINKH WITH_LLVM WITH_STACKTRACE WITH_UNWIND
 
 LLVM_VERSION=	15
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	EXAMPLES
+PORTEXAMPLES=	*
 
 # Xeus: version 3.0.5 is required and xeus-zmq 1.0.2
 # + xtl-quant-stack + cppzmq + nlohmann_json + LibUUID + libzmq4
 BUILD_DEPENDS+=	xtl-quant-stack>=0.7:devel/xtl-quant-stack	\
 		nlohmann-json>0:devel/nlohmann-json	\
 		cppzmq>=4.8.1:net/cppzmq
 LIB_DEPENDS+=	libxeus.so:devel/xeus	\
 		libzmq.so:net/libzmq4	\
 		libxeus-zmq.so:devel/xeus-zmq	\
 		libuuid.so:misc/e2fsprogs-libuuid
 CMAKE_ON+=	WITH_XEUS
 
 # BFD:
 USE_BINUTILS=	yes
 CMAKE_ON+=	WITH_BFD
 LIB_DEPENDS+=	libbfd.so:devel/binutils
 
 pre-configure:
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/version
 
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+
 .include <bsd.port.mk>
diff --git a/lang/lfortran/distinfo b/lang/lfortran/distinfo
index af2116d845c3..cb7dfbb92dfb 100644
--- a/lang/lfortran/distinfo
+++ b/lang/lfortran/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694269873
-SHA256 (lfortran-lfortran-v0.20.3_GH0.tar.gz) = fa0e1cf8bf9764e254973725dfa7319ddd5c160320aa670e210d4b8415298591
-SIZE (lfortran-lfortran-v0.20.3_GH0.tar.gz) = 2300921
+TIMESTAMP = 1696689407
+SHA256 (lfortran-lfortran-v0.21.1_GH0.tar.gz) = f0daf532ee9d86aa05c6630bfb7afc9c5fd551dccb0a3937f564f1811f759cec
+SIZE (lfortran-lfortran-v0.21.1_GH0.tar.gz) = 2391190
diff --git a/lang/lfortran/pkg-plist b/lang/lfortran/pkg-plist
index 353bf2050a68..f5e0b9453703 100644
--- a/lang/lfortran/pkg-plist
+++ b/lang/lfortran/pkg-plist
@@ -1,18 +1,21 @@
 bin/lfortran
+share/jupyter/kernels/fortran/kernel.json
 %%DATADIR%%/lib/impure/lfortran_intrinsics.h
 %%DATADIR%%/lib/lfortran_intrinsic_bit.mod
 %%DATADIR%%/lib/lfortran_intrinsic_builtin.mod
+%%DATADIR%%/lib/lfortran_intrinsic_custom.mod
 %%DATADIR%%/lib/lfortran_intrinsic_ieee_arithmetic.mod
 %%DATADIR%%/lib/lfortran_intrinsic_iso_c_binding.mod
 %%DATADIR%%/lib/lfortran_intrinsic_iso_fortran_env.mod
 %%DATADIR%%/lib/lfortran_intrinsic_kind.mod
 %%DATADIR%%/lib/lfortran_intrinsic_math.mod
 %%DATADIR%%/lib/lfortran_intrinsic_math2.mod
 %%DATADIR%%/lib/lfortran_intrinsic_math3.mod
 %%DATADIR%%/lib/lfortran_intrinsic_optimization.mod
 %%DATADIR%%/lib/lfortran_intrinsic_sin.mod
 %%DATADIR%%/lib/lfortran_intrinsic_string.mod
 %%DATADIR%%/lib/lfortran_intrinsic_trig.mod
 %%DATADIR%%/lib/liblfortran_runtime.so
+%%DATADIR%%/lib/liblfortran_runtime.so.0
+%%DATADIR%%/lib/liblfortran_runtime.so.0.21.1
 %%DATADIR%%/lib/liblfortran_runtime_static.a
-share/jupyter/kernels/fortran/kernel.json