diff --git a/textproc/py-mkdocstrings/Makefile b/textproc/py-mkdocstrings/Makefile
index 791c81be8efc..0b44e2548343 100644
--- a/textproc/py-mkdocstrings/Makefile
+++ b/textproc/py-mkdocstrings/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	mkdocstrings
 DISTVERSION=	0.17.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Automatic documentation from sources for MkDocs
 WWW=		https://github.com/mkdocstrings/mkdocstrings
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.3:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs>=1.2:textproc/py-mkdocs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymdown-extensions>=6.3:textproc/py-pymdown-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs-autorefs>=0.1:textproc/py-mkdocs-autorefs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytkdocs>=0.14.0:textproc/py-pytkdocs@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs-material>0:textproc/py-mkdocs-material@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|' ${WRKSRC}/setup.py
 
 # Skip "test_sphinx_load_mkdocstrings_inventory_file" as it requires
 # mkdocs-gen-files (not in Ports tree, yet).
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs \
 		-k 'not test_sphinx_load_mkdocstrings_inventory_file'
 
 .include <bsd.port.mk>
diff --git a/textproc/py-mkdocstrings/files/patch-src_mkdocstrings_loggers.py b/textproc/py-mkdocstrings/files/patch-src_mkdocstrings_loggers.py
new file mode 100644
index 000000000000..defa90fffce3
--- /dev/null
+++ b/textproc/py-mkdocstrings/files/patch-src_mkdocstrings_loggers.py
@@ -0,0 +1,34 @@
+From: =?UTF-8?q?Timoth=C3=A9e=20Mazzucotelli?= <pawamoy@pm.me>
+Date: Wed, 2 Feb 2022 12:27:27 +0100
+Subject: [PATCH] refactor: Support Jinja2 3.1
+
+Issue #360: https://github.com/mkdocstrings/mkdocstrings/issues/360
+PR #361: https://github.com/mkdocstrings/mkdocstrings/issues/361
+
+--- src/mkdocstrings/loggers.py.orig	2021-12-27 17:59:33 UTC
++++ src/mkdocstrings/loggers.py
+@@ -4,10 +4,14 @@ from typing import Any, Callable, Optional, Tuple
+ from pathlib import Path
+ from typing import Any, Callable, Optional, Tuple
+ 
+-from jinja2 import contextfunction
+ from jinja2.runtime import Context
+ from mkdocs.utils import warning_filter
+ 
++try:
++    from jinja2 import pass_context
++except ImportError:  # TODO: remove once Jinja2 < 3.1 is dropped
++    from jinja2 import contextfunction as pass_context  # noqa: WPS440
++
+ TEMPLATES_DIR = Path(__file__).parent / "templates"
+ 
+ 
+@@ -71,7 +75,7 @@ def get_template_logger_function(logger_func: Callable
+         A function.
+     """
+ 
+-    @contextfunction
++    @pass_context
+     def wrapper(context: Context, msg: Optional[str] = None) -> str:
+         """Log a message.
+