diff --git a/README b/README
index fb3fce35..3b292a58 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 
 Python client API library made especially for [MAAS][].
 
-[![CI tests](https://github.com/maas/python-libmaas/workflows/CI%20tests/badge.svg)](https://github.com/maas/python-libmaas/actions?query=workflow%3A%22CI+tests%22)
-[![codecov.io](https://codecov.io/github/maas/python-libmaas/coverage.svg?branch=master)](https://codecov.io/github/maas/python-libmaas?branch=master)
+[![CI tests](https://github.com/canonical/python-libmaas/workflows/CI%20tests/badge.svg)](https://github.com/canonical/python-libmaas/actions?query=workflow%3A%22CI+tests%22)
+[![codecov.io](https://codecov.io/github/canonical/python-libmaas/coverage.svg?branch=master)](https://codecov.io/github/maas/python-libmaas?branch=master)
 
 
 ## Installation
@@ -14,7 +14,7 @@ with [pip](https://pip.pypa.io/). Python 3.5+ is required.
 When working from master it can be helpful to use a virtualenv:
 
     $ python3 -m venv ve && source ve/bin/activate
-    $ pip install git+https://github.com/maas/python-libmaas.git
+    $ pip install git+https://github.com/canonical/python-libmaas.git
     $ maas --help
 
 Releases are periodically made to [PyPI](https://pypi.python.org/) but,
diff --git a/debian/control b/debian/control
index daaebe58..40fe1c62 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Andres Rodriguez <andreserl@ubuntu.com>
 Build-Depends: debhelper (>= 10), dh-python, python3-all, python3-setuptools
 Standards-Version: 4.1.3
-Homepage: https://github.com/maas/python-libmaas
+Homepage: https://github.com/canonical/python-libmaas
 X-Python3-Version: >= 3.2
 
 Package: python3-libmaas
diff --git a/debian/copyright b/debian/copyright
index 9d516845..8af8f6a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-libmaas
-Source: https://github.com/maas/python-libmaas
+Source: https://github.com/canonical/python-libmaas
 
 Files: *
 Copyright: 2017-2018 Canonical Ltd.
diff --git a/debian/watch b/debian/watch
index 78f8221f..929cbb7a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -6,5 +6,5 @@ version=4
 
 # GitHub hosted projects
 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%python-libmaas-$1.tar.gz%" \
-   https://github.com/maas/python-libmaas/tags \
+   https://github.com/canonical/python-libmaas/tags \
    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
diff --git a/doc.yaml b/doc.yaml
index 531676a3..d39de881 100644
--- a/doc.yaml
+++ b/doc.yaml
@@ -3,7 +3,7 @@ markdown_extensions:
   - codehilite
   - sane_lists
   - smarty
-repo_url: https://github.com/maas/python-libmaas
+repo_url: https://github.com/canonical/python-libmaas
 site_name: MAAS Client Library & CLI
 strict: true
 theme: readthedocs
diff --git a/doc/index.md b/doc/index.md
index 9720c9c5..5813d83e 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -27,7 +27,7 @@ until we release a beta all APIs could change.
 Either work from a branch:
 
 ```console
-$ git clone https://github.com/maas/python-libmaas.git
+$ git clone https://github.com/canonical/python-libmaas.git
 $ cd python-libmaas
 $ make
 ```
@@ -37,7 +37,7 @@ Or install with [pip](https://pip.pypa.io/) into a
 
 ```console
 $ virtualenv --python=python3 amc && source amc/bin/activate
-$ pip install git+https://github.com/maas/python-libmaas.git
+$ pip install git+https://github.com/canonical/python-libmaas.git
 ```
 
 Or install from [PyPI](https://pypi.python.org/):
diff --git a/maas/client/viscera/tests/test_machines.py b/maas/client/viscera/tests/test_machines.py
index 37487741..939afcc6 100644
--- a/maas/client/viscera/tests/test_machines.py
+++ b/maas/client/viscera/tests/test_machines.py
@@ -203,7 +203,7 @@ def test__commission_with_wait_failed(self):
         )
 
     def test__commission_with_no_tests(self):
-        # Regression test for https://github.com/maas/python-libmaas/issues/185
+        # Regression test for https://github.com/canonical/python-libmaas/issues/185
         system_id = make_name_without_spaces("system-id")
         hostname = make_name_without_spaces("hostname")
         data = {
diff --git a/maas/client/viscera/tests/test_vlans.py b/maas/client/viscera/tests/test_vlans.py
index 9bf4c699..750e7081 100644
--- a/maas/client/viscera/tests/test_vlans.py
+++ b/maas/client/viscera/tests/test_vlans.py
@@ -220,7 +220,7 @@ def test__vlan_update_relay_vlan_with_object(self):
         self.assertThat(vlan.relay_vlan.id, Equals(relay_vlan.id))
 
     def test__vlan_update_relay_vlan_with_integer_id(self):
-        self.skip("see https://github.com/maas/python-libmaas/issues/180")
+        self.skip("see https://github.com/canonical/python-libmaas/issues/180")
         origin = make_origin()
         Vlan = origin.Vlan
         Vlan._handler.params = ["fabric_id", "vid"]
diff --git a/setup.py b/setup.py
index 70784830..071f10e9 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def read(filename):
     name='python-libmaas',
     author='MAAS Developers',
     author_email='maas-devel@lists.launchpad.net',
-    url='https://github.com/maas/python-libmaas',
+    url='https://github.com/canonical/python-libmaas',
     version="0.6.8",
     classifiers=[
         'Development Status :: 3 - Alpha',