diff --git a/README.rst b/README.rst
index 5dcaaab16..74cc05a0a 100644
--- a/README.rst
+++ b/README.rst
@@ -16,4 +16,4 @@ 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.
 
-Please visit http://xonsh.org for more information.
+Please visit http://xon.sh for more information.
diff --git a/docs/index.rst b/docs/index.rst
index 7fdafbddb..490896bf4 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -278,7 +278,7 @@ open an issue on GitHub.
 Helpful Links
 =============
 
-* `Documentation <http://xonsh.org>`_
+* `Documentation <http://xon.sh>`_
 * `Mailing list <https://groups.google.com/forum/#!forum/xonsh>`_
 * `GitHub Repository <https://github.com/scopatz/xonsh>`_
 * `IRC: channel #xonsh on OFTC <http://www.oftc.net/>`_
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 867fe75b8..04e1f786d 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -23,7 +23,7 @@ Let's dive in!
 
 Starting xonsh
 ========================
-Assuming you have successfully installed xonsh (see http://xonsh.org),
+Assuming you have successfully installed xonsh (see http://xon.sh),
 you can start up the xonsh interpreter via the ``xonsh`` command. Suppose
 you are in a lesser terminal:
 
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 061abe2df..a7e32c1b8 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -23,9 +23,9 @@ requirements:
     - setproctitle
 
 about:
-  home: http://xonsh.org/
+  home: http://xon.sh/
   license: BSD
-  summary: xonsh is a Python-ish, BASHwards-compatible shell.
+  summary: xonsh is a Python-ish, BASHwards-facing shell.
 
 # Removed temporarily until this is better support by the Anaconda launcher
 #app:
diff --git a/xonsh/environ.py b/xonsh/environ.py
index 9e8f7244e..e7b88871e 100644
--- a/xonsh/environ.py
+++ b/xonsh/environ.py
@@ -285,7 +285,7 @@ DEFAULT_DOCS = {
     'FORMATTER_DICT': VarDocs(
         'Dictionary containing variables to be used when formatting $PROMPT '
         "and $TITLE. See 'Customizing the Prompt' "
-        'http://xonsh.org/tutorial.html#customizing-the-prompt', 
+        'http://xon.sh/tutorial.html#customizing-the-prompt', 
         configurable=False, default='xonsh.environ.FORMATTER_DICT'),
     'HISTCONTROL': VarDocs(
         'A set of strings (comma-separated list in string form) of options '
@@ -320,7 +320,7 @@ DEFAULT_DOCS = {
     'PROMPT': VarDocs(
         'The prompt text. May contain keyword arguments which are '
         "auto-formatted, see 'Customizing the Prompt' at "
-        'http://xonsh.org/tutorial.html#customizing-the-prompt.',
+        'http://xon.sh/tutorial.html#customizing-the-prompt.',
         default='xonsh.environ.DEFAULT_PROMPT'),
     'PROMPT_TOOLKIT_COLORS': VarDocs(
         'This is a mapping of from color names to HTML color codes. Whenever '
@@ -380,7 +380,7 @@ DEFAULT_DOCS = {
     'TITLE': VarDocs(
         'The title text for the window in which xonsh is running. Formatted '
         "in the same manner as $PROMPT, see 'Customizing the Prompt' "
-        'http://xonsh.org/tutorial.html#customizing-the-prompt.',
+        'http://xon.sh/tutorial.html#customizing-the-prompt.',
         default='xonsh.environ.DEFAULT_TITLE'),
     'VI_MODE': VarDocs(
         "Flag to enable 'vi_mode' in the 'prompt_toolkit' shell."),