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 3a030145..1c97ed68 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -426,7 +426,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 16a85975..9e7ff1fb 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/installation/index.rst b/docs/installation/index.rst
index 580ecd6d..3f0600f4 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -103,7 +103,7 @@ ckeckout::
 
     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/
     python mopidy                                   # Yes, 'mopidy' is a dir
 
diff --git a/mopidy/backends/libspotify/__init__.py b/mopidy/backends/libspotify/__init__.py
index 4d8b67d5..ad2926c7 100644
--- a/mopidy/backends/libspotify/__init__.py
+++ b/mopidy/backends/libspotify/__init__.py
@@ -15,7 +15,8 @@ class LibspotifyBackend(Backend):
     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 532c3976..e3e1d5dc 100644
--- a/mopidy/backends/local/__init__.py
+++ b/mopidy/backends/local/__init__.py
@@ -20,7 +20,7 @@ class LocalBackend(Backend):
     """
     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:**