diff --git a/README.rst b/README.rst
index dfdb9e1c4..2dd2c62f1 100644
--- a/README.rst
+++ b/README.rst
@@ -7,18 +7,18 @@ Spalloc: SpiNNaker machine allocation client
 .. image:: https://readthedocs.org/projects/spalloc/badge/?version=stable
    :alt: Documentation
    :target: http://spalloc.readthedocs.org/
-.. image:: https://travis-ci.org/project-rig/spalloc.svg?branch=master
+.. image:: https://travis-ci.org/SpiNNakerManchester/spalloc.svg?branch=master
    :alt: Build Status
-   :target: https://travis-ci.org/project-rig/spalloc
-.. image:: https://coveralls.io/repos/project-rig/spalloc/badge.svg?branch=master
+   :target: https://travis-ci.org/SpiNNakerManchester/spalloc
+.. image:: https://coveralls.io/repos/SpiNNakerManchester/spalloc/badge.svg?branch=master
    :alt: Coverage Status
-   :target: https://coveralls.io/r/project-rig/spalloc?branch=master
+   :target: https://coveralls.io/r/SpiNNakerManchester/spalloc?branch=master
 
 Spalloc is a Python library and set of command-line programs for requesting
 SpiNNaker_ machines from a spalloc `server`_.
 
 .. _SpiNNaker: http://apt.cs.manchester.ac.uk/projects/SpiNNaker/
-.. _server: https://github.com/project-rig/spalloc_server
+.. _server: https://github.com/SpiNNakerManchester/spalloc_server
 
 To get started, see the quick-start below or refer to the documentation_.
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index d33135043..19d4335f2 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -142,7 +142,7 @@ def __getattr__(cls, name):
 
 local_module_path = spalloc.__file__
 github_module_path = "spalloc/"
-github_repo = "project-rig/spalloc"
+github_repo = "SpiNNakerManchester/spalloc"
 
 def linkcode_resolve(domain, info):
     """Determine the URL corresponding to Python object on GitHub
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 3b19783ca..21fd4323e 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -5,7 +5,7 @@ Spalloc is a Python library and set of command-line programs for requesting
 SpiNNaker_ machines from a spalloc `server`_.
 
 .. _SpiNNaker: http://apt.cs.manchester.ac.uk/projects/SpiNNaker/
-.. _server: https://github.com/project-rig/spalloc_server
+.. _server: https://github.com/SpiNNakerManchester/spalloc_server
 
 
 Quick-start
@@ -57,7 +57,7 @@ three-board machine::
     exiting the ``with`` block in the Python version) will automatically shut
     them down and allow them to be used by others.
 
-.. _Rig: https://github.com/project-rig/rig
+.. _Rig: https://github.com/SpiNNakerManchester/rig
 
 Configuration file format and defaults
 --------------------------------------
diff --git a/setup.py b/setup.py
index 2cceec800..183ce69d1 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
     packages=find_packages(),
 
     # Metadata for PyPi
-    url="https://github.com/project-rig/spalloc",
+    url="https://github.com/SpiNNakerManchester/spalloc",
     author="Jonathan Heathcote",
     description="A client for the spalloc_server SpiNNaker machine partitioning and allocation system.",
     license="GPLv2",