diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 066d58833f42..fa37959a1843 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	xonsh
-DISTVERSION=	0.21.2
+DISTVERSION=	0.22.0
 CATEGORIES=	shells python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Python-powered, cross-platform, Unix-gazing shell
 WWW=		https://xon.sh
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=5.3.1:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyte>=0.8.0:devel/py-pyte@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-subprocess>0:devel/py-pytest-subprocess@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}restructuredtext-lint>0:textproc/py-restructuredtext-lint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=20.16.2:devel/py-virtualenv@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent pep517 pytest
 PYTEST_BROKEN_TESTS=	test_builtins.py test_commands_cache.py \
 			test_integrations.py test_man.py test_ptk_highlight.py \
 			test_bash_completer.py test_dir_completers.py \
 			test_specs.py test_os.xsh test_command_completers.py \
 			test_tracer.py
 SHEBANG_FILES=	tests/bin/cat tests/bin/pwd tests/bin/wc
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' \
 		${WRKSRC}/tests/test_integrations.py \
 		${WRKSRC}/tests/test_virtualenv_activator.py
 
 .include <bsd.port.mk>
diff --git a/shells/xonsh/distinfo b/shells/xonsh/distinfo
index 845fc291df7f..7a0e68081d64 100644
--- a/shells/xonsh/distinfo
+++ b/shells/xonsh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765482511
-SHA256 (xonsh-0.21.2.tar.gz) = 85bdc5577e22f587b3a3be7b5789335dbf9efb25e2f5f9d7a518eb7db39307aa
-SIZE (xonsh-0.21.2.tar.gz) = 818375
+TIMESTAMP = 1766182822
+SHA256 (xonsh-0.22.0.tar.gz) = e4bd25a1d6be698444634212029109cefedccc3a6a85f2bacfde33bfd5461488
+SIZE (xonsh-0.22.0.tar.gz) = 820314