diff --git a/README.md b/README.md
index 866e4338..db34feb8 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # mautrix-facebook
-![Languages](https://img.shields.io/github/languages/top/tulir/mautrix-facebook.svg)
-[![License](https://img.shields.io/github/license/tulir/mautrix-facebook.svg)](LICENSE)
-[![Release](https://img.shields.io/github/release/tulir/mautrix-facebook/all.svg)](https://github.com/tulir/mautrix-facebook/releases)
-[![GitLab CI](https://mau.dev/tulir/mautrix-facebook/badges/master/pipeline.svg)](https://mau.dev/tulir/mautrix-facebook/container_registry)
+![Languages](https://img.shields.io/github/languages/top/mautrix/facebook.svg)
+[![License](https://img.shields.io/github/license/mautrix/facebook.svg)](LICENSE)
+[![Release](https://img.shields.io/github/release/mautrix/facebook/all.svg)](https://github.com/mautrix/facebook/releases)
+[![GitLab CI](https://mau.dev/mautrix/facebook/badges/master/pipeline.svg)](https://mau.dev/mautrix/facebook/container_registry)
 
 A Matrix-Facebook Messenger puppeting bridge.
 
@@ -16,7 +16,7 @@ Some quick links:
 * Basic usage: [Authentication](https://docs.mau.fi/bridges/python/facebook/authentication.html)
 
 ### Features & Roadmap
-[ROADMAP.md](https://github.com/tulir/mautrix-facebook/blob/master/ROADMAP.md)
+[ROADMAP.md](https://github.com/mautrix/facebook/blob/master/ROADMAP.md)
 contains a general overview of what is supported by the bridge.
 
 ## Discussion
diff --git a/mautrix_facebook/__main__.py b/mautrix_facebook/__main__.py
index c3ab1f58..ec2a8c6c 100644
--- a/mautrix_facebook/__main__.py
+++ b/mautrix_facebook/__main__.py
@@ -37,7 +37,7 @@ class MessengerBridge(Bridge):
     module = "mautrix_facebook"
     command = "python -m mautrix-facebook"
     description = "A Matrix-Facebook Messenger puppeting bridge."
-    repo_url = "https://github.com/tulir/mautrix-facebook"
+    repo_url = "https://github.com/mautrix/facebook"
     real_user_content_key = "net.maunium.facebook.puppet"
     version = version
     markdown_version = linkified_version
diff --git a/mautrix_facebook/get_version.py b/mautrix_facebook/get_version.py
index 78322590..5ab0609d 100644
--- a/mautrix_facebook/get_version.py
+++ b/mautrix_facebook/get_version.py
@@ -18,7 +18,7 @@ def run(cmd):
 if os.path.exists(".git") and shutil.which("git"):
     try:
         git_revision = run(["git", "rev-parse", "HEAD"]).strip().decode("ascii")
-        git_revision_url = f"https://github.com/tulir/mautrix-facebook/commit/{git_revision}"
+        git_revision_url = f"https://github.com/mautrix/facebook/commit/{git_revision}"
         git_revision = git_revision[:8]
     except (subprocess.SubprocessError, OSError):
         git_revision = "unknown"
@@ -33,7 +33,7 @@ def run(cmd):
     git_revision_url = None
     git_tag = None
 
-git_tag_url = (f"https://github.com/tulir/mautrix-facebook/releases/tag/{git_tag}"
+git_tag_url = (f"https://github.com/mautrix/facebook/releases/tag/{git_tag}"
                if git_tag else None)
 
 if git_tag and __version__ == git_tag[1:].replace("-", ""):
diff --git a/mautrix_facebook/web/static/login/crypto.js b/mautrix_facebook/web/static/login/crypto.js
index 158ac7fe..871a2937 100644
--- a/mautrix_facebook/web/static/login/crypto.js
+++ b/mautrix_facebook/web/static/login/crypto.js
@@ -63,7 +63,7 @@ function getKey(pem) {
 // encryptPassword encrypts a login password using AES-256-GCM, then encrypts the AES key
 // for Facebook's RSA-2048 key using PKCS#1 v1.5 padding.
 //
-// See https://github.com/tulir/mautrix-facebook/blob/v0.2.0/maufbapi/http/login.py#L164-L192
+// See https://github.com/mautrix/facebook/blob/v0.3.0/maufbapi/http/login.py#L164-L192
 // for the Python implementation of the same encryption protocol.
 async function encryptPassword(pubkey, keyID, password) {
 	// Key and IV for AES encryption
diff --git a/setup.py b/setup.py
index ad45ff51..950ac489 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@
 setuptools.setup(
     name="mautrix-facebook",
     version=version,
-    url="https://github.com/tulir/mautrix-facebook",
+    url="https://github.com/mautrix/facebook",
 
     author="Tulir Asokan",
     author_email="tulir@maunium.net",