Index: shells/Makefile
===================================================================
--- shells/Makefile
+++ shells/Makefile
@@ -44,6 +44,7 @@
     SUBDIR += viewglob
     SUBDIR += vshnu
     SUBDIR += wcd
+    SUBDIR += xonsh
     SUBDIR += zsh
     SUBDIR += zsh-navigation-tools
 
Index: shells/xonsh/Makefile
===================================================================
--- /dev/null
+++ shells/xonsh/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME=	xonsh
+PORTVERSION=	0.4.7
+CATEGORIES=	shells
+
+MAINTAINER=	roberfern@gmail.com
+COMMENT=	Python-ish BASH-wards shell
+
+USE_GITHUB=	yes
+
+USES=		python:3.4
+USE_PYTHON=	distutils autoplist
+
+.include <bsd.port.mk>
+
Index: shells/xonsh/distinfo
===================================================================
--- /dev/null
+++ shells/xonsh/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1478601458
+SHA256 (xonsh-xonsh-0.4.7_GH0.tar.gz) = 10732db7a635b94454232f389f1960a27736e63bb3ce7daf6dc59fda7d5f5abb
+SIZE (xonsh-xonsh-0.4.7_GH0.tar.gz) = 1596008
Index: shells/xonsh/pkg-descr
===================================================================
--- /dev/null
+++ shells/xonsh/pkg-descr
@@ -0,0 +1,6 @@
+xonsh is a Python-ish, BASHwards-looking shell language and command prompt.
+
+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.
+
+WWW: http://xon.sh
Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile
+++ x11-servers/xorg-server/Makefile
@@ -51,7 +51,7 @@
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace --disable-xephyr \
 		--enable-record=yes --disable-dri3 --disable-xwayland \
-		--enable-glamor
+		--enable-glamor --enable-listen-tcp
 INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == "no"