diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 0535b4837434..e6462ea99a21 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -1,21 +1,34 @@
 PORTNAME=	xonsh
-PORTVERSION=	0.11.0
+DISTVERSION=	0.15.1
 CATEGORIES=	shells python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Python-ish BASH-wards shell
+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}amalgamate>=0:devel/py-amalgamate@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61: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}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyte>0:devel/py-pyte@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-subprocess>0:devel/py-pytest-subprocess@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
-NO_ARCH=	yes
+USES=		python shebangfix
+USE_PYTHON=	autoplist concurrent pep517 pytest
+PYTEST_BROKEN_TESTS=	test_builtins.py test_commands_cache.py \
+			test_integrations.py test_main.py test_man.py \
+			test_ptk_highlight.py test_virtualenv_activator.py
+SHEBANG_FILES=	tests/bin/cat tests/bin/pwd tests/bin/wc
+#TESTS WIP
 
-USES=		python
-USE_PYTHON=	distutils autoplist concurrent
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/shells/xonsh/distinfo b/shells/xonsh/distinfo
index 337821f65c13..0c92d0509f9b 100644
--- a/shells/xonsh/distinfo
+++ b/shells/xonsh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648316889
-SHA256 (xonsh-0.11.0.tar.gz) = 0d9c3d9a4e8b8199ae697fbc9d1e0ae55085cdbdd4306d04813350996f9c15dc
-SIZE (xonsh-0.11.0.tar.gz) = 1027609
+TIMESTAMP = 1713250586
+SHA256 (xonsh-0.15.1.tar.gz) = 34a6332b7a86f6fe86a74273585c59ab1f3c89292fda5a9eafe54c926bac4710
+SIZE (xonsh-0.15.1.tar.gz) = 768629
diff --git a/shells/xonsh/pkg-descr b/shells/xonsh/pkg-descr
index 5882b8ef6465..2dd6e8f57852 100644
--- a/shells/xonsh/pkg-descr
+++ b/shells/xonsh/pkg-descr
@@ -1,5 +1,6 @@
-xonsh is a Python-ish, BASHwards-looking shell language and command prompt.
+xonsh is a Python-powered, cross-platform, Unix-gazing shell language and
+command prompt.
 
-The language is a superset of Python 3.4+ with additional shell primitives.
+The language is a superset of Python 3.6+ with additional shell primitives.
 xonsh (pronounced conch) is meant for the daily use of experts and novices
 alike.