diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index b9b5bbb..d66d165 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -9,7 +9,7 @@
       "created": "2016",
       "official": "https://joinmastodon.org",
       "license": "AGPL-3.0",
-      "repo": "https://github.com/tootsuite/mastodon",
+      "repo": "https://github.com/mastodon/mastodon",
       "language": "Ruby",
       "protocols":
         [
@@ -22,7 +22,7 @@
           {"num": "2", "url": "/en/portal/servers"},
           {"num": "3", "url": "https://instances.social"}
         ],
-      "mobile": "https://web.archive.org/web/20191114114235/https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md",
+      "mobile": "https://web.archive.org/web/20191114114235/https://github.com/mastodon/documentation/blob/master/Using-Mastodon/Apps.md",
       "forUsers":
         [
           {"id": "0", "url": "https://pinafore.social"},
@@ -35,7 +35,7 @@
           {"id": "0", "url": "https://alexschroeder.ch/wiki/2017-11-16_How_to_Mastodon"},
           {"id": "1", "url": "https://gist.github.com/joyeusenoelle/74f6e6c0f349651349a0df9ae4582969"}
         ],
-      "devTutorial": "https://github.com/tootsuite/documentation",
+      "devTutorial": "https://github.com/mastodon/documentation",
       "metrics":
         [
           {"id": "0", "url": "http://sp3r4z.fr/mastodon"}
@@ -98,7 +98,7 @@
           "Direct messages (\"private messages\") are delivered with limited visibility (non public) only between Mastodon users. Friends from other Fediverse networks may get such \"direct messages\" as public (visible to all) because some networks (GNU Social) don't support DMs. Keep that in mind when sharing private information via a DM."
         ],
       "donate": "https://patreon.com/mastodon",
-      "tracker": "https://github.com/tootsuite/mastodon/issues",
+      "tracker": "https://github.com/mastodon/mastodon/issues",
       "bounty": "",
       "translating": "https://crowdin.com/project/mastodon",
       "reading":
diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json
index 540fef1..337673a 100644
--- a/source/_data/miscellaneous.json
+++ b/source/_data/miscellaneous.json
@@ -1479,7 +1479,7 @@
       },
       {
         "title": "Mastodon",
-        "source": "https://github.com/tootsuite/mastodon",
+        "source": "https://github.com/mastodon/mastodon",
         "protocols": "ActivityPub",
         "site": "https://joinmastodon.org",
         "logo": "/img/misc/mastodon.svg",