diff --git a/README.rst b/README.rst
index 959a5f68..f63feb8d 100644
--- a/README.rst
+++ b/README.rst
@@ -52,6 +52,7 @@ Jedi can currently be used with the following editors/projects:
 - wdb_ - Web Debugger
 - `Eric IDE`_ (Available as a plugin)
 - `IPython 6.0.0+ <https://ipython.readthedocs.io/en/stable/whatsnew/version6.html>`_
+- `xonsh shell <https://xon.sh/contents.html>`_ has `jedi extension <https://xon.sh/xontribs.html#jedi>`_
 
 and many more!
 
diff --git a/docs/docs/usage.rst b/docs/docs/usage.rst
index 84b0078e..2ef8b848 100644
--- a/docs/docs/usage.rst
+++ b/docs/docs/usage.rst
@@ -93,6 +93,16 @@ Web Debugger
 
 - wdb_
 
+xonsh shell
+~~~~~~~~~~~
+
+Jedi is a preinstalled extension in `xonsh shell <https://xon.sh/contents.html>`_. 
+Run the following command to enable:
+
+::
+
+    xontrib load jedi
+
 and many more!
 
 .. _repl-completion: