diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 6a684ad2258c..e28d0978797f 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	xonsh
 DISTVERSION=	0.23.2
+PORTREVISION=	1
 CATEGORIES=	shells python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	eduardo@FreeBSD.org
-COMMENT=	Python-powered, cross-platform, Unix-gazing shell
+COMMENT=	Xonsh is a Python-powered 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_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_pipelines.py \
 		test_ptk_highlight.py \
 		test_stress.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/xintegration/test_integrations.py \
 		${WRKSRC}/tests/test_virtualenv_activator.py
 
 .include <bsd.port.mk>
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.