diff --git a/docs/index.rst b/docs/index.rst
index db33131a2..6e7efd56f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -259,14 +259,14 @@ Helpful Links
 =============
 
 * `Documentation <http://xon.sh>`_
-* `Gitter <https://gitter.im/scopatz/xonsh>`_
+* `Gitter <https://gitter.im/xonsh/xonsh>`_
 * `Mailing list <https://groups.google.com/forum/#!forum/xonsh>`_
 * `IRC: channel #xonsh on OFTC <http://www.oftc.net/>`_
-* `GitHub Repository <https://github.com/scopatz/xonsh>`_
+* `GitHub Repository <https://github.com/xonsh/xonsh>`_
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
 
 .. raw:: html
 
-    <a href="https://github.com/scopatz/xonsh"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"></a>
+    <a href="https://github.com/xonsh/xonsh"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"></a>
diff --git a/docs/linux.rst b/docs/linux.rst
index 60a06264c..882c45b1c 100644
--- a/docs/linux.rst
+++ b/docs/linux.rst
@@ -24,8 +24,8 @@ You can install xonsh using ``conda``, ``pip``, or from source.
     $ pip install xonsh
 
 
-**source:** Download the source `from github <https://github.com/scopatz/xonsh>`_
-(`zip file <https://github.com/scopatz/xonsh/archive/master.zip>`_), then run
+**source:** Download the source `from github <https://github.com/xonsh/xonsh>`_
+(`zip file <https://github.com/xonsh/xonsh/archive/master.zip>`_), then run
 the following from the source directory,
 
 .. code-block:: bash
diff --git a/docs/osx.rst b/docs/osx.rst
index ee793c393..41b6ace58 100644
--- a/docs/osx.rst
+++ b/docs/osx.rst
@@ -31,8 +31,8 @@ You can install xonsh using homebrew, conda, pip, or from source.
     $ pip install xonsh
 
 
-**source:** Download the source `from github <https://github.com/scopatz/xonsh>`_
-(`zip file <https://github.com/scopatz/xonsh/archive/master.zip>`_), then run
+**source:** Download the source `from github <https://github.com/xonsh/xonsh>`_
+(`zip file <https://github.com/xonsh/xonsh/archive/master.zip>`_), then run
 the following from the source directory,
 
 .. code-block:: bash
diff --git a/docs/previous/index.rst b/docs/previous/index.rst
index 3c5d9688d..f3231fece 100644
--- a/docs/previous/index.rst
+++ b/docs/previous/index.rst
@@ -19,8 +19,8 @@ Version Date       Zip            Tar
 0.1.0   2015-03-09 `zip 0.1`_     `tar 0.1`_
 ======= ========== ============== ==============
 
-.. _zip 0.2: https://github.com/scopatz/xonsh/zipball/0.2
-.. _tar 0.2: https://github.com/scopatz/xonsh/tarball/0.2
-.. _zip 0.1: https://github.com/scopatz/xonsh/zipball/0.1
-.. _tar 0.1: https://github.com/scopatz/xonsh/tarball/0.1
+.. _zip 0.2: https://github.com/xonsh/xonsh/zipball/0.2
+.. _tar 0.2: https://github.com/xonsh/xonsh/tarball/0.2
+.. _zip 0.1: https://github.com/xonsh/xonsh/zipball/0.1
+.. _tar 0.1: https://github.com/xonsh/xonsh/tarball/0.1
 
diff --git a/docs/tutorial_xontrib.rst b/docs/tutorial_xontrib.rst
index d78672815..fdd0a952e 100644
--- a/docs/tutorial_xontrib.rst
+++ b/docs/tutorial_xontrib.rst
@@ -180,7 +180,7 @@ Of course, your under no obligation to register your xontrib.  Users will
 still be able to load your xontrib, as long as they have it installed.
 
 To register a xontrib, add an entry to
-`the xontribs.json file <https://github.com/scopatz/xonsh/blob/master/xonsh/xontribs.json>`_
+`the xontribs.json file <https://github.com/xonsh/xonsh/blob/master/xonsh/xontribs.json>`_
 in the main xonsh repository.  A pull request is probably best, but if you
 are having trouble figuring it out please contact one of the xonsh devs
 with the relevant information.
diff --git a/docs/windows.rst b/docs/windows.rst
index e3b0b39a3..fc2e545b7 100644
--- a/docs/windows.rst
+++ b/docs/windows.rst
@@ -67,7 +67,7 @@ Next, run xonsh:
   snail@home ~ $
 
 .. _Python v3.4+: https://www.python.org/downloads/windows/
-.. _xonsh-master.zip: https://github.com/scopatz/xonsh/archive/master.zip
+.. _xonsh-master.zip: https://github.com/xonsh/xonsh/archive/master.zip
 .. _cmder: http://cmder.net/
 .. _conemu: https://conemu.github.io/
 
diff --git a/setup.py b/setup.py
index a202d564b..ea37b6621 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 # -*- coding: ascii -*-
 """The xonsh installer."""
 # Note: Do not embed any non-ASCII characters in this file until pip has been
-# fixed. See https://github.com/scopatz/xonsh/issues/487.
+# fixed. See https://github.com/xonsh/xonsh/issues/487.
 from __future__ import print_function, unicode_literals
 import os
 import sys
@@ -246,7 +246,7 @@ def main():
         author='Anthony Scopatz',
         maintainer='Anthony Scopatz',
         author_email='scopatz@gmail.com',
-        url='https://github.com/scopatz/xonsh',
+        url='https://github.com/xonsh/xonsh',
         platforms='Cross Platform',
         classifiers=['Programming Language :: Python :: 3'],
         packages=['xonsh', 'xonsh.ply', 'xonsh.ptk', 'xonsh.parsers',
diff --git a/xonsh/aliases.py b/xonsh/aliases.py
index d244bfc44..f3bbccb0d 100644
--- a/xonsh/aliases.py
+++ b/xonsh/aliases.py
@@ -339,7 +339,7 @@ class AWitchAWitch(Action):
 
     def __call__(self, parser, namespace, values, option_string=None):
         import webbrowser
-        webbrowser.open('https://github.com/scopatz/xonsh/commit/f49b400')
+        webbrowser.open('https://github.com/xonsh/xonsh/commit/f49b400')
         parser.exit()