diff --git a/lang/lfortran/Makefile b/lang/lfortran/Makefile
index 7f0d141e634b2..7be17902d0e30 100644
--- a/lang/lfortran/Makefile
+++ b/lang/lfortran/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lfortran
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.21.2
+DISTVERSION=	0.21.5
 CATEGORIES=	lang
 
 MAINTAINER=	fortran@FreeBSD.org
@@ -34,7 +34,17 @@ USE_LDCONFIG=	yes
 
 LLVM_VERSION=	15	# 16 is supported too
 
-OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFINE=	EXAMPLES # NB
+# NB is broken ATM
+NB_DESC=	Documentation as a Jupyter notebook
+NB_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx@${PY_FLAVOR}	\
+			sphinx-intl:textproc/py-sphinx@${PY_FLAVOR}	\
+			myst-inv:textproc/py-myst-parser@${PY_FLAVOR}   \
+			jupyter:devel/py-jupyter-core@${PY_FLAVOR}	\
+			${PYTHON_PKGNAMEPREFIX}nbsphinx>0:textproc/py-nbsphinx@${PY_FLAVOR}	\
+			${PYTHON_PKGNAMEPREFIX}sphinx_material>0:textproc/py-sphinx-material@${PY_FLAVOR}	\
+			${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR}	\
+
 PORTEXAMPLES=	*
 
 # Xeus: version 3.0.5 is required and xeus-zmq 1.0.2
@@ -58,6 +68,9 @@ PLIST_SUB=	VER=${PORTVERSION}
 pre-configure:
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/version
 
+do-build-NB-on:
+	(cd ${WRKSRC}/doc && ${PYTHON_CMD} build.py)
+
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
diff --git a/lang/lfortran/distinfo b/lang/lfortran/distinfo
index 83c451c92d7e7..50f67c0a21c71 100644
--- a/lang/lfortran/distinfo
+++ b/lang/lfortran/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696771504
-SHA256 (lfortran-lfortran-v0.21.2_GH0.tar.gz) = 3aa390cb552e1a2467b7e8811d3b8a4daeb28d375613d3f245e8111e784fe72c
-SIZE (lfortran-lfortran-v0.21.2_GH0.tar.gz) = 2391176
+TIMESTAMP = 1697045083
+SHA256 (lfortran-lfortran-v0.21.5_GH0.tar.gz) = 58cd43ba9b351d394cc6db8699038932d73018fdca948f13d28714de23e6d110
+SIZE (lfortran-lfortran-v0.21.5_GH0.tar.gz) = 2395607