diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 9561b0732f0e..9cfee3062cb9 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -4,18 +4,16 @@ CATEGORIES=	shells python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	roberfern@gmail.com
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python-ish BASH-wards shell
-WWW=		https://xon.sh
+WWW=		https://xon.sh/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${PY_FLAVOR}
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-USES=		python
-USE_PYTHON=	distutils autoplist concurrent
-
 .include <bsd.port.mk>
diff --git a/shells/xonsh/pkg-descr b/shells/xonsh/pkg-descr
index 5882b8ef6465..e828cff901a3 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 (pronounced conch) 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 that you are used to from Bash and IPython. Xonsh is
+meant for the daily use of experts and novices.
 
-The language is a superset of Python 3.4+ with additional shell primitives.
-xonsh (pronounced conch) is meant for the daily use of experts and novices
-alike.
+See also: https://github.com/xonsh/xonsh