diff --git a/README.rst b/README.rst
index c6187119..4f31fb59 100644
--- a/README.rst
+++ b/README.rst
@@ -13,7 +13,7 @@ To install Mopidy, check out
 
 * `Documentation (latest release) <http://www.mopidy.com/docs/master/>`_
 * `Documentation (development version) <http://www.mopidy.com/docs/develop/>`_
-* `Source code <http://github.com/jodal/mopidy>`_
-* `Issue tracker <http://github.com/jodal/mopidy/issues>`_
+* `Source code <http://github.com/mopidy/mopidy>`_
+* `Issue tracker <http://github.com/mopidy/mopidy/issues>`_
 * IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
-* `Download development snapshot <http://github.com/jodal/mopidy/tarball/develop#egg=mopidy-dev>`_
+* `Download development snapshot <http://github.com/mopidy/mopidy/tarball/develop#egg=mopidy-dev>`_
diff --git a/docs/changes.rst b/docs/changes.rst
index eadf8e75..9e895419 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -351,7 +351,7 @@ Mopidy is working and usable. 0.1.0a0 is an alpha release, which basicly means
 we will still change APIs, add features, etc. before the final 0.1.0 release.
 But the software is usable as is, so we release it. Please give it a try and
 give us feedback, either at our IRC channel or through the `issue tracker
-<http://github.com/jodal/mopidy/issues>`_. Thanks!
+<http://github.com/mopidy/mopidy/issues>`_. Thanks!
 
 **Changes**
 
diff --git a/docs/conf.py b/docs/conf.py
index d0d8f3af..bb9eb3ba 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -202,4 +202,4 @@ latex_documents = [
 
 needs_sphinx = '1.0'
 
-extlinks = {'issue': ('http://github.com/jodal/mopidy/issues#issue/%s', 'GH-')}
+extlinks = {'issue': ('http://github.com/mopidy/mopidy/issues#issue/%s', 'GH-')}
diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst
index 4adde637..a9cd8dc3 100644
--- a/docs/development/contributing.rst
+++ b/docs/development/contributing.rst
@@ -137,7 +137,7 @@ Then, to generate docs::
 .. note::
 
     The documentation at http://www.mopidy.com/ is automatically updated when a
-    documentation update is pushed to ``jodal/mopidy`` at GitHub.
+    documentation update is pushed to ``mopidy/mopidy`` at GitHub.
 
     Documentation generated from the ``master`` branch is published at
     http://www.mopidy.com/docs/master/, and will always be valid for the latest
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 9577c383..c3bbddce 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -88,7 +88,7 @@ development version of Mopidy::
 
     sudo aptitude install git-core                  # On Ubuntu/Debian
     sudo brew install git                           # On OS X
-    git clone git://github.com/jodal/mopidy.git
+    git clone git://github.com/mopidy/mopidy.git
     cd mopidy/
     sudo python setup.py install
 
diff --git a/mopidy/backends/libspotify/__init__.py b/mopidy/backends/libspotify/__init__.py
index 223d9968..f4087043 100644
--- a/mopidy/backends/libspotify/__init__.py
+++ b/mopidy/backends/libspotify/__init__.py
@@ -14,7 +14,8 @@ class LibspotifyBackend(BaseBackend):
     library and the `pyspotify <http://github.com/winjer/pyspotify/>`_ Python
     bindings for libspotify.
 
-    **Issues:** http://github.com/jodal/mopidy/issues/labels/backend-libspotify
+    **Issues:**
+    http://github.com/mopidy/mopidy/issues/labels/backend-libspotify
 
     **Settings:**
 
diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py
index e5bfe8f8..bb5e6a5e 100644
--- a/mopidy/backends/local/__init__.py
+++ b/mopidy/backends/local/__init__.py
@@ -17,7 +17,7 @@ class LocalBackend(BaseBackend):
     """
     A backend for playing music from a local music archive.
 
-    **Issues:** http://github.com/jodal/mopidy/issues/labels/backend-local
+    **Issues:** http://github.com/mopidy/mopidy/issues/labels/backend-local
 
     **Settings:**
 
diff --git a/tests/frontends/mpd/regression_test.py b/tests/frontends/mpd/regression_test.py
index 3cfdb855..7e7163d8 100644
--- a/tests/frontends/mpd/regression_test.py
+++ b/tests/frontends/mpd/regression_test.py
@@ -8,7 +8,7 @@ from mopidy.models import Track
 
 class IssueGH17RegressionTest(unittest.TestCase):
     """
-    The issue: http://github.com/jodal/mopidy/issues#issue/17
+    The issue: http://github.com/mopidy/mopidy/issues#issue/17
 
     How to reproduce:
 
@@ -42,7 +42,7 @@ class IssueGH17RegressionTest(unittest.TestCase):
 
 class IssueGH18RegressionTest(unittest.TestCase):
     """
-    The issue: http://github.com/jodal/mopidy/issues#issue/18
+    The issue: http://github.com/mopidy/mopidy/issues#issue/18
 
     How to reproduce:
 
@@ -79,7 +79,7 @@ class IssueGH18RegressionTest(unittest.TestCase):
 
 class IssueGH22RegressionTest(unittest.TestCase):
     """
-    The issue: http://github.com/jodal/mopidy/issues/#issue/22
+    The issue: http://github.com/mopidy/mopidy/issues/#issue/22
 
     How to reproduce: