diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 86cd7233f302..bbc5c63d9c50 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -1,52 +1,39 @@
 PORTNAME=	xonsh
-DISTVERSION=	0.22.8
+DISTVERSION=	0.23.4
 CATEGORIES=	shells python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	eduardo@FreeBSD.org
-COMMENT=	Python-powered, cross-platform, Unix-gazing shell
+COMMENT=	Python-powered shell
 WWW=		https://xon.sh
 
 LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/license
+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}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
+		${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
+USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
-PYTEST_BROKEN_TESTS=	\
-		test_bash_completer.py \
-		test_command_completers.py \
-		test_commands_cache.py \
-		test_dir_completers.py \
-		test_integrations.py \
-		test_man.py \
-		test_os.xsh \
-		test_ptk_highlight.py \
-		test_specs.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
+do-test:
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest
 
 .include <bsd.port.mk>
diff --git a/shells/xonsh/distinfo b/shells/xonsh/distinfo
index cd669a6121e8..a244e1c87b4c 100644
--- a/shells/xonsh/distinfo
+++ b/shells/xonsh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1773873998
-SHA256 (xonsh-0.22.8.tar.gz) = 5eedf7822f1655eb4f29a7c3916b0dcc7b8fe548b4b83001afe79f3bd39be28c
-SIZE (xonsh-0.22.8.tar.gz) = 830111
+TIMESTAMP = 1777826936
+SHA256 (xonsh-0.23.4.tar.gz) = 05e60bbc9f2234f6482a96bfa8d936deb45c915e3f3fcfdc3056bfe32aa8d1cf
+SIZE (xonsh-0.23.4.tar.gz) = 1082073
diff --git a/shells/xonsh/files/patch-xonsh_platform.py b/shells/xonsh/files/patch-xonsh_platform.py
deleted file mode 100644
index e96ffdf8a317..000000000000
--- a/shells/xonsh/files/patch-xonsh_platform.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- xonsh/platform.py.orig	2026-02-04 16:49:54 UTC
-+++ xonsh/platform.py
-@@ -576,7 +576,7 @@ def LIBC():
-             libc = None
-     elif ON_BSD:
-         try:
--            libc = ctypes.CDLL("libc.so")
-+            libc = ctypes.CDLL(ctypes.util.find_library("c"))
-         except AttributeError:
-             libc = None
-         except OSError:
diff --git a/shells/xonsh/pkg-descr b/shells/xonsh/pkg-descr
index 2dd6e8f57852..5862b0f6f953 100644
--- a/shells/xonsh/pkg-descr
+++ b/shells/xonsh/pkg-descr
@@ -1,6 +1,3 @@
-xonsh is a Python-powered, cross-platform, Unix-gazing shell language and
-command prompt.
-
-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.
+Xonsh (sounds like "consh") is a full-featured and cross-platform Python-based
+shell. The language is a superset of Python 3 with seamless integration of
+shell functionality and commands.